diff --git a/libraries/SITL/SIM_Helicopter.cpp b/libraries/SITL/SIM_Helicopter.cpp index 0df8860b97..c74ded4eae 100644 --- a/libraries/SITL/SIM_Helicopter.cpp +++ b/libraries/SITL/SIM_Helicopter.cpp @@ -64,11 +64,7 @@ void Helicopter::update(const struct sitl_input &input) // get wind vector setup update_wind(input); - if (input.servos[7] > 1400) { - motor_interlock = true; - } else { - motor_interlock = false; - } + motor_interlock = input.servos[7] > 1400; float rsc = constrain_float((input.servos[7]-1000) / 1000.0f, 0, 1); float rsc_scale = rsc/rsc_setpoint; diff --git a/libraries/SITL/SIM_SerialProximitySensor.cpp b/libraries/SITL/SIM_SerialProximitySensor.cpp index 7e4b13cfc0..dadca432d7 100644 --- a/libraries/SITL/SIM_SerialProximitySensor.cpp +++ b/libraries/SITL/SIM_SerialProximitySensor.cpp @@ -60,7 +60,7 @@ float SerialProximitySensor::measure_distance_at_angle_bf(const Location &locati count++; // the 1000 here is so the files don't grow unbounded - const bool write_debug_files = true && count < 1000; + const bool write_debug_files = count < 1000; FILE *rayfile = nullptr; if (write_debug_files) {