BUGFIX: parameter default values must be a Dict[str, Par]

Author: amilcarlucas

MethodicConfigurator/annotate_params.py

@@ -225,7 +225,7 @@ def format_params(param_dict: Dict[str, 'Par'], file_format: str = "missionplann
         formatted_params = []
         if file_format == "missionplanner":
             for key, parameter in param_dict.items():
-                if isinstance(parameter, dict):
+                if isinstance(parameter, Par):
                     if parameter.comment:
                         formatted_params.append(f"{key},{format(parameter.value, '.6f').rstrip('0').rstrip('.')}"
                                                 f"  # {parameter.comment}")
@@ -235,7 +235,7 @@ def format_params(param_dict: Dict[str, 'Par'], file_format: str = "missionplann
                     formatted_params.append(f"{key},{format(parameter, '.6f').rstrip('0').rstrip('.')}")
         elif file_format == "mavproxy":
             for key, parameter in param_dict.items():
-                if isinstance(parameter, dict):
+                if isinstance(parameter, Par):
                     if parameter.comment:
                         formatted_params.append(f"{key:<16} {parameter.value:<8.6f}  # {parameter.comment}")
                     else:

MethodicConfigurator/backend_filesystem.py

@@ -532,14 +532,14 @@ def copy_fc_params_values_to_template_created_vehicle_files(self, fc_parameters:
             Par.export_to_param(Par.format_params(param_dict), os_path.join(self.vehicle_dir, param_filename))
         return ''
 
-    def write_param_default_values(self, param_default_values: Dict[str, float]):
+    def write_param_default_values(self, param_default_values: Dict[str, 'Par']) -> bool:
         param_default_values = dict(sorted(param_default_values.items()))
         if self.param_default_dict != param_default_values:
             self.param_default_dict = param_default_values
             return True
         return False
 
-    def write_param_default_values_to_file(self, param_default_values: Dict[str, float], filename: str='00_default.param'):
+    def write_param_default_values_to_file(self, param_default_values: Dict[str, 'Par'], filename: str='00_default.param'):
         if self.write_param_default_values(param_default_values):
             Par.export_to_param(Par.format_params(param_default_values), os_path.join(self.vehicle_dir, filename))
 

MethodicConfigurator/backend_flightcontroller.py

@@ -271,13 +271,13 @@ def __process_autopilot_version(self, m):
         self.info.set_vendor_id_and_product_id(m.vendor_id, m.product_id)
         return ""
 
-    def download_params(self, progress_callback=None) -> Tuple[Dict[str, float], Dict[str, float]]:
+    def download_params(self, progress_callback=None) -> Tuple[Dict[str, float], Dict[str, 'Par']]:
         """
         Requests all flight controller parameters from a MAVLink connection.
 
         Returns:
             Dict[str, float]: A dictionary of flight controller parameters.
-            Dict[str, float]: A dictionary of flight controller default parameters.
+            Dict[str, Par]: A dictionary of flight controller default parameters.
         """
         # FIXME this entire if statement is for testing only, remove it later pylint: disable=fixme
         if self.master is None and self.comport is not None and self.comport.device == 'test':
@@ -332,7 +332,7 @@ def __download_params_via_mavlink(self, progress_callback=None) -> Dict[str, flo
                 break
         return parameters
 
-    def download_params_via_mavftp(self, progress_callback=None) -> Tuple[Dict[str, float], Dict[str, float]]:
+    def download_params_via_mavftp(self, progress_callback=None) -> Tuple[Dict[str, float], Dict[str, 'Par']]:
         # FIXME global variables should be avoided but I found no other practical way get the FTP result pylint: disable=fixme
         global ftp_should_run  # pylint: disable=global-variable-undefined
         global pdict  # pylint: disable=global-variable-undefined
@@ -362,7 +362,7 @@ def callback(fh):
             logging_info("got %u parameter values", len(pdict))
             if pdata.defaults:
                 for (name, value, _ptype) in pdata.defaults:
-                    defdict[name.decode('utf-8')] = value
+                    defdict[name.decode('utf-8')] = Par(value)
                 logging_info("got %u parameter default values", len(defdict))
             ftp_should_run = False
             progress_callback(len(data), len(data))