diff --git a/ArduPlane/GCS_Mavlink.pde b/ArduPlane/GCS_Mavlink.pde index b4b8af8cf7..c596cf66af 100644 --- a/ArduPlane/GCS_Mavlink.pde +++ b/ArduPlane/GCS_Mavlink.pde @@ -2104,14 +2104,6 @@ static void gcs_update(void) } } -static void gcs_send_text(gcs_severity severity, const char *str) -{ - gcs0.send_text(severity, str); - if (gcs3.initialised) { - gcs3.send_text(severity, str); - } -} - static void gcs_send_text_P(gcs_severity severity, const prog_char_t *str) { gcs0.send_text(severity, str); diff --git a/ArduPlane/climb_rate.pde b/ArduPlane/climb_rate.pde index 5649a2fd5b..644be85a34 100644 --- a/ArduPlane/climb_rate.pde +++ b/ArduPlane/climb_rate.pde @@ -1,5 +1,7 @@ // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- +#if 0 // currently unused + struct DataPoint { unsigned long x; long y; @@ -17,8 +19,7 @@ long yi; long xiyi; unsigned long xi2; -#if 0 // currently unused -static void add_altitude_data(unsigned long xl, long y) +void add_altitude_data(unsigned long xl, long y) { //Reset the regression if our X variable overflowed if (xl < xoffset) diff --git a/ArduPlane/commands.pde b/ArduPlane/commands.pde index 28e88e0f97..3d16189e9d 100644 --- a/ArduPlane/commands.pde +++ b/ArduPlane/commands.pde @@ -1,19 +1,7 @@ // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- - -/* Functions in this file: - void init_commands() - void update_auto() - void reload_commands_airstart() - struct Location get_cmd_with_index(int i) - void set_cmd_with_index(struct Location temp, int i) - void increment_cmd_index() - void decrement_cmd_index() - long read_alt_to_hold() - void set_next_WP(struct Location *wp) - void set_guided_WP(void) - void init_home() -************************************************************ -*/ +/* + logic for dealing with the current command in the mission and home location + */ static void init_commands() { @@ -125,13 +113,6 @@ static void set_cmd_with_index(struct Location temp, int i) eeprom_write_dword((uint32_t *) mem, temp.lng); } -static void increment_cmd_index() -{ - if (g.command_index <= g.command_total) { - g.command_index.set_and_save(g.command_index + 1); - } -} - static void decrement_cmd_index() { if (g.command_index > 0) { diff --git a/ArduPlane/events.pde b/ArduPlane/events.pde index de38c848ca..412c67ec5d 100644 --- a/ArduPlane/events.pde +++ b/ArduPlane/events.pde @@ -79,7 +79,7 @@ static void failsafe_short_off_event() } #if BATTERY_EVENT == ENABLED -static void low_battery_event(void) +void low_battery_event(void) { gcs_send_text_P(SEVERITY_HIGH,PSTR("Low Battery!")); set_mode(RTL);