diff --git a/core/data-items/DataItemConcreteTypesBase.h b/core/data-items/DataItemConcreteTypesBase.h index 74722d06..244a46fd 100644 --- a/core/data-items/DataItemConcreteTypesBase.h +++ b/core/data-items/DataItemConcreteTypesBase.h @@ -378,7 +378,7 @@ protected: class MccmncDataItemBase : public IDataItemCore { public: MccmncDataItemBase(const string & name) : - mValue (name), + mValue(name), mId(MCCMNC_DATA_ITEM_ID) {} virtual ~MccmncDataItemBase() {} inline virtual DataItemId getId() { return mId; } @@ -392,7 +392,7 @@ protected: class SrnDeviceScanDetailsDataItemBase : public IDataItemCore { public: - SrnDeviceScanDetailsDataItemBase (DataItemId Id) : + SrnDeviceScanDetailsDataItemBase(DataItemId Id) : mValidSrnData(false), mApSrnRssi(-1), mApSrnTimestamp(0), @@ -400,7 +400,7 @@ public: mReceiveTimestamp(0), mErrorCause(-1), mId(Id) {} - virtual ~SrnDeviceScanDetailsDataItemBase () {} + virtual ~SrnDeviceScanDetailsDataItemBase() {} inline virtual DataItemId getId() { return mId; } // Data members common to all SRN tech types /* Represents info on whether SRN data is valid (no error)*/ @@ -441,6 +441,18 @@ public: virtual int32_t copy(IDataItemCore* /*src*/, bool* /*dataItemCopied = NULL*/) {return 1;} }; +class BatteryLevelDataItemBase : public IDataItemCore { +public: + inline BatteryLevelDataItemBase(uint8_t batteryPct) : + mBatteryPct(batteryPct), mId(BATTERY_LEVEL_DATA_ITEM_ID) {} + inline ~BatteryLevelDataItemBase() {} + inline virtual DataItemId getId() { return mId; } +// Data members + uint8_t mBatteryPct; +protected: + DataItemId mId; +}; + } // namespace loc_core #endif //__DATAITEMCONCRETEBASETYPES__ diff --git a/core/data-items/DataItemId.h b/core/data-items/DataItemId.h index 1bf132aa..1661be6c 100644 --- a/core/data-items/DataItemId.h +++ b/core/data-items/DataItemId.h @@ -67,7 +67,13 @@ typedef enum e_DataItemId { BTLE_SCAN_DATA_ITEM_ID, BT_SCAN_DATA_ITEM_ID, OEM_GTP_UPLOAD_TRIGGER_READY_ITEM_ID, - MAX_DATA_ITEM_ID + + MAX_DATA_ITEM_ID, + + // 26 - + BATTERY_LEVEL_DATA_ITEM_ID, + + MAX_DATA_ITEM_ID_1_1, } DataItemId; #endif // #ifndef __DATAITEMID_H__