From 030dbd5f2efbfcbf8d480a3df5b84989745987e6 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 10 Feb 2024 15:38:51 +1100 Subject: [PATCH] Rover: move parameter storage formatting up to AP_Vehicle --- Rover/Parameters.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Rover/Parameters.cpp b/Rover/Parameters.cpp index 1c7ae1a07b2a65..a01a2cd0d25fb7 100644 --- a/Rover/Parameters.cpp +++ b/Rover/Parameters.cpp @@ -817,22 +817,8 @@ const AP_Param::ConversionInfo conversion_table[] = { void Rover::load_parameters(void) { - if (!g.format_version.load() || - g.format_version != Parameters::k_format_version) { - // erase all parameters - hal.console->printf("Firmware change: erasing EEPROM...\n"); - StorageManager::erase(); - AP_Param::erase_all(); - - // save the current format version - g.format_version.set_and_save(Parameters::k_format_version); - hal.console->printf("done.\n"); - } - g.format_version.set_default(Parameters::k_format_version); + AP_Vehicle::load_parameters(g.format_version, Parameters::k_format_version); - const uint32_t before = micros(); - // Load all auto-loaded EEPROM variables - AP_Param::load_all(); AP_Param::convert_old_parameters(&conversion_table[0], ARRAY_SIZE(conversion_table)); AP_Param::set_frame_type_flags(AP_PARAM_FRAME_ROVER); @@ -845,7 +831,6 @@ void Rover::load_parameters(void) } SRV_Channels::upgrade_parameters(); - hal.console->printf("load_all took %uus\n", unsigned(micros() - before)); // convert CH7_OPTION to RC7_OPTION for Rover-3.4 to 3.5 upgrade const AP_Param::ConversionInfo ch7_option_info = { Parameters::k_param_ch7_option, 0, AP_PARAM_INT8, "RC7_OPTION" };