DUNE/Hardware/BasicDeviceDriver: remove specific parameters to set Configurable Sampling parameters scope and visibility, update config files accordingly.

Author: Bernardo-Gabriel

etc/caravel.ini

@@ -320,9 +320,7 @@ Default Monitoring -- Hardware                      = Clock,
 [Monitors.Medium]
 Enabled                                             = Simulation
 Entity Label                                        = Medium
-Active                                              = true
-Active - Scope                                      = idle
-Active - Visibility                                 = developer
+Active {scope:idle, visibility:developer}           = true
 Activation Time                                     = 0
 Deactivation Time                                   = 0
 Debug Level                                         = None
@@ -507,11 +505,8 @@ Input Timeout                                       = 5.0
 Power Channel - Names                               = ECHOTRIP_C
 Activation Time                                     = 10.0
 Active {scope:global,visibility:user}               = false
-Sample Time Duration - Visibility                   = user
-Sample Time Duration - Scope                        = global
-Periodicity of Data Sampling                        = 80
-Periodicity of Data Sampling - Visibility           = user
-Periodicity of Data Sampling - Scope                = global
+Sample Time Duration {visibility:user}              = 60
+Periodicity of Data Sampling {visibility:user}      = 80
 Vertical Profile Periodicity                        = 60
 
 [Sensors.HemisphereV200s]
@@ -548,12 +543,8 @@ Debug Level                                         = None
 IO Port - Device                                    = uart:///dev/ttyS6:115200
 Power Channel - Names                               = ADCP_C
 Post Power On Delay                                 = 2.0
-Sample Time Duration                                = 60
-Sample Time Duration - Visibility                   = user
-Sample Time Duration - Scope                        = global
-Periodicity of Data Sampling                        = 1800
-Periodicity of Data Sampling - Visibility           = user
-Periodicity of Data Sampling - Scope                = global
+Sample Time Duration {visibility:user}              = 60
+Periodicity of Data Sampling {visibility:user}      = 1800
 Vertical Profile Periodicity                        = 60
 
 [Sensors.ThermalZone]
@@ -577,12 +568,8 @@ Entity Label - Depth                                = CTD
 Entity Label - Salinity                             = CTD
 Power Channel - Names                               = OXYGEN_C
 Power On Delay                                      = 2.0
-Sample Time Duration                                = 60
-Sample Time Duration - Visibility                   = user
-Sample Time Duration - Scope                        = global
-Periodicity of Data Sampling                        = 80
-Periodicity of Data Sampling - Visibility           = user
-Periodicity of Data Sampling - Scope                = global
+Sample Time Duration {visibility:user}              = 60
+Periodicity of Data Sampling {visibility:user}      = 80
 Vertical Profile Periodicity                        = 60
 
 [Sensors.RBRlegato3]
@@ -593,12 +580,8 @@ Debug Level                                         = None
 Activation Time                                     = 10.0
 IO Port - Device                                    = uart:///dev/ttyS5:115200
 Sample Period (ms)                                  = 125
-Sample Time Duration                                = 0.0
-Sample Time Duration - Visibility                   = user
-Sample Time Duration - Scope                        = global
-Periodicity of Data Sampling                        = 0.0
-Periodicity of Data Sampling - Visibility           = user
-Periodicity of Data Sampling - Scope                = global
+Sample Time Duration {visibility:user}              = 0.0
+Periodicity of Data Sampling {visibility:user}      = 0.0
 Power Channel - Names                               = CTD_C
 Power On Delay                                      = 3.0
 Input Timeout                                       = 60

src/DUNE/Hardware/BasicDeviceDriver.cpp

@@ -192,18 +192,6 @@ namespace DUNE
           else
             m_periodicity_timer.setTop(0.0f);
         }
-
-        if (paramChanged(m_bdd_args.sample_time_duration_visibility))
-          setParameterVisibility(c_sample_time_duration, m_bdd_args.sample_time_duration_visibility);
-
-        if (paramChanged(m_bdd_args.sample_time_duration_scope))
-          setParameterScope(c_sample_time_duration, m_bdd_args.sample_time_duration_scope);
-
-        if (paramChanged(m_bdd_args.periodicity_data_sampling_visibility))
-          setParameterVisibility(c_periodicity_data_sampling, m_bdd_args.periodicity_data_sampling_visibility);
-
-        if (paramChanged(m_bdd_args.periodicity_data_sampling_scope))
-          setParameterScope(c_periodicity_data_sampling, m_bdd_args.periodicity_data_sampling_scope);
       }
 
       if (m_honours_vp)
@@ -280,20 +268,6 @@ namespace DUNE
       .units(Units::Second)
       .description(samp_dur_description.str());
 
-      param(std::string(c_sample_time_duration) + " - Visibility", m_bdd_args.sample_time_duration_visibility)
-      .visibility(Parameter::VISIBILITY_DEVELOPER)
-      .scope(Parameter::SCOPE_GLOBAL)
-      .defaultValue("developer")
-      .values(Parameter::visibilityValues())
-      .description("Visibility of the '" + std::string(c_sample_time_duration) + "' parameter");
-
-      param(std::string(c_sample_time_duration) + " - Scope", m_bdd_args.sample_time_duration_scope)
-      .visibility(Parameter::VISIBILITY_DEVELOPER)
-      .scope(Parameter::SCOPE_GLOBAL)
-      .defaultValue("global")
-      .values(Parameter::scopeValues())
-      .description("Scoped of the '" + std::string(c_sample_time_duration) + "' parameter");
-
       std::ostringstream perioditicity_description;
       perioditicity_description << c_periodicity_data_sampling << " (P) in seconds. "
                                 << "This value must not be lower than "
@@ -344,20 +318,6 @@ namespace DUNE
       .defaultValue(uncastLexical(def_periodicity))
       .units(Units::Second)
       .description(perioditicity_description.str());
-
-      param(std::string(c_periodicity_data_sampling) + " - Visibility", m_bdd_args.periodicity_data_sampling_visibility)
-      .visibility(Parameter::VISIBILITY_DEVELOPER)
-      .scope(Parameter::SCOPE_GLOBAL)
-      .defaultValue("developer")
-      .values(Parameter::visibilityValues())
-      .description("Visibility of the '" + std::string(c_periodicity_data_sampling) + "' parameter");
-
-      param(std::string(c_periodicity_data_sampling) + " - Scope", m_bdd_args.periodicity_data_sampling_scope)
-      .visibility(Parameter::VISIBILITY_DEVELOPER)
-      .scope(Parameter::SCOPE_GLOBAL)
-      .defaultValue("global")
-      .values(Parameter::scopeValues())
-      .description("Scoped of the '" + std::string(c_periodicity_data_sampling) + "' parameter");
     }
 
     void

src/DUNE/Hardware/BasicDeviceDriver.hpp

@@ -55,16 +55,8 @@ namespace DUNE
       double post_pwr_on_delay;
       //! Sample Time Duration.
       double sample_time_duration;
-      //! Sample Time Duration visibility.
-      std::string sample_time_duration_visibility;
-      //! Sample Time Duration scope.
-      std::string sample_time_duration_scope;
       //! Periodicity of Data Sampling.
       double periodicity_data_sampling;
-      //! Periodicity of Data Sampling visibility.
-      std::string periodicity_data_sampling_visibility;
-      //! Periodicity of Data Sampling scope.
-      std::string periodicity_data_sampling_scope;
       //! Vertical Profile Periodicity.
       double vp_periodicity;
     };