ZWave, rain-rate as custom sensor

Author: gizmocuz

hardware/OpenZWave.cpp

@@ -56,7 +56,8 @@ enum _eSensorScaleID
 	SCALEID_CO2,
 	SCALEID_WATER,
 	SCALEID_MOISTRUE,
-	SCALEID_TANK_CAPACITY
+	SCALEID_TANK_CAPACITY,
+	SCALEID_RAIN_RATE,
 };
 
 struct _tAlarmNameToIndexMapping
@@ -2093,8 +2094,18 @@ void COpenZWave::AddValue(const OpenZWave::ValueID &vID, const NodeInfo *pNodeIn
 		}
 		else if (vLabel == "Rain Rate")
 		{
-			//Ignore
-			return;
+			if (vType == OpenZWave::ValueID::ValueType_Decimal)
+			{
+				if (m_pManager->GetValueAsFloat(vID, &fValue) == true)
+				{
+					_device.floatValue = fValue;
+					_device.scaleID = SCALEID_RAIN_RATE;
+					_device.scaleMultiply = 1;
+					_device.devType = ZDTYPE_SENSOR_CUSTOM;
+					_device.custom_label = "mm/h";
+					InsertDevice(_device);
+				}
+			}
 		}
 		else
 		{
@@ -2578,6 +2589,8 @@ void COpenZWave::UpdateValue(const OpenZWave::ValueID &vID)
 			scaleID = SCALEID_MOISTRUE;
 		else if (vLabel == "Tank Capacity")
 			scaleID = SCALEID_TANK_CAPACITY;
+		else if (vLabel == "Rain Rate")
+			scaleID = SCALEID_RAIN_RATE;
 
 		sstr << "." << scaleID;
 	}
@@ -3152,6 +3165,14 @@ void COpenZWave::UpdateValue(const OpenZWave::ValueID &vID)
 		pDevice->floatValue = fValue; //always set the value
 	}
 	break;
+	case ZDTYPE_SENSOR_CUSTOM:
+	{
+		if (vType != OpenZWave::ValueID::ValueType_Decimal)
+			return;
+		float oldvalue = pDevice->floatValue;
+		pDevice->floatValue = fValue;
+	}
+	break;
 	case ZDTYPE_SENSOR_MOISTURE:
 	{
 		if (vType != OpenZWave::ValueID::ValueType_Decimal)

hardware/ZWaveBase.cpp

@@ -766,6 +766,10 @@ void ZWaveBase::SendDevice2Domoticz(const _tZWaveDevice *pDevice)
 		sprintf(szTmp, "Alarm Type: %s %d(0x%02X)", pDevice->label.c_str(), pDevice->Alarm_Type, pDevice->Alarm_Type);
 		sDecodeRXMessage(this, (const unsigned char *)&gDevice, szTmp, BatLevel);
 	}
+	else if (pDevice->devType == ZDTYPE_SENSOR_CUSTOM)
+	{
+		SendCustomSensor(ID3, ID4, BatLevel, pDevice->floatValue, pDevice->label, pDevice->custom_label);
+	}
 }
 
 ZWaveBase::_tZWaveDevice* ZWaveBase::FindDevice(const int nodeID, const int instanceID, const int indexID)

hardware/ZWaveBase.h

@@ -44,6 +44,9 @@ class ZWaveBase : public CDomoticzHardwareBase
 
 		ZDTYPE_ALARM,
 		ZDTYPE_CENTRAL_SCENE,
+
+		ZDTYPE_SENSOR_CUSTOM,
+
 	};
 	struct _tZWaveDevice
 	{
@@ -83,6 +86,7 @@ class ZWaveBase : public CDomoticzHardwareBase
 
 		//label
 		std::string label;
+		std::string custom_label;
 
 		time_t lastreceived;
 		unsigned char sequence_number;