Add xccSingleEnergy sensor type

dcdbpusher/sensors/ipmi/IPMISensorBase.h

@@ -89,7 +89,8 @@ class IPMISensorBase : public SensorBase {
 		undefined = 0,
 		raw,
 		sdr,
-		xccDatastorePower
+		xccDatastorePower,
+		xccSingleEnergy
 	};
 
 	uint16_t                    getRecordId() const { return _recordId; }
@@ -115,6 +116,8 @@ class IPMISensorBase : public SensorBase {
 				return std::string("sdr");
 			case xccDatastorePower:
 				return std::string("xccDatastorePower");
+			case xccSingleEnergy:
+				return std::string("xccSingleEnergy");
 			default:
 				return std::string("undefined");
 		}
@@ -146,6 +149,8 @@ class IPMISensorBase : public SensorBase {
 			_type = sdr;
 		} else if (boost::iequals(type, "xccDatastorePower")) {
 			_type = xccDatastorePower;
+		} else if (boost::iequals(type, "xccSingleEnergy")) {
+			_type = xccSingleEnergy;
 		} else {
 			_type = undefined;
 		}

dcdbpusher/sensors/ipmi/IPMISensorGroup.cpp

@@ -112,6 +112,13 @@ void IPMISensorGroup::read() {
 					}
 					break;
 				}
+				case IPMISensorBase::sensorType::xccSingleEnergy: {
+					LenovoXCC xcc(_entity);
+					if (xcc.getSingleEnergy(reading) == 0) {
+						s->storeReading(reading, s->getFactor());
+					}
+					break;
+				}
 				case IPMISensorBase::sensorType::sdr: {
 					std::vector<uint8_t> sdrRecord = s->getSdrRecord();
 					if (sdrRecord.size() == 0) {

dcdbpusher/sensors/ipmi/LenovoXCC.cpp

@@ -65,6 +65,19 @@ int LenovoXCC::getDatastorePower(std::vector<reading_t> &readings) {
 	}
 }
 
+int LenovoXCC::getSingleEnergy(reading_t &reading) {
+	if (_drift || getDrift() == 0) {
+		uint64_t ts, energy;
+		if (readSingleEnergyRaw(ts, energy) == 0) {
+			reading.timestamp = ts + _drift;
+			reading.value = energy;
+			return 0;
+		}
+	}
+	return 1;
+}
+
+
 int LenovoXCC::readSingleEnergyRaw(uint64_t &timeStamp, uint64_t &energy) {
 	uint8_t buf[256];
 	uint8_t getSingleEnergyCmd[] = {0x00, 0x3a, 0x32, 0x04, 0x02, 0x00, 0x00, 0x00};

dcdbpusher/sensors/ipmi/LenovoXCC.h

@@ -20,6 +20,7 @@ class LenovoXCC {
 	virtual ~LenovoXCC();
 
 	int      getDatastorePower(std::vector<reading_t> &readings);
+	int      getSingleEnergy(reading_t &reading);
 
       private:
 	int      openDatastore();