Fixed typo in HardwareBase

Author: gizmocuz

hardware/DomoticzHardware.cpp

@@ -547,18 +547,21 @@ void CDomoticzHardwareBase::SendKwhMeterOldWay(const int NodeID, const int Child
 
 void CDomoticzHardwareBase::SendKwhMeter(const int NodeID, const int ChildID, const int BatteryLevel, const double musage, const double mtotal, const std::string &defaultname)
 {
-	int Idx = (NodeID * 256) + ChildID;
+	int dID = (NodeID << 8) | ChildID;
+	char szTmp[30];
+	sprintf(szTmp, "%08X", dID);
+
 	bool bDeviceExits = true;
 	std::vector<std::vector<std::string> > result;
-	result = m_sql.safe_query("SELECT Name FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID==%d) AND (Type==%d) AND (Subtype==%d)",
-		m_HwdID, int(Idx), int(pTypeGeneral), int(sTypeKwh));
+	result = m_sql.safe_query("SELECT Name FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
+		m_HwdID, szTmp, int(pTypeGeneral), int(sTypeKwh));
 	if (result.size() < 1)
 	{
 		bDeviceExits = false;
 	}
 
 	_tGeneralDevice gdevice;
-	gdevice.intval1 = Idx;
+	gdevice.intval1 = dID;
 	gdevice.subtype = sTypeKwh;
 	gdevice.floatval1 = (float)musage;
 	gdevice.floatval2 = (float)(mtotal*1000.0);
@@ -567,17 +570,20 @@ void CDomoticzHardwareBase::SendKwhMeter(const int NodeID, const int ChildID, co
 	if (!bDeviceExits)
 	{
 		//Assign default name for device
-		m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID==%d) AND (Type==%d) AND (Subtype==%d)",
-			defaultname.c_str(), m_HwdID, int(Idx), int(pTypeGeneral), int(sTypeKwh));
+		m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
+			defaultname.c_str(), m_HwdID, szTmp, int(pTypeGeneral), int(sTypeKwh));
 	}
 }
 
 double CDomoticzHardwareBase::GetKwhMeter(const int NodeID, const int ChildID, bool &bExists)
 {
-	int Idx = (NodeID * 256) + ChildID;
+	int dID = (NodeID << 8) | ChildID;
+	char szTmp[30];
+	sprintf(szTmp, "%08X", dID);
+
 	std::vector<std::vector<std::string> > result;
-	result = m_sql.safe_query("SELECT ID FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID==%d) AND (Type==%d) AND (Subtype==%d)",
-		m_HwdID, int(Idx), int(pTypeGeneral), int(sTypeKwh));
+	result = m_sql.safe_query("SELECT ID FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
+		m_HwdID, szTmp, int(pTypeGeneral), int(sTypeKwh));
 	if (result.size() < 1)
 	{
 		bExists = false;