Parameter update - Rename variables in drivers

using parameter_update.py script

src/drivers/heater/heater.cpp

@@ -156,11 +156,11 @@ void Heater::cycle()
 		_sensor_temperature = _sensor_accel.temperature;
 
 		// Calculate the temperature delta between the setpoint and reported temperature.
-		float temperature_delta = _p_temperature_setpoint.get() - _sensor_temperature;
+		float temperature_delta = _param_sens_imu_temp.get() - _sensor_temperature;
 
 		// Modulate the heater time on with a feedforward/PI controller.
-		_proportional_value = temperature_delta * _p_proportional_gain.get();
+		_proportional_value = temperature_delta * _param_sens_imu_temp_p.get();
-		_integrator_value += temperature_delta * _p_integrator_gain.get();
+		_integrator_value += temperature_delta * _param_sens_imu_temp_i.get();
 
 		// Constrain the integrator value to no more than 25% of the duty cycle.
 		_integrator_value = math::constrain(_integrator_value, -0.25f, 0.25f);
@@ -214,7 +214,7 @@ void Heater::initialize_topics()
 		}
 
 		// If the correct ID is found, exit the for-loop with _sensor_accel_sub pointing to the correct instance.
-		if (_sensor_accel.device_id == (uint32_t)_p_sensor_id.get()) {
+		if (_sensor_accel.device_id == (uint32_t)_param_sens_temp_id.get()) {
 			PX4_INFO("IMU sensor identified.");
 			break;
 		}
@@ -225,7 +225,7 @@ void Heater::initialize_topics()
 	PX4_INFO("Device ID:  %d", _sensor_accel.device_id);
 
 	// Exit the driver if the sensor ID does not match the desired sensor.
-	if (_sensor_accel.device_id != (uint32_t)_p_sensor_id.get()) {
+	if (_sensor_accel.device_id != (uint32_t)_param_sens_temp_id.get()) {
 		request_stop();
 		PX4_ERR("Could not identify IMU sensor.");
 	}
@@ -247,11 +247,11 @@ void Heater::initialize_trampoline(void *argv)
 float Heater::integrator(char *argv[])
 {
 	if (argv[1]) {
-		_p_integrator_gain.set(atof(argv[1]));
+		_param_sens_imu_temp_i.set(atof(argv[1]));
 	}
 
-	PX4_INFO("Integrator gain:  %2.5f", (double)_p_integrator_gain.get());
+	PX4_INFO("Integrator gain:  %2.5f", (double)_param_sens_imu_temp_i.get());
-	return _p_integrator_gain.get();
+	return _param_sens_imu_temp_i.get();
 }
 
 int Heater::orb_update(const struct orb_metadata *meta, int handle, void *buffer)
@@ -278,7 +278,7 @@ int Heater::print_status()
 {
 	PX4_INFO("Temperature: %3.3fC - Setpoint: %3.2fC - Heater State: %s",
 		 (double)_sensor_temperature,
-		 (double)_p_temperature_setpoint.get(),
+		 (double)_param_sens_imu_temp.get(),
 		 _heater_on ? "On" : "Off");
 
 	return PX4_OK;
@@ -316,11 +316,11 @@ This task can be started at boot from the startup scripts by setting SENS_EN_THE
 float Heater::proportional(char *argv[])
 {
 	if (argv[1]) {
-		_p_proportional_gain.set(atof(argv[1]));
+		_param_sens_imu_temp_p.set(atof(argv[1]));
 	}
 
-	PX4_INFO("Proportional gain:  %2.5f", (double)_p_proportional_gain.get());
+	PX4_INFO("Proportional gain:  %2.5f", (double)_param_sens_imu_temp_p.get());
-	return _p_proportional_gain.get();
+	return _param_sens_imu_temp_p.get();
 }
 
 uint32_t Heater::sensor_id()
@@ -368,11 +368,11 @@ int Heater::task_spawn(int argc, char *argv[])
 float Heater::temperature_setpoint(char *argv[])
 {
 	if (argv[1]) {
-		_p_temperature_setpoint.set(atof(argv[1]));
+		_param_sens_imu_temp.set(atof(argv[1]));
 	}
 
-	PX4_INFO("Target temp:  %3.3f", (double)_p_temperature_setpoint.get());
+	PX4_INFO("Target temp:  %3.3f", (double)_param_sens_imu_temp.get());
-	return _p_temperature_setpoint.get();
+	return _param_sens_imu_temp.get();
 }
 
 void Heater::update_params(const bool force)

src/drivers/heater/heater.h

@@ -209,9 +209,9 @@ private:
 
 	/** @note Declare local parameters using defined parameters. */
 	DEFINE_PARAMETERS(
-		(ParamFloat<px4::params::SENS_IMU_TEMP_I>)  _p_integrator_gain,
+		(ParamFloat<px4::params::SENS_IMU_TEMP_I>)  _param_sens_imu_temp_i,
-		(ParamFloat<px4::params::SENS_IMU_TEMP_P>)  _p_proportional_gain,
+		(ParamFloat<px4::params::SENS_IMU_TEMP_P>)  _param_sens_imu_temp_p,
-		(ParamInt<px4::params::SENS_TEMP_ID>) _p_sensor_id,
+		(ParamInt<px4::params::SENS_TEMP_ID>) _param_sens_temp_id,
-		(ParamFloat<px4::params::SENS_IMU_TEMP>) _p_temperature_setpoint
+		(ParamFloat<px4::params::SENS_IMU_TEMP>) _param_sens_imu_temp
 	)
 };

src/drivers/osd/atxxxx/atxxxx.cpp

@@ -117,7 +117,7 @@ OSDatxxxx::init()
 	}
 
 	// clear the screen
-	int num_rows = _param_atxxxx_cfg.get() == 1 ? OSD_NUM_ROWS_NTSC : OSD_NUM_ROWS_PAL;
+	int num_rows = _param_osd_atxxxx_cfg.get() == 1 ? OSD_NUM_ROWS_NTSC : OSD_NUM_ROWS_PAL;
 
 	for (int i = 0; i < OSD_CHARS_PER_ROW; i++) {
 		for (int j = 0; j < num_rows; j++) {
@@ -185,7 +185,7 @@ OSDatxxxx::init_osd()
 	int ret = PX4_OK;
 	uint8_t data = OSD_ZERO_BYTE;
 
-	if (_param_atxxxx_cfg.get() == 2) {
+	if (_param_osd_atxxxx_cfg.get() == 2) {
 		data |= OSD_PAL_TX_MODE;
 	}
 

src/drivers/osd/atxxxx/atxxxx.h

@@ -176,6 +176,6 @@ private:
 	uint8_t _nav_state{0};
 
 	DEFINE_PARAMETERS(
-		(ParamInt<px4::params::OSD_ATXXXX_CFG>) _param_atxxxx_cfg
+		(ParamInt<px4::params::OSD_ATXXXX_CFG>) _param_osd_atxxxx_cfg
 	)
 };

src/drivers/tap_esc/tap_esc.cpp

@@ -141,7 +141,7 @@ private:
 	EscPacket 	_packet = {};
 
 	DEFINE_PARAMETERS(
-		(ParamInt<px4::params::MC_AIRMODE>) _airmode   ///< multicopter air-mode
+		(ParamInt<px4::params::MC_AIRMODE>) _param_mc_airmode   ///< multicopter air-mode
 	)
 
 	void subscribe();
@@ -420,7 +420,7 @@ void TAP_ESC::cycle()
 	}
 
 	if (_mixers) {
-		_mixers->set_airmode((Mixer::Airmode)_airmode.get());
+		_mixers->set_airmode((Mixer::Airmode)_param_mc_airmode.get());
 	}
 
 	/* check if anything updated */