fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-04 07:20:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

batt_smbus: make bus_options const and rename to smbus_bus_options

Browse Source 
as it is a global name.
This commit is contained in:
Beat Küng
2019-11-05 10:51:28 +01:00
parent adad11f247
commit 72e62a62cb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/batt_smbus/batt_smbus.cpp
+3 -3
View File
@@ -117,10 +117,10 @@ int BATT_SMBUS::task_spawn(int argc, char *argv[])
for (unsigned i = 0; i < NUM_BUS_OPTIONS; i++) {
if (!is_running() && (busid == BATT_SMBUS_BUS_ALL || bus_options[i].busid == busid)) {
if (!is_running() && (busid == BATT_SMBUS_BUS_ALL || smbus_bus_options[i].busid == busid)) {
SMBus *interface = new SMBus(bus_options[i].busnum, BATT_SMBUS_ADDR);
BATT_SMBUS *dev = new BATT_SMBUS(interface, bus_options[i].devpath);
SMBus *interface = new SMBus(smbus_bus_options[i].busnum, BATT_SMBUS_ADDR);
BATT_SMBUS *dev = new BATT_SMBUS(interface, smbus_bus_options[i].devpath);
// Successful read of device type, we've found our battery
_object.store(dev);
src/drivers/batt_smbus/batt_smbus.h
+2 -2
View File
@@ -95,7 +95,7 @@
#define BATT_SMBUS_ENABLED_PROTECTIONS_A_DEFAULT 0xcf
#define BATT_SMBUS_ENABLED_PROTECTIONS_A_CUV_DISABLED 0xce
#define NUM_BUS_OPTIONS (sizeof(bus_options)/sizeof(bus_options[0]))
#define NUM_BUS_OPTIONS (sizeof(smbus_bus_options)/sizeof(smbus_bus_options[0]))
enum BATT_SMBUS_BUS {
BATT_SMBUS_BUS_ALL = 0,
@@ -109,7 +109,7 @@ struct batt_smbus_bus_option {
enum BATT_SMBUS_BUS busid;
const char *devpath;
uint8_t busnum;
} bus_options[] = {
} const smbus_bus_options[] = {
{ BATT_SMBUS_BUS_I2C_EXTERNAL, "/dev/batt_smbus_ext", PX4_I2C_BUS_EXPANSION},
#ifdef PX4_I2C_BUS_EXPANSION1
{ BATT_SMBUS_BUS_I2C_EXTERNAL1, "/dev/batt_smbus_ext1", PX4_I2C_BUS_EXPANSION1},