Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INS: get check for send_msg the right way around! 

I broke this in my previous commit
This commit is contained in:
Andrew Tridgell 2012-11-20 19:10:30 +11:00
parent 4174cfd4a7
commit e2afc9ea18
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_InertialSensor/AP_InertialSensor.cpp
View File

@ -275,9 +275,9 @@ bool AP_InertialSensor::calibrate_accel(void (*delay_cb)(unsigned long t), void
break; break;
} }
if (send_msg == NULL) { if (send_msg == NULL) {
send_msg(PSTR("USER: Place APM %S and press any key.\n"), msg);
}else{
Serial.printf_P(PSTR("USER: Place APM %S and press any key.\n"), msg); Serial.printf_P(PSTR("USER: Place APM %S and press any key.\n"), msg);
}else{
send_msg(PSTR("USER: Place APM %S and press any key.\n"), msg);
} }
// wait for user input // wait for user input
@ -307,9 +307,9 @@ bool AP_InertialSensor::calibrate_accel(void (*delay_cb)(unsigned long t), void
// run the calibration routine // run the calibration routine
if( _calibrate_accel(samples, new_offsets, new_scaling) ) { if( _calibrate_accel(samples, new_offsets, new_scaling) ) {
if (send_msg == NULL) { if (send_msg == NULL) {
send_msg(PSTR("Calibration successful\n"));
}else{
Serial.printf_P(PSTR("Calibration successful\n")); Serial.printf_P(PSTR("Calibration successful\n"));
}else{
send_msg(PSTR("Calibration successful\n"));
} }
// set and save calibration // set and save calibration
@ -320,9 +320,9 @@ bool AP_InertialSensor::calibrate_accel(void (*delay_cb)(unsigned long t), void
} }
if (send_msg == NULL) { if (send_msg == NULL) {
send_msg(PSTR("Calibration failed\n"));
} else {
Serial.printf_P(PSTR("Calibration failed\n")); Serial.printf_P(PSTR("Calibration failed\n"));
} else {
send_msg(PSTR("Calibration failed\n"));
} }
// restore original scaling and offsets // restore original scaling and offsets
_accel_offset.set(orig_offset); _accel_offset.set(orig_offset);