Fixed Notifications for some general sensors (like sound level)

gizmocuz · gizmocuz · commit 2a895ee9cdce · 2016-03-06T15:32:38.000+01:00
diff --git a/main/mainworker.cpp b/main/mainworker.cpp
@@ -9258,7 +9258,7 @@ void MainWorker::decode_General(const int HwdID, const _eHardwareTypes HwdType,
 		DevRowIdx=m_sql.UpdateValue(HwdID, ID.c_str(),Unit,devType,subType,SignalLevel,BatteryLevel,pMeter->intval2, procResult.DeviceName);
 		if (DevRowIdx == -1)
 			return;
-		m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_USAGE, (float)pMeter->intval1);
+		m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_USAGE, (float)pMeter->intval2);
 	}
 	else if (subType==sTypeLeafWetness)
 	{
@@ -9321,15 +9321,15 @@ void MainWorker::decode_General(const int HwdID, const _eHardwareTypes HwdType,
 		DevRowIdx = m_sql.UpdateValue(HwdID, ID.c_str(), Unit, devType, subType, SignalLevel, BatteryLevel, cmnd, szTmp, procResult.DeviceName);
 		if (DevRowIdx == -1)
 			return;
-		m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_RPM, (float)pMeter->intval1);
+		m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_RPM, (float)pMeter->intval2);
 	}
 	else if (subType == sTypeSoundLevel)
 	{
 		sprintf(szTmp, "%d", pMeter->intval2);
 		DevRowIdx = m_sql.UpdateValue(HwdID, ID.c_str(), Unit, devType, subType, SignalLevel, BatteryLevel, cmnd, szTmp, procResult.DeviceName);
 		if (DevRowIdx == -1)
 			return;
-		m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_RPM, (float)pMeter->intval1);
+		m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_RPM, (float)pMeter->intval2);
 	}
 	else if (subType == sTypeZWaveClock)
 	{

Original file line number	Diff line number	Diff line change
`@@ -9258,7 +9258,7 @@ void MainWorker::decode_General(const int HwdID, const _eHardwareTypes HwdType,`
`9258`	`9258`	`DevRowIdx=m_sql.UpdateValue(HwdID, ID.c_str(),Unit,devType,subType,SignalLevel,BatteryLevel,pMeter->intval2, procResult.DeviceName);`
`9259`	`9259`	`if (DevRowIdx == -1)`
`9260`	`9260`	`return;`
`9261`		`- m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_USAGE, (float)pMeter->intval1);`
	`9261`	`+ m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_USAGE, (float)pMeter->intval2);`
`9262`	`9262`	`}`
`9263`	`9263`	`else if (subType==sTypeLeafWetness)`
`9264`	`9264`	`{`
`@@ -9321,15 +9321,15 @@ void MainWorker::decode_General(const int HwdID, const _eHardwareTypes HwdType,`
`9321`	`9321`	`DevRowIdx = m_sql.UpdateValue(HwdID, ID.c_str(), Unit, devType, subType, SignalLevel, BatteryLevel, cmnd, szTmp, procResult.DeviceName);`
`9322`	`9322`	`if (DevRowIdx == -1)`
`9323`	`9323`	`return;`
`9324`		`- m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_RPM, (float)pMeter->intval1);`
	`9324`	`+ m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_RPM, (float)pMeter->intval2);`
`9325`	`9325`	`}`
`9326`	`9326`	`else if (subType == sTypeSoundLevel)`
`9327`	`9327`	`{`
`9328`	`9328`	`sprintf(szTmp, "%d", pMeter->intval2);`
`9329`	`9329`	`DevRowIdx = m_sql.UpdateValue(HwdID, ID.c_str(), Unit, devType, subType, SignalLevel, BatteryLevel, cmnd, szTmp, procResult.DeviceName);`
`9330`	`9330`	`if (DevRowIdx == -1)`
`9331`	`9331`	`return;`
`9332`		`- m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_RPM, (float)pMeter->intval1);`
	`9332`	`+ m_notifications.CheckAndHandleNotification(DevRowIdx, procResult.DeviceName,devType, subType, NTYPE_RPM, (float)pMeter->intval2);`
`9333`	`9333`	`}`
`9334`	`9334`	`else if (subType == sTypeZWaveClock)`
`9335`	`9335`	`{`