Fixed Netatmo wind sensor values

Author: gizmocuz

History.txt

@@ -11,7 +11,7 @@ Version 2.xxx (xxxx 2015)
 - Implemented: Rain Report
 - Implemented: Temperature Report
 - Fixed: 1-Wire negative values
-- Implemented: Initial support for the Netatmo Weather Station (Big thanks to S�bastien!)
+- Implemented: Netatmo Weather Station (Big thanks to S�bastien!)
 - Changed: json "udevice" Perecentage sensor, you might get new ID's, now also creates an event for blockly/lua
 - Implemented: Text/Alert Sensor logging (when called from json api)
 - Implemented: Support for browsers that do not support gzip compression (thanks to ash77)

hardware/DomoticzHardware.cpp

@@ -839,7 +839,8 @@ bool CDomoticzHardwareBase::CheckPercentageSensorExists(const int NodeID, const
 	return (!result.empty());
 }
 
-void CDomoticzHardwareBase::SendWind(const int NodeID, const int BatteryLevel, const int WindDir, const float WindSpeed, const float WindGust, const float WindTemp, const float WindChill, const bool bHaveWindTemp, const std::string &defaultname)
+//wind direction is in steps of 22.5 degrees (360/16)
+void CDomoticzHardwareBase::SendWind(const int NodeID, const int BatteryLevel, const float WindDir, const float WindSpeed, const float WindGust, const float WindTemp, const float WindChill, const bool bHaveWindTemp, const std::string &defaultname)
 {
 	bool bDeviceExits = true;
 	std::stringstream szQuery;
@@ -870,7 +871,7 @@ void CDomoticzHardwareBase::SendWind(const int NodeID, const int BatteryLevel, c
 	tsen.WIND.id1 = (NodeID & 0xFF00) >> 8;
 	tsen.WIND.id2 = NodeID & 0xFF;
 
-	float winddir = float(WindDir)*22.5f;
+	float winddir = WindDir*22.5f;
 	int aw = round(winddir);
 	tsen.WIND.directionh = (BYTE)(aw / 256);
 	aw -= (tsen.WIND.directionh * 256);

hardware/DomoticzHardware.h

@@ -122,7 +122,7 @@ class CDomoticzHardwareBase
 	void SendCurrentSensor(const int NodeID, const int BatteryLevel, const float Current1, const float Current2, const float Current3, const std::string &defaultname);
 	void SendPercentageSensor(const int NodeID, const int ChildID, const int BatteryLevel, const float Percentage, const std::string &defaultname);
 	void SendRainSensor(const int NodeID, const int BatteryLevel, const int RainCounter, const std::string &defaultname);
-	void SendWind(const int NodeID, const int BatteryLevel, const int WindDir, const float WindSpeed, const float WindGust, const float WindTemp, const float WindChill, const bool bHaveWindTemp, const std::string &defaultname);
+	void SendWind(const int NodeID, const int BatteryLevel, const float WindDir, const float WindSpeed, const float WindGust, const float WindTemp, const float WindChill, const bool bHaveWindTemp, const std::string &defaultname);
 	void SendPressureSensor(const int NodeID, const int ChildID, const int BatteryLevel, const float pressure);
 	void SendDistanceSensor(const int NodeID, const int ChildID, const int BatteryLevel, const float distance);
 	void SendMeterSensor(const int NodeID, const int ChildID, const int BatteryLevel, const float metervalue);

hardware/MySensorsBase.cpp

@@ -353,7 +353,7 @@ void MySensorsBase::MakeAndSendWindSensor(const int nodeID)
 		}
 	}
 	int cNode = (nodeID << 8) | ChildID;
-	SendWind(cNode, iBatteryLevel, iDirection, fWind, fGust, fTemp, fChill, bHaveTemp, "Wind");
+	SendWind(cNode, iBatteryLevel, float(iDirection), fWind, fGust, fTemp, fChill, bHaveTemp, "Wind");
 }
 
 void MySensorsBase::SendSensor2Domoticz(const _tMySensorNode *pNode, const _tMySensorSensor *pSensor)