Add battery level observer

added data item id and BatteryLevelDataItemBase type

Change-Id: I7e33b476c787587d0372ec67bd61fa5efe6eef41
CRs-Fixed: 2125054
This commit is contained in:
Kevin Tang 2017-09-12 15:57:22 -07:00
parent 4f5eb8623b
commit 273e268978
2 changed files with 22 additions and 4 deletions

View file

@ -378,7 +378,7 @@ protected:
class MccmncDataItemBase : public IDataItemCore { class MccmncDataItemBase : public IDataItemCore {
public: public:
MccmncDataItemBase(const string & name) : MccmncDataItemBase(const string & name) :
mValue (name), mValue(name),
mId(MCCMNC_DATA_ITEM_ID) {} mId(MCCMNC_DATA_ITEM_ID) {}
virtual ~MccmncDataItemBase() {} virtual ~MccmncDataItemBase() {}
inline virtual DataItemId getId() { return mId; } inline virtual DataItemId getId() { return mId; }
@ -392,7 +392,7 @@ protected:
class SrnDeviceScanDetailsDataItemBase : public IDataItemCore { class SrnDeviceScanDetailsDataItemBase : public IDataItemCore {
public: public:
SrnDeviceScanDetailsDataItemBase (DataItemId Id) : SrnDeviceScanDetailsDataItemBase(DataItemId Id) :
mValidSrnData(false), mValidSrnData(false),
mApSrnRssi(-1), mApSrnRssi(-1),
mApSrnTimestamp(0), mApSrnTimestamp(0),
@ -400,7 +400,7 @@ public:
mReceiveTimestamp(0), mReceiveTimestamp(0),
mErrorCause(-1), mErrorCause(-1),
mId(Id) {} mId(Id) {}
virtual ~SrnDeviceScanDetailsDataItemBase () {} virtual ~SrnDeviceScanDetailsDataItemBase() {}
inline virtual DataItemId getId() { return mId; } inline virtual DataItemId getId() { return mId; }
// Data members common to all SRN tech types // Data members common to all SRN tech types
/* Represents info on whether SRN data is valid (no error)*/ /* 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;} 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 } // namespace loc_core
#endif //__DATAITEMCONCRETEBASETYPES__ #endif //__DATAITEMCONCRETEBASETYPES__

View file

@ -67,7 +67,13 @@ typedef enum e_DataItemId {
BTLE_SCAN_DATA_ITEM_ID, BTLE_SCAN_DATA_ITEM_ID,
BT_SCAN_DATA_ITEM_ID, BT_SCAN_DATA_ITEM_ID,
OEM_GTP_UPLOAD_TRIGGER_READY_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; } DataItemId;
#endif // #ifndef __DATAITEMID_H__ #endif // #ifndef __DATAITEMID_H__