From ea7788f49d5db2aa7f0e46f78b6ed42bd5494356 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 10 Feb 2024 15:38:51 +1100 Subject: [PATCH] Blimp: move parameter storage formatting up to AP_Vehicle --- Blimp/Parameters.cpp | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/Blimp/Parameters.cpp b/Blimp/Parameters.cpp index 805f704d75..cbc14fc410 100644 --- a/Blimp/Parameters.cpp +++ b/Blimp/Parameters.cpp @@ -840,25 +840,7 @@ ParametersG2::ParametersG2(void) void Blimp::load_parameters(void) { - hal.util->set_soft_armed(false); - - 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); - - uint32_t before = micros(); - // Load all auto-loaded EEPROM variables - AP_Param::load_all(); + AP_Vehicle::load_parameters(g.format_version, Parameters::k_format_version); // PARAMETER_CONVERSION - Added: Jan-2024 for Copter-4.6 #if AP_STATS_ENABLED @@ -894,8 +876,6 @@ void Blimp::load_parameters(void) AP_Param::convert_class(g.k_param_logger, &logger, logger.var_info, 0, 0, true); #endif - hal.console->printf("load_all took %uus\n", (unsigned)(micros() - before)); - // setup AP_Param frame type flags AP_Param::set_frame_type_flags(AP_PARAM_FRAME_BLIMP); }