diff --git a/flight/OpenPilot/UAVObjects/inc/flightbatterystate.h b/flight/OpenPilot/UAVObjects/inc/flightbatterystate.h index 06be06265..4b3254fc9 100644 --- a/flight/OpenPilot/UAVObjects/inc/flightbatterystate.h +++ b/flight/OpenPilot/UAVObjects/inc/flightbatterystate.h @@ -33,7 +33,7 @@ #define FLIGHTBATTERYSTATE_H // Object constants -#define FLIGHTBATTERYSTATE_OBJID 553396562U +#define FLIGHTBATTERYSTATE_OBJID 4176558368U #define FLIGHTBATTERYSTATE_NAME "FlightBatteryState" #define FLIGHTBATTERYSTATE_METANAME "FlightBatteryStateMeta" #define FLIGHTBATTERYSTATE_ISSINGLEINST 1 @@ -57,20 +57,16 @@ // Object data typedef struct { - uint32_t Tension; + uint32_t Voltage; uint32_t Current; uint32_t ConsumedEnergy; - uint32_t MinimumTension; - uint32_t Capacity; } __attribute__((packed)) FlightBatteryStateData; // Field information -// Field Tension information +// Field Voltage information // Field Current information // Field ConsumedEnergy information -// Field MinimumTension information -// Field Capacity information // Generic interface functions diff --git a/flight/OpenPilot/UAVObjects/uavobjectsinit.c b/flight/OpenPilot/UAVObjects/uavobjectsinit.c index 343e0c1d9..84c59477b 100644 --- a/flight/OpenPilot/UAVObjects/uavobjectsinit.c +++ b/flight/OpenPilot/UAVObjects/uavobjectsinit.c @@ -35,6 +35,7 @@ #include "attitudeactual.h" #include "attitudedesired.h" #include "attitudesettings.h" +#include "flightbatterystate.h" #include "exampleobject1.h" #include "exampleobject2.h" #include "examplesettings.h" @@ -65,6 +66,7 @@ void UAVObjectsInitializeAll() AttitudeActualInitialize(); AttitudeDesiredInitialize(); AttitudeSettingsInitialize(); + FlightBatteryStateInitialize(); ExampleObject1Initialize(); ExampleObject2Initialize(); ExampleSettingsInitialize();