Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-26 17:36:40 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

battery: pass source in by constructor

Browse Source
This commit is contained in:
Matthias Grob
2021-12-01 16:42:24 +01:00
parent b965923c08
commit f9fc9a9af6
13 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/power_monitor/ina226/ina226.cpp
+1 -4
View File
@@ -49,7 +49,7 @@ INA226::INA226(const I2CSPIDriverConfig &config, int battery_index) :
_comms_errors(perf_alloc(PC_COUNT, "ina226_com_err")),
_collection_errors(perf_alloc(PC_COUNT, "ina226_collection_err")),
_measure_errors(perf_alloc(PC_COUNT, "ina226_measurement_err")),
_battery(battery_index, this, INA226_SAMPLE_INTERVAL_US)
_battery(battery_index, this, INA226_SAMPLE_INTERVAL_US, battery_status_s::BATTERY_SOURCE_POWER_MODULE)
{
float fvalue = MAX_CURRENT;
_max_current = fvalue;
@@ -88,7 +88,6 @@ INA226::INA226(const I2CSPIDriverConfig &config, int battery_index) :
0.0,
0.0,
false,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0
);
}
@@ -235,7 +234,6 @@ INA226::collect()
(float) _bus_voltage * INA226_VSCALE,
(float) _current * _current_lsb,
success,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0
);
@@ -305,7 +303,6 @@ INA226::RunImpl()
0.0f,
0.0f,
false,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0
);
src/drivers/power_monitor/ina228/ina228.cpp
+1 -4
View File
@@ -49,7 +49,7 @@ INA228::INA228(const I2CSPIDriverConfig &config, int battery_index) :
_comms_errors(perf_alloc(PC_COUNT, "ina228_com_err")),
_collection_errors(perf_alloc(PC_COUNT, "ina228_collection_err")),
_measure_errors(perf_alloc(PC_COUNT, "ina228_measurement_err")),
_battery(battery_index, this, INA228_SAMPLE_INTERVAL_US)
_battery(battery_index, this, INA228_SAMPLE_INTERVAL_US, battery_status_s::BATTERY_SOURCE_POWER_MODULE)
{
float fvalue = MAX_CURRENT;
_max_current = fvalue;
@@ -90,7 +90,6 @@ INA228::INA228(const I2CSPIDriverConfig &config, int battery_index) :
0.0,
0.0,
false,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0
);
}
@@ -316,7 +315,6 @@ INA228::collect()
(float) _bus_voltage * INA228_VSCALE,
(float) _current * _current_lsb,
success,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0
);
@@ -386,7 +384,6 @@ INA228::RunImpl()
0.0f,
0.0f,
false,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0
);
src/drivers/power_monitor/ina238/ina238.cpp
+1 -4
View File
@@ -45,7 +45,7 @@ INA238::INA238(const I2CSPIDriverConfig &config, int battery_index) :
_sample_perf(perf_alloc(PC_ELAPSED, "ina238_read")),
_comms_errors(perf_alloc(PC_COUNT, "ina238_com_err")),
_collection_errors(perf_alloc(PC_COUNT, "ina238_collection_err")),
_battery(battery_index, this, INA238_SAMPLE_INTERVAL_US)
_battery(battery_index, this, INA238_SAMPLE_INTERVAL_US, battery_status_s::BATTERY_SOURCE_POWER_MODULE)
{
float fvalue = DEFAULT_MAX_CURRENT;
_max_current = fvalue;
@@ -73,7 +73,6 @@ INA238::INA238(const I2CSPIDriverConfig &config, int battery_index) :
0.0,
0.0,
false,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0
);
}
@@ -203,7 +202,6 @@ int INA238::collect()
(float) bus_voltage * INA238_VSCALE,
(float) current * _current_lsb,
success,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0
);
@@ -264,7 +262,6 @@ void INA238::RunImpl()
0.0f,
0.0f,
false,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0
);
src/drivers/power_monitor/voxlpm/voxlpm.cpp
+1 -4
View File
@@ -54,7 +54,7 @@ VOXLPM::VOXLPM(const I2CSPIDriverConfig &config) :
_sample_perf(perf_alloc(PC_ELAPSED, MODULE_NAME": sample")),
_comms_errors(perf_alloc(PC_COUNT, MODULE_NAME": comms_errors")),
_ch_type((VOXLPM_CH_TYPE)config.custom1),
_battery(1, this, _meas_interval_us)
_battery(1, this, _meas_interval_us, battery_status_s::BATTERY_SOURCE_POWER_MODULE)
{
}
@@ -76,7 +76,6 @@ VOXLPM::init()
0.0,
0.0,
false,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0
);
}
@@ -349,7 +348,6 @@ VOXLPM::measure()
_voltage,
_amperage,
true,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0);
}
@@ -377,7 +375,6 @@ VOXLPM::measure()
0.0,
0.0,
true,
battery_status_s::BATTERY_SOURCE_POWER_MODULE,
0);
}
break;