From be456fc33dc16e1be7646cb969e0e8b86a58fbd5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 7 Jan 2016 09:32:36 +1100 Subject: [PATCH] Rover: always call load_all this ensures defaults file works on first start after erase --- APMrover2/Parameters.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/APMrover2/Parameters.cpp b/APMrover2/Parameters.cpp index eae1922b20..0732fce4c8 100644 --- a/APMrover2/Parameters.cpp +++ b/APMrover2/Parameters.cpp @@ -582,13 +582,13 @@ void Rover::load_parameters(void) // save the current format version g.format_version.set_and_save(Parameters::k_format_version); cliSerial->println("done."); - } else { - unsigned long before = micros(); - // Load all auto-loaded EEPROM variables - AP_Param::load_all(); + } - cliSerial->printf("load_all took %luus\n", micros() - before); - } + unsigned long before = micros(); + // Load all auto-loaded EEPROM variables + AP_Param::load_all(); + + cliSerial->printf("load_all took %luus\n", micros() - before); // set a more reasonable default NAVL1_PERIOD for rovers L1_controller.set_default_period(8);