Skip to content

Commit b44d724

Browse files
gizmocuzgizmocuz
committed
some code cleanup
1 parent 6923037 commit b44d724

25 files changed

+121
-242
lines changed

‎hardware/AnnaThermostat.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ void CAnnaThermostat::SendSetPointSensor(const unsigned char Idx, const float Te
129129
sprintf(szID,"%X%02X%02X%02X", 0, 0, 0, Idx);
130130

131131
std::vector<std::vector<std::string> > result;
132-
result = m_sql.safe_query(
133-
"SELECT Name FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q')",
134-
m_HwdID, szID);
132+
result = m_sql.safe_query("SELECT Name FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q')", m_HwdID, szID);
135133
if (result.size()<1)
136134
{
137135
bDeviceExits=false;
@@ -152,8 +150,7 @@ void CAnnaThermostat::SendSetPointSensor(const unsigned char Idx, const float Te
152150
if (!bDeviceExits)
153151
{
154152
//Assign default name for device
155-
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q')",
156-
defaultname.c_str(), m_HwdID, szID);
153+
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q')", defaultname.c_str(), m_HwdID, szID);
157154
}
158155
}
159156

‎hardware/ETH8020.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ void CETH8020::UpdateSwitch(const unsigned char Idx, const int SubUnit, const bo
136136
char szIdx[10];
137137
sprintf(szIdx, "%X%02X%02X%02X", 0, 0, 0, Idx);
138138
std::vector<std::vector<std::string> > result;
139-
result = m_sql.safe_query("SELECT Name,nValue,sValue FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit == %d)",
140-
m_HwdID, szIdx, SubUnit);
139+
result = m_sql.safe_query("SELECT Name,nValue,sValue FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit == %d)", m_HwdID, szIdx, SubUnit);
141140
if (result.size() < 1)
142141
{
143142
bDeviceExits = false;
@@ -184,8 +183,7 @@ void CETH8020::UpdateSwitch(const unsigned char Idx, const int SubUnit, const bo
184183
if (!bDeviceExits)
185184
{
186185
//Assign default name for device
187-
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit == %d)",
188-
defaultname.c_str(), m_HwdID, szIdx, SubUnit);
186+
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit == %d)", defaultname.c_str(), m_HwdID, szIdx, SubUnit);
189187
}
190188
}
191189

@@ -197,8 +195,7 @@ void CETH8020::SendVoltage(const unsigned long Idx, const float Volt, const std:
197195
char szTmp[30];
198196
sprintf(szTmp, "%08X", (unsigned int)Idx);
199197

200-
result = m_sql.safe_query("SELECT Name FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
201-
m_HwdID, szTmp, int(pTypeGeneral), int(sTypeVoltage));
198+
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(sTypeVoltage));
202199
if (result.size() < 1)
203200
{
204201
bDeviceExits = false;
@@ -214,8 +211,7 @@ void CETH8020::SendVoltage(const unsigned long Idx, const float Volt, const std:
214211
if (!bDeviceExits)
215212
{
216213
//Assign default name for device
217-
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
218-
defaultname.c_str(), m_HwdID, szTmp, int(pTypeGeneral), int(sTypeVoltage));
214+
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(sTypeVoltage));
219215
}
220216
}
221217

‎hardware/EnOceanESP2.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,8 +1106,7 @@ bool CEnOceanESP2::WriteToHardware(const char *pdata, const unsigned char length
11061106
std::vector<std::vector<std::string> > result;
11071107
char szDeviceID[20];
11081108
sprintf(szDeviceID,"%08X",(unsigned int)sID);
1109-
result=m_sql.safe_query("SELECT SwitchType,LastLevel FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit==%d)",
1110-
m_HwdID, szDeviceID, int(tsen->LIGHTING2.unitcode));
1109+
result = m_sql.safe_query("SELECT SwitchType,LastLevel FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit==%d)", m_HwdID, szDeviceID, int(tsen->LIGHTING2.unitcode));
11111110
if (result.size()>0)
11121111
{
11131112
_eSwitchType switchtype=(_eSwitchType)atoi(result[0][0].c_str());
@@ -1385,12 +1384,11 @@ bool CEnOceanESP2::ParseData()
13851384

13861385

13871386
std::vector<std::vector<std::string> > result;
1388-
result=m_sql.safe_query("SELECT ID FROM EnoceanSensors WHERE (HardwareID==%d) AND (DeviceID=='%q')",
1389-
m_HwdID, szDeviceID);
1387+
result = m_sql.safe_query("SELECT ID FROM EnoceanSensors WHERE (HardwareID==%d) AND (DeviceID=='%q')", m_HwdID, szDeviceID);
13901388
if (result.size()<1)
13911389
{
13921390
//Add it to the database
1393-
result=m_sql.safe_query(
1391+
result = m_sql.safe_query(
13941392
"INSERT INTO EnoceanSensors (HardwareID, DeviceID, Manufacturer, Profile, [Type]) "
13951393
"VALUES (%d,'%q',%d,%d,%d)",
13961394
m_HwdID, szDeviceID, manufacturer, profile, ttype);
@@ -1402,9 +1400,7 @@ bool CEnOceanESP2::ParseData()
14021400
{
14031401
//Following sensors need to have had a teach-in
14041402
std::vector<std::vector<std::string> > result;
1405-
result=m_sql.safe_query(
1406-
"SELECT ID, Manufacturer, Profile, [Type] FROM EnoceanSensors WHERE (HardwareID==%d) AND (DeviceID=='%q')",
1407-
m_HwdID, szDeviceID);
1403+
result = m_sql.safe_query("SELECT ID, Manufacturer, Profile, [Type] FROM EnoceanSensors WHERE (HardwareID==%d) AND (DeviceID=='%q')", m_HwdID, szDeviceID);
14081404
if (result.size()<1)
14091405
{
14101406
char *pszHumenTxt=enocean_hexToHuman(pFrame);

‎hardware/EnOceanESP3.cpp‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -634,8 +634,7 @@ bool CEnOceanESP3::WriteToHardware(const char *pdata, const unsigned char length
634634
std::vector<std::vector<std::string> > result;
635635
char szDeviceID[20];
636636
sprintf(szDeviceID,"%08X",(unsigned int)sID);
637-
result=m_sql.safe_query("SELECT SwitchType,LastLevel FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit==%d)",
638-
m_HwdID, szDeviceID, int(tsen->LIGHTING2.unitcode));
637+
result = m_sql.safe_query("SELECT SwitchType,LastLevel FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit==%d)", m_HwdID, szDeviceID, int(tsen->LIGHTING2.unitcode));
639638
if (result.size()>0)
640639
{
641640
_eSwitchType switchtype=(_eSwitchType)atoi(result[0][0].c_str());
@@ -1067,23 +1066,19 @@ void CEnOceanESP3::ParseRadioDatagram()
10671066

10681067

10691068
std::vector<std::vector<std::string> > result;
1070-
result=m_sql.safe_query("SELECT ID FROM EnoceanSensors WHERE (HardwareID==%d) AND (DeviceID=='%q')",
1071-
m_HwdID, szDeviceID);
1069+
result = m_sql.safe_query("SELECT ID FROM EnoceanSensors WHERE (HardwareID==%d) AND (DeviceID=='%q')", m_HwdID, szDeviceID);
10721070
if (result.size()<1)
10731071
{
10741072
//Add it to the database
1075-
m_sql.safe_query("INSERT INTO EnoceanSensors (HardwareID, DeviceID, Manufacturer, Profile, [Type]) VALUES (%d,'%q',%d,%d,%d)",
1076-
m_HwdID, szDeviceID, manufacturer, profile, ttype);
1073+
m_sql.safe_query("INSERT INTO EnoceanSensors (HardwareID, DeviceID, Manufacturer, Profile, [Type]) VALUES (%d,'%q',%d,%d,%d)", m_HwdID, szDeviceID, manufacturer, profile, ttype);
10771074
}
1078-
10791075
}
10801076
}
10811077
else
10821078
{
10831079
//Following sensors need to have had a teach-in
10841080
std::vector<std::vector<std::string> > result;
1085-
result=m_sql.safe_query("SELECT ID, Manufacturer, Profile, [Type] FROM EnoceanSensors WHERE (HardwareID==%d) AND (DeviceID=='%q')",
1086-
m_HwdID, szDeviceID);
1081+
result = m_sql.safe_query("SELECT ID, Manufacturer, Profile, [Type] FROM EnoceanSensors WHERE (HardwareID==%d) AND (DeviceID=='%q')", m_HwdID, szDeviceID);
10871082
if (result.size()<1)
10881083
{
10891084
_log.Log(LOG_NORM, "EnOcean: Need Teach-In for %s", szDeviceID);

‎hardware/FritzboxTCP.cpp‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,7 @@ void FritzboxTCP::UpdateSwitch(const unsigned char Idx, const int SubUnit, const
232232
sprintf(szIdx, "%X%02X%02X%02X", 0, 0, 0, Idx);
233233
std::stringstream szQuery;
234234
std::vector<std::vector<std::string> > result;
235-
result = m_sql.safe_query("SELECT Name,nValue,sValue FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit ==%d)",
236-
m_HwdID, szIdx, SubUnit);
235+
result = m_sql.safe_query("SELECT Name,nValue,sValue FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit ==%d)", m_HwdID, szIdx, SubUnit);
237236
if (result.size() < 1)
238237
{
239238
bDeviceExits = false;
@@ -280,8 +279,7 @@ void FritzboxTCP::UpdateSwitch(const unsigned char Idx, const int SubUnit, const
280279
if (!bDeviceExits)
281280
{
282281
//Assign default name for device
283-
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit == %d)",
284-
defaultname.c_str(), m_HwdID, szIdx, SubUnit);
282+
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit == %d)", defaultname.c_str(), m_HwdID, szIdx, SubUnit);
285283
}
286284
}
287285

@@ -330,14 +328,12 @@ void FritzboxTCP::ParseLine()
330328

331329
UpdateSwitch(1, 1, true, 100, "Call");
332330

333-
result = m_sql.safe_query("SELECT ID FROM DeviceStatus WHERE (HardwareID==%d) AND (Type==%d) AND (Subtype==%d)",
334-
m_HwdID, int(pTypeGeneral), int(sTypeTextStatus));
331+
result = m_sql.safe_query("SELECT ID FROM DeviceStatus WHERE (HardwareID==%d) AND (Type==%d) AND (Subtype==%d)", m_HwdID, int(pTypeGeneral), int(sTypeTextStatus));
335332
if (!result.empty())
336333
{
337334
std::string idx = result[0][0];
338335
sstr << "Connected ID: " << results[2] << " Number: " << results[4];
339-
m_sql.safe_query("INSERT INTO LightingLog (DeviceRowID, sValue) VALUES ('%q', '%q')",
340-
idx.c_str(), sstr.str().c_str());
336+
m_sql.safe_query("INSERT INTO LightingLog (DeviceRowID, sValue) VALUES ('%q', '%q')", idx.c_str(), sstr.str().c_str());
341337
}
342338
}
343339
else if (Cmd == "DISCONNECT")
@@ -355,8 +351,7 @@ void FritzboxTCP::ParseLine()
355351
{
356352
std::string idx = result[0][0];
357353
sstr << "Disconnect ID: " << results[2] << " Duration: " << results[3] << " seconds";
358-
m_sql.safe_query("INSERT INTO LightingLog (DeviceRowID, sValue) VALUES ('%q', '%q')",
359-
idx.c_str(), sstr.str().c_str());
354+
m_sql.safe_query("INSERT INTO LightingLog (DeviceRowID, sValue) VALUES ('%q', '%q')", idx.c_str(), sstr.str().c_str());
360355
}
361356
}
362357
}

‎hardware/HardwareMonitor.cpp‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -103,21 +103,17 @@ void CHardwareMonitor::Init()
103103
m_lastquerytime=0;
104104
m_HwdID = 0;
105105
std::vector<std::vector<std::string> > result;
106-
result=m_sql.safe_query("SELECT ID,Enabled FROM Hardware WHERE (Type==%d) AND (Name=='Motherboard') LIMIT 1",
107-
HTYPE_System);
106+
result = m_sql.safe_query("SELECT ID,Enabled FROM Hardware WHERE (Type==%d) AND (Name=='Motherboard') LIMIT 1", HTYPE_System);
108107
if (result.size()<1)
109108
{
110-
m_sql.safe_query("INSERT INTO Hardware (Name, Enabled, Type, Address, Port, Username, Password, Mode1, Mode2, Mode3, Mode4, Mode5, Mode6) VALUES ('Motherboard',1, %d,'',1,'','',0,0,0,0,0,0)",
111-
HTYPE_System);
109+
m_sql.safe_query("INSERT INTO Hardware (Name, Enabled, Type, Address, Port, Username, Password, Mode1, Mode2, Mode3, Mode4, Mode5, Mode6) VALUES ('Motherboard',1, %d,'',1,'','',0,0,0,0,0,0)", HTYPE_System);
112110
result=m_sql.safe_query("SELECT MAX(ID) FROM Hardware");
113111
if (result.size()>0)
114112
{
115113
std::vector<std::string> sd=result[0];
116114
m_HwdID=atoi(sd[0].c_str());
117115
}
118-
119-
result=m_sql.safe_query("SELECT ID,Enabled FROM Hardware WHERE (Type==%d) AND (Name=='Motherboard') LIMIT 1",
120-
HTYPE_System);
116+
result = m_sql.safe_query("SELECT ID,Enabled FROM Hardware WHERE (Type==%d) AND (Name=='Motherboard') LIMIT 1", HTYPE_System);
121117
}
122118

123119
if (result.size()>0)
@@ -161,8 +157,7 @@ void CHardwareMonitor::SendVoltage(const unsigned long Idx, const float Volt, co
161157
char szTmp[30];
162158
sprintf(szTmp, "%08X", (unsigned int)Idx);
163159

164-
result = m_sql.safe_query("SELECT Name FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
165-
m_HwdID, szTmp, int(pTypeGeneral), int(sTypeVoltage));
160+
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(sTypeVoltage));
166161
if (result.size() < 1)
167162
{
168163
bDeviceExits = false;
@@ -178,8 +173,7 @@ void CHardwareMonitor::SendVoltage(const unsigned long Idx, const float Volt, co
178173
if (!bDeviceExits)
179174
{
180175
//Assign default name for device
181-
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
182-
defaultname.c_str(), m_HwdID, szTmp, int(pTypeGeneral), int(sTypeVoltage));
176+
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(sTypeVoltage));
183177
}
184178
}
185179

@@ -191,8 +185,7 @@ void CHardwareMonitor::SendCurrent(const unsigned long Idx, const float Curr, co
191185
char szTmp[30];
192186
sprintf(szTmp, "%08X", (unsigned int)Idx);
193187

194-
result = m_sql.safe_query("SELECT Name FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
195-
m_HwdID, szTmp, int(pTypeGeneral), int(sTypeCurrent));
188+
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(sTypeCurrent));
196189
if (result.size() < 1)
197190
{
198191
bDeviceExits = false;
@@ -208,17 +201,15 @@ void CHardwareMonitor::SendCurrent(const unsigned long Idx, const float Curr, co
208201
if (!bDeviceExits)
209202
{
210203
//Assign default name for device
211-
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
212-
defaultname.c_str(), m_HwdID, szTmp, int(pTypeGeneral), int(sTypeCurrent));
204+
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(sTypeCurrent));
213205
}
214206
}
215207

216208
void CHardwareMonitor::SendTempSensor(const int Idx, const float Temp, const std::string &defaultname)
217209
{
218210
bool bDeviceExits = true;
219211
std::vector<std::vector<std::string> > result;
220-
result = m_sql.safe_query("SELECT Name FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID==%d) AND (Type==%d) AND (Subtype==%d)",
221-
m_HwdID, int(Idx), int(pTypeTEMP), int(sTypeTEMP10));
212+
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(pTypeTEMP), int(sTypeTEMP10));
222213
if (result.size() < 1)
223214
{
224215
bDeviceExits = false;
@@ -246,8 +237,7 @@ void CHardwareMonitor::SendTempSensor(const int Idx, const float Temp, const std
246237
if (!bDeviceExits)
247238
{
248239
//Assign default name for device
249-
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID==%d) AND (Type==%d) AND (Subtype==%d)",
250-
defaultname.c_str(), m_HwdID, int(Idx), int(pTypeTEMP), int(sTypeTEMP10));
240+
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(pTypeTEMP), int(sTypeTEMP10));
251241
}
252242
}
253243

@@ -259,8 +249,7 @@ void CHardwareMonitor::SendPercentage(const unsigned long Idx, const float Perce
259249
char szTmp[30];
260250
sprintf(szTmp, "%08X", (unsigned int)Idx);
261251

262-
result = m_sql.safe_query("SELECT Name FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
263-
m_HwdID, szTmp, int(pTypeGeneral), int(sTypePercentage));
252+
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(sTypePercentage));
264253
if (result.size() < 1)
265254
{
266255
bDeviceExits = false;
@@ -276,8 +265,7 @@ void CHardwareMonitor::SendPercentage(const unsigned long Idx, const float Perce
276265
if (!bDeviceExits)
277266
{
278267
//Assign default name for device
279-
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
280-
defaultname.c_str(), m_HwdID, szTmp, int(pTypeGeneral), int(sTypePercentage));
268+
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(sTypePercentage));
281269
}
282270
}
283271

@@ -289,8 +277,7 @@ void CHardwareMonitor::SendFanSensor(const int Idx, const int FanSpeed, const st
289277
char szTmp[30];
290278
sprintf(szTmp, "%08X", (unsigned int)Idx);
291279

292-
result = m_sql.safe_query("SELECT Name FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
293-
m_HwdID, szTmp, int(pTypeGeneral), int(sTypeFan));
280+
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(sTypeFan));
294281
if (result.size() < 1)
295282
{
296283
bDeviceExits = false;
@@ -306,8 +293,7 @@ void CHardwareMonitor::SendFanSensor(const int Idx, const int FanSpeed, const st
306293
if (!bDeviceExits)
307294
{
308295
//Assign default name for device
309-
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Type==%d) AND (Subtype==%d)",
310-
defaultname.c_str(), m_HwdID, szTmp, int(pTypeGeneral), int(sTypeFan));
296+
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(sTypeFan));
311297
}
312298
}
313299

‎hardware/HarmonyHub.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,7 @@ void CHarmonyHub::CheckSetActivity(const std::string &activityID, const bool on)
420420
hexId << std::setw(7) << std::hex << std::setfill('0') << std::uppercase << (int)( actId) ;
421421
std::string actHex = hexId.str();
422422
std::vector<std::vector<std::string> > result;
423-
result = m_sql.safe_query("SELECT Name,DeviceID FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q')",
424-
m_HwdID, actHex.c_str());
423+
result = m_sql.safe_query("SELECT Name,DeviceID FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q')", m_HwdID, actHex.c_str());
425424
if (result.size() > 0) //if not yet inserted, it will be inserted active upon the next check of the activities list
426425
{
427426
UpdateSwitch(atoi(result[0][1].c_str()), activityID.c_str(),on,result[0][0]);
@@ -437,8 +436,7 @@ void CHarmonyHub::UpdateSwitch(unsigned char idx,const char * realID, const bool
437436
//char szIdx[10];
438437
//sprintf(szIdx, "%X%02X%02X%02X", 0, 0, 0, idx);
439438
std::vector<std::vector<std::string> > result;
440-
result = m_sql.safe_query("SELECT Name,nValue,sValue FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q')",
441-
m_HwdID, hexId.str().c_str());
439+
result = m_sql.safe_query("SELECT Name,nValue,sValue FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q')", m_HwdID, hexId.str().c_str());
442440
if (result.size() < 1)
443441
{
444442
bDeviceExits = false;
@@ -484,8 +482,7 @@ void CHarmonyHub::UpdateSwitch(unsigned char idx,const char * realID, const bool
484482
if (!bDeviceExits)
485483
{
486484
//Assign default name for device
487-
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q')",
488-
defaultname.c_str(), m_HwdID, hexId.str().c_str());
485+
m_sql.safe_query("UPDATE DeviceStatus SET Name='%q' WHERE (HardwareID==%d) AND (DeviceID=='%q')", defaultname.c_str(), m_HwdID, hexId.str().c_str());
489486
}
490487
}
491488

0 commit comments

Comments
 (0)