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

Copter: reduce repeated string constants

This commit is contained in:
murata 2016-10-06 05:47:54 +09:00 committed by Randy Mackay
parent af5a2ea0c6
commit f135ca5ae7
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ArduCopter/setup.cpp
View File

@ -82,13 +82,14 @@ int8_t Copter::setup_set(uint8_t argc, const Menu::arg *argv)
return 0; return 0;
} }
const char *strType = "Value out of range for type";
switch(p_type) switch(p_type)
{ {
case AP_PARAM_INT8: case AP_PARAM_INT8:
value_int8 = (int8_t)(argv[2].i); value_int8 = (int8_t)(argv[2].i);
if(argv[2].i!=value_int8) if(argv[2].i!=value_int8)
{ {
cliSerial->printf("Value out of range for type INT8\n"); cliSerial->printf("%s INT8\n", strType);
return 0; return 0;
} }
((AP_Int8*)param)->set_and_save(value_int8); ((AP_Int8*)param)->set_and_save(value_int8);
@ -97,7 +98,7 @@ int8_t Copter::setup_set(uint8_t argc, const Menu::arg *argv)
value_int16 = (int16_t)(argv[2].i); value_int16 = (int16_t)(argv[2].i);
if(argv[2].i!=value_int16) if(argv[2].i!=value_int16)
{ {
cliSerial->printf("Value out of range for type INT16\n"); cliSerial->printf("%s INT16\n", strType);
return 0; return 0;
} }
((AP_Int16*)param)->set_and_save(value_int16); ((AP_Int16*)param)->set_and_save(value_int16);
@ -196,6 +197,7 @@ int8_t Copter::esc_calib(uint8_t argc,const Menu::arg *argv)
"Do you want to start calibration now: y or n?\n"); "Do you want to start calibration now: y or n?\n");
/* wait for user input */ /* wait for user input */
const char *strEscCalib = "ESC calibration";
while (1) { while (1) {
c= cliSerial->read(); c= cliSerial->read();
if (c == 'y' || c == 'Y') { if (c == 'y' || c == 'Y') {
@ -203,11 +205,11 @@ int8_t Copter::esc_calib(uint8_t argc,const Menu::arg *argv)
break; break;
} else if (c == 0x03 || c == 0x63 || c == 'q') { } else if (c == 0x03 || c == 0x63 || c == 'q') {
cliSerial->printf("ESC calibration exited\n"); cliSerial->printf("%s exited\n", strEscCalib);
return(0); return(0);
} else if (c == 'n' || c == 'N') { } else if (c == 'n' || c == 'N') {
cliSerial->printf("ESC calibration aborted\n"); cliSerial->printf("%s aborted\n", strEscCalib);
return(0); return(0);
} }
@ -247,7 +249,7 @@ int8_t Copter::esc_calib(uint8_t argc,const Menu::arg *argv)
break; break;
} else if (c == 0x03 || c == 'q') { } else if (c == 0x03 || c == 'q') {
cliSerial->printf("ESC calibration exited\n"); cliSerial->printf("%s exited\n", strEscCalib);
return(0); return(0);
} }
@ -275,7 +277,7 @@ int8_t Copter::esc_calib(uint8_t argc,const Menu::arg *argv)
break; break;
} else if (c == 0x03 || c == 'q') { } else if (c == 0x03 || c == 'q') {
cliSerial->printf("ESC calibration exited\n"); cliSerial->printf("%s exited\n", strEscCalib);
return(0); return(0);
} }
@ -288,7 +290,7 @@ int8_t Copter::esc_calib(uint8_t argc,const Menu::arg *argv)
cliSerial->printf("Outputs disarmed\n"); cliSerial->printf("Outputs disarmed\n");
cliSerial->printf("ESC calibration finished\n"); cliSerial->printf("%s finished\n", strEscCalib);
return(0); return(0);
} }