[ins sonar] fix test and add threshold

This commit is contained in:
Gautier Hattenberger
2012-07-11 11:43:19 +02:00
parent 3d6f17454d
commit c77307b8ed
+9 -1
View File
@@ -297,8 +297,16 @@ void ins_update_sonar() {
#ifdef INS_SONAR_THROTTLE_THRESHOLD #ifdef INS_SONAR_THROTTLE_THRESHOLD
&& stabilization_cmd[COMMAND_THRUST] < INS_SONAR_THROTTLE_THRESHOLD && stabilization_cmd[COMMAND_THRUST] < INS_SONAR_THROTTLE_THRESHOLD
#endif #endif
#ifdef INS_SONAR_STAB_THRESHOLD
&& stabilization_cmd[COMMAND_ROLL] < INS_SONAR_STAB_THRESHOLD
&& stabilization_cmd[COMMAND_ROLL] > -INS_SONAR_STAB_THRESHOLD
&& stabilization_cmd[COMMAND_PITCH] < INS_SONAR_STAB_THRESHOLD
&& stabilization_cmd[COMMAND_PITCH] > -INS_SONAR_STAB_THRESHOLD
&& stabilization_cmd[COMMAND_YAW] < INS_SONAR_STAB_THRESHOLD
&& stabilization_cmd[COMMAND_YAW] > -INS_SONAR_STAB_THRESHOLD
#endif
#ifdef INS_SONAR_BARO_THRESHOLD #ifdef INS_SONAR_BARO_THRESHOLD
&& ins_baro_alt < POS_BFP_OF_REAL(INS_SONAR_BARO_THRESHOLD) && ins_baro_alt > -POS_BFP_OF_REAL(INS_SONAR_BARO_THRESHOLD) /* z down */
#endif #endif
&& ins_update_on_agl && ins_update_on_agl
&& baro.status == BS_RUNNING) { && baro.status == BS_RUNNING) {