aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

APM: save 100 bytes of memory

Browse Source 
remove flight_mode_strings array
This commit is contained in:
Andrew Tridgell 2012-09-18 13:38:56 +10:00
parent 3b5b2eba6e
commit f32fcb7495
6 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ArduPlane/ArduPlane.pde
View File

@ -300,24 +300,6 @@ static bool usb_connected;
static const char *comma = ","; static const char *comma = ",";
static const char* flight_mode_strings[] = {
"Manual",
"Circle",
"Stabilize",
"",
"",
"FBW_A",
"FBW_B",
"",
"",
"",
"Auto",
"RTL",
"Loiter",
"Takeoff",
"Land"
};
/* Radio values /* Radio values
* Channel assignments * Channel assignments

1
ArduPlane/Attitude.pde
View File

@ -408,7 +408,6 @@ static void set_servos(void)
// Auto flap deployment // Auto flap deployment
if(control_mode < FLY_BY_WIRE_B) { if(control_mode < FLY_BY_WIRE_B) {
// only use radio_in if the channel is not used as flight_mode_channel
RC_Channel_aux::copy_radio_in_out(RC_Channel_aux::k_flap_auto); RC_Channel_aux::copy_radio_in_out(RC_Channel_aux::k_flap_auto);
} else if (control_mode >= FLY_BY_WIRE_B) { } else if (control_mode >= FLY_BY_WIRE_B) {
// FIXME: use target_airspeed in both FBW_B and g.airspeed_enabled cases - Doug? // FIXME: use target_airspeed in both FBW_B and g.airspeed_enabled cases - Doug?

2
ArduPlane/Log.pde
View File

@ -499,7 +499,7 @@ static void Log_Read_Attitude()
static void Log_Read_Mode() static void Log_Read_Mode()
{ {
Serial.printf_P(PSTR("MOD:")); Serial.printf_P(PSTR("MOD:"));
Serial.println(flight_mode_strings[DataFlash.ReadByte()]); print_flight_mode(DataFlash.ReadByte());
} }
// Read a GPS packet // Read a GPS packet

2
ArduPlane/setup.pde
View File

@ -520,7 +520,7 @@ static void
print_switch(byte p, byte m) print_switch(byte p, byte m)
{ {
Serial.printf_P(PSTR("Pos %d: "),p); Serial.printf_P(PSTR("Pos %d: "),p);
Serial.println(flight_mode_strings[m]); print_flight_mode(m);
} }
static void static void

35
ArduPlane/system.pde
View File

@ -567,3 +567,38 @@ static void reboot_apm(void)
while (1); while (1);
} }
#endif #endif
static void
print_flight_mode(uint8_t mode)
{
switch (mode) {
case MANUAL:
Serial.println_P(PSTR("Manual"));
break;
case CIRCLE:
Serial.println_P(PSTR("Circle"));
break;
case STABILIZE:
Serial.println_P(PSTR("Stabilize"));
break;
case FLY_BY_WIRE_A:
Serial.println_P(PSTR("FBW_A"));
break;
case FLY_BY_WIRE_B:
Serial.println_P(PSTR("FBW_B"));
break;
case AUTO:
Serial.println_P(PSTR("AUTO"));
break;
case RTL:
Serial.println_P(PSTR("RTL"));
break;
case LOITER:
Serial.println_P(PSTR("Loiter"));
break;
default:
Serial.println_P(PSTR("---"));
break;
}
}

4
ArduPlane/test.pde
View File

@ -223,13 +223,13 @@ test_failsafe(uint8_t argc, const Menu::arg *argv)
if(oldSwitchPosition != readSwitch()) { if(oldSwitchPosition != readSwitch()) {
Serial.printf_P(PSTR("CONTROL MODE CHANGED: ")); Serial.printf_P(PSTR("CONTROL MODE CHANGED: "));
Serial.println(flight_mode_strings[readSwitch()]); print_flight_mode(readSwitch());
fail_test++; fail_test++;
} }
if(g.throttle_fs_enabled && g.channel_throttle.get_failsafe()) { if(g.throttle_fs_enabled && g.channel_throttle.get_failsafe()) {
Serial.printf_P(PSTR("THROTTLE FAILSAFE ACTIVATED: %d, "), (int)g.channel_throttle.radio_in); Serial.printf_P(PSTR("THROTTLE FAILSAFE ACTIVATED: %d, "), (int)g.channel_throttle.radio_in);
Serial.println(flight_mode_strings[readSwitch()]); print_flight_mode(readSwitch());
fail_test++; fail_test++;
} }