Merge branch 'release_v1.0.0' into beta

src/modules/commander/commander_helper.cpp

@@ -386,7 +386,7 @@ float battery_remaining_estimate_voltage(float voltage, float discharged, float
 	/* the range from full to empty is the same for batteries under load and without load,
 	 * since the voltage drop applies to both the full and empty state
 	 */
-	float voltage_range = (bat_v_full - bat_v_empty)
+	float voltage_range = (bat_v_full - bat_v_empty);
 	float remaining_voltage = (voltage - (bat_n_cells * bat_v_empty_dynamic)) / (bat_n_cells * voltage_range);
 
 	if (bat_capacity > 0.0f) {

src/modules/px4iofirmware/mixer.cpp

@@ -287,15 +287,18 @@ mixer_tick(void)
 
 	} else if (mixer_servos_armed && should_always_enable_pwm) {
 		/* set the disarmed servo outputs. */
-		for (unsigned i = 0; i < PX4IO_SERVO_COUNT; i++)
+		for (unsigned i = 0; i < PX4IO_SERVO_COUNT; i++) {
 			up_pwm_servo_set(i, r_page_servo_disarmed[i]);
+		}
 
 		/* set S.BUS1 or S.BUS2 outputs */
-		if (r_setup_features & PX4IO_P_SETUP_FEATURES_SBUS1_OUT)
-			sbus1_output(r_page_servos, PX4IO_SERVO_COUNT);
+		if (r_setup_features & PX4IO_P_SETUP_FEATURES_SBUS1_OUT) {
+			sbus1_output(r_page_servo_disarmed, PX4IO_SERVO_COUNT);
+		}
 
-		if (r_setup_features & PX4IO_P_SETUP_FEATURES_SBUS2_OUT)
-			sbus2_output(r_page_servos, PX4IO_SERVO_COUNT);
+		if (r_setup_features & PX4IO_P_SETUP_FEATURES_SBUS2_OUT) {
+			sbus2_output(r_page_servo_disarmed, PX4IO_SERVO_COUNT);
+		}
 	}
 }