Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sub: fix frame report and -Wundef warning

Browse Source
This commit is contained in:
Jacob Walser 2017-02-03 13:41:10 -05:00 committed by Andrew Tridgell
parent e0cd1d0679
commit ea05804a94
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ArduSub/setup.cpp
View File

@ -317,19 +317,30 @@ void Sub::report_frame()
cliSerial->printf("Frame\n"); cliSerial->printf("Frame\n");
print_divider(); print_divider();
#if FRAME_CONFIG == QUAD_FRAME switch(g.frame_configuration) {
cliSerial->printf("Quad frame\n"); case AP_Motors6DOF::SUB_FRAME_BLUEROV1:
#elif FRAME_CONFIG == TRI_FRAME cliSerial->printf("BlueROV1\n");
cliSerial->printf("TRI frame\n"); break;
#elif FRAME_CONFIG == HEXA_FRAME case AP_Motors6DOF::SUB_FRAME_VECTORED:
cliSerial->printf("Hexa frame\n"); cliSerial->printf("Vectored\n");
#elif FRAME_CONFIG == Y6_FRAME break;
cliSerial->printf("Y6 frame\n"); case AP_Motors6DOF::SUB_FRAME_VECTORED_6DOF:
#elif FRAME_CONFIG == OCTA_FRAME cliSerial->printf("Vectored-6DOF\n");
cliSerial->printf("Octa frame\n"); break;
#elif FRAME_CONFIG == HELI_FRAME case AP_Motors6DOF::SUB_FRAME_VECTORED_6DOF_90DEG:
cliSerial->printf("Heli frame\n"); cliSerial->printf("Vectored-6DOF-90\n");
#endif break;
case AP_Motors6DOF::SUB_FRAME_SIMPLEROV_3:
case AP_Motors6DOF::SUB_FRAME_SIMPLEROV_4:
case AP_Motors6DOF::SUB_FRAME_SIMPLEROV_5:
cliSerial->printf("SimpleROV\n");
break;
case AP_Motors6DOF::SUB_FRAME_CUSTOM:
cliSerial->printf("Custom\n");
break;
default:
cliSerial->printf("Unknown\n");
}
print_blanks(2); print_blanks(2);
} }