fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 14:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

battery: pass priority in by setter

Browse Source
This commit is contained in:
Matthias Grob
2021-12-07 21:06:51 +01:00
parent f9fc9a9af6
commit 38d23f5345
12 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/power_monitor/ina226/ina226.cpp
+3 -6
View File
@@ -87,8 +87,7 @@ INA226::INA226(const I2CSPIDriverConfig &config, int battery_index) :
hrt_absolute_time(),
0.0,
0.0,
false,
0
false
);
}
@@ -233,8 +232,7 @@ INA226::collect()
hrt_absolute_time(),
(float) _bus_voltage * INA226_VSCALE,
(float) _current * _current_lsb,
success,
0
success
);
perf_end(_sample_perf);
@@ -302,8 +300,7 @@ INA226::RunImpl()
hrt_absolute_time(),
0.0f,
0.0f,
false,
0
false
);
if (init() != PX4_OK) {
src/drivers/power_monitor/ina228/ina228.cpp
+3 -6
View File
@@ -89,8 +89,7 @@ INA228::INA228(const I2CSPIDriverConfig &config, int battery_index) :
hrt_absolute_time(),
0.0,
0.0,
false,
0
false
);
}
@@ -314,8 +313,7 @@ INA228::collect()
hrt_absolute_time(),
(float) _bus_voltage * INA228_VSCALE,
(float) _current * _current_lsb,
success,
0
success
);
perf_end(_sample_perf);
@@ -383,8 +381,7 @@ INA228::RunImpl()
hrt_absolute_time(),
0.0f,
0.0f,
false,
0
false
);
if (init() != PX4_OK) {
src/drivers/power_monitor/ina238/ina238.cpp
+3 -6
View File
@@ -72,8 +72,7 @@ INA238::INA238(const I2CSPIDriverConfig &config, int battery_index) :
hrt_absolute_time(),
0.0,
0.0,
false,
0
false
);
}
@@ -201,8 +200,7 @@ int INA238::collect()
hrt_absolute_time(),
(float) bus_voltage * INA238_VSCALE,
(float) current * _current_lsb,
success,
0
success
);
perf_end(_sample_perf);
@@ -261,8 +259,7 @@ void INA238::RunImpl()
hrt_absolute_time(),
0.0f,
0.0f,
false,
0
false
);
if (init() != PX4_OK) {
src/drivers/power_monitor/voxlpm/voxlpm.cpp
+3 -6
View File
@@ -75,8 +75,7 @@ VOXLPM::init()
hrt_absolute_time(),
0.0,
0.0,
false,
0
false
);
}
@@ -347,8 +346,7 @@ VOXLPM::measure()
_battery.updateBatteryStatus(tnow,
_voltage,
_amperage,
true,
0);
true);
}
// fallthrough
@@ -374,8 +372,7 @@ VOXLPM::measure()
_battery.updateBatteryStatus(tnow,
0.0,
0.0,
true,
0);
true);
}
break;