From 400c65ce5d83eafb66a4b1f2b72268260665e3fd Mon Sep 17 00:00:00 2001 From: Henry Wurzburg Date: Mon, 28 Nov 2022 17:06:15 -0600 Subject: [PATCH] AP_BattMonitor: add metadata for Synthetic Current type --- libraries/AP_BattMonitor/AP_BattMonitor.cpp | 18 ++++++++++++++++++ .../AP_BattMonitor/AP_BattMonitor_Params.cpp | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libraries/AP_BattMonitor/AP_BattMonitor.cpp b/libraries/AP_BattMonitor/AP_BattMonitor.cpp index cfe02d3b29..95a0286f3d 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor.cpp +++ b/libraries/AP_BattMonitor/AP_BattMonitor.cpp @@ -53,6 +53,8 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = { // @Path: AP_BattMonitor_UAVCAN.cpp // @Group: _ // @Path: AP_BattMonitor_FuelLevel_Analog.cpp + // @Group: _ + // @Path: AP_BattMonitor_Synthetic_Current.cpp AP_SUBGROUPVARPTR(drivers[0], "_", 41, AP_BattMonitor, backend_var_info[0]), #if AP_BATT_MONITOR_MAX_INSTANCES > 1 @@ -70,6 +72,8 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = { // @Path: AP_BattMonitor_UAVCAN.cpp // @Group: 2_ // @Path: AP_BattMonitor_FuelLevel_Analog.cpp + // @Group: 2_ + // @Path: AP_BattMonitor_Synthetic_Current.cpp AP_SUBGROUPVARPTR(drivers[1], "2_", 42, AP_BattMonitor, backend_var_info[1]), #endif @@ -88,6 +92,8 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = { // @Path: AP_BattMonitor_UAVCAN.cpp // @Group: 3_ // @Path: AP_BattMonitor_FuelLevel_Analog.cpp + // @Group: 3_ + // @Path: AP_BattMonitor_Synthetic_Current.cpp AP_SUBGROUPVARPTR(drivers[2], "3_", 43, AP_BattMonitor, backend_var_info[2]), #endif @@ -106,6 +112,8 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = { // @Path: AP_BattMonitor_UAVCAN.cpp // @Group: 4_ // @Path: AP_BattMonitor_FuelLevel_Analog.cpp + // @Group: 4_ + // @Path: AP_BattMonitor_Synthetic_Current.cpp AP_SUBGROUPVARPTR(drivers[3], "4_", 44, AP_BattMonitor, backend_var_info[3]), #endif @@ -124,6 +132,8 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = { // @Path: AP_BattMonitor_UAVCAN.cpp // @Group: 5_ // @Path: AP_BattMonitor_FuelLevel_Analog.cpp + // @Group: 5_ + // @Path: AP_BattMonitor_Synthetic_Current.cpp AP_SUBGROUPVARPTR(drivers[4], "5_", 45, AP_BattMonitor, backend_var_info[4]), #endif @@ -142,6 +152,8 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = { // @Path: AP_BattMonitor_UAVCAN.cpp // @Group: 6_ // @Path: AP_BattMonitor_FuelLevel_Analog.cpp + // @Group: 6_ + // @Path: AP_BattMonitor_Synthetic_Current.cpp AP_SUBGROUPVARPTR(drivers[5], "6_", 46, AP_BattMonitor, backend_var_info[5]), #endif @@ -160,6 +172,8 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = { // @Path: AP_BattMonitor_UAVCAN.cpp // @Group: 7_ // @Path: AP_BattMonitor_FuelLevel_Analog.cpp + // @Group: 7_ + // @Path: AP_BattMonitor_Synthetic_Current.cpp AP_SUBGROUPVARPTR(drivers[6], "7_", 47, AP_BattMonitor, backend_var_info[6]), #endif @@ -178,6 +192,8 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = { // @Path: AP_BattMonitor_UAVCAN.cpp // @Group: 8_ // @Path: AP_BattMonitor_FuelLevel_Analog.cpp + // @Group: 8_ + // @Path: AP_BattMonitor_Synthetic_Current.cpp AP_SUBGROUPVARPTR(drivers[7], "8_", 48, AP_BattMonitor, backend_var_info[7]), #endif @@ -196,6 +212,8 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = { // @Path: AP_BattMonitor_UAVCAN.cpp // @Group: 9_ // @Path: AP_BattMonitor_FuelLevel_Analog.cpp + // @Group: 9_ + // @Path: AP_BattMonitor_Synthetic_Current.cpp AP_SUBGROUPVARPTR(drivers[8], "9_", 49, AP_BattMonitor, backend_var_info[8]), #endif diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp index 87b9a2a541..03f766c625 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp +++ b/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp @@ -13,7 +13,7 @@ const AP_Param::GroupInfo AP_BattMonitor_Params::var_info[] = { // @Param: MONITOR // @DisplayName: Battery monitoring // @Description: Controls enabling monitoring of the battery's voltage and current - // @Values: 0:Disabled,3:Analog Voltage Only,4:Analog Voltage and Current,5:Solo,6:Bebop,7:SMBus-Generic,8:DroneCAN-BatteryInfo,9:ESC,10:Sum Of Selected Monitors,11:FuelFlow,12:FuelLevelPWM,13:SMBUS-SUI3,14:SMBUS-SUI6,15:NeoDesign,16:SMBus-Maxell,17:Generator-Elec,18:Generator-Fuel,19:Rotoye,20:MPPT,21:INA2XX,22:LTC2946,23:Torqeedo,24:FuelLevelAnalog + // @Values: 0:Disabled,3:Analog Voltage Only,4:Analog Voltage and Current,5:Solo,6:Bebop,7:SMBus-Generic,8:DroneCAN-BatteryInfo,9:ESC,10:Sum Of Selected Monitors,11:FuelFlow,12:FuelLevelPWM,13:SMBUS-SUI3,14:SMBUS-SUI6,15:NeoDesign,16:SMBus-Maxell,17:Generator-Elec,18:Generator-Fuel,19:Rotoye,20:MPPT,21:INA2XX,22:LTC2946,23:Torqeedo,24:FuelLevelAnalog,25:Synthetic Current and Analog Voltage // @User: Standard // @RebootRequired: True AP_GROUPINFO_FLAGS("MONITOR", 1, AP_BattMonitor_Params, _type, int8_t(AP_BattMonitor::Type::NONE), AP_PARAM_FLAG_ENABLE),