- Implemented: AccuWeather Support

gizmocuz · gizmocuz · commit bc848cd58e8a · 2016-06-26T12:22:40.000+02:00
- Changed: Wind Direction for o.a. Netatmo
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -221,6 +221,7 @@ hardware/1Wire/1WireByOWFS.cpp
 hardware/1Wire/1WireByKernel.cpp
 hardware/1Wire/1WireCommon.cpp
 hardware/1Wire/1WireForWindows.cpp
+hardware/AccuWeather.cpp
 hardware/AnnaThermostat.cpp
 hardware/ASyncSerial.cpp
 hardware/ASyncTCP.cpp
diff --git a/History.txt b/History.txt
@@ -1,4 +1,5 @@
 Version 3.xxxx (June xx 2016)
+- Implemented: AccuWeather support
 - Implemented: Atag One Thermostat support
 - Implemented: Blockly/Lua Camera device, to send camera snapshots with subject after xx seconds
 - Implemented: Blockly upgraded to latest version (fixed and cleaned some code as well), this fixes problem with long sensor lists
diff --git a/hardware/DomoticzHardware.cpp b/hardware/DomoticzHardware.cpp
@@ -711,7 +711,7 @@ void CDomoticzHardwareBase::SendCustomSensor(const int NodeID, const int ChildID
 }
 
 //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)
+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)
 {
 	RBUF tsen;
 	memset(&tsen, 0, sizeof(RBUF));
@@ -726,8 +726,7 @@ void CDomoticzHardwareBase::SendWind(const int NodeID, const int BatteryLevel, c
 	tsen.WIND.id1 = (NodeID & 0xFF00) >> 8;
 	tsen.WIND.id2 = NodeID & 0xFF;
 
-	float winddir = WindDir*22.5f;
-	int aw = round(winddir);
+	int aw = WindDir;
 	tsen.WIND.directionh = (BYTE)(aw / 256);
 	aw -= (tsen.WIND.directionh * 256);
 	tsen.WIND.directionl = (BYTE)(aw);
diff --git a/hardware/DomoticzHardware.h b/hardware/DomoticzHardware.h
@@ -72,7 +72,7 @@ class CDomoticzHardwareBase
 	void SendWaterflowSensor(const int NodeID, const int ChildID, const int BatteryLevel, const float LPM, const std::string &defaultname);
 	void SendRainSensor(const int NodeID, const int BatteryLevel, const float RainCounter, const std::string &defaultname);
 	float GetRainSensorValue(const int NodeID, bool &bExists);
-	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 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 SendPressureSensor(const int NodeID, const int ChildID, const int BatteryLevel, const float pressure, const std::string &defaultname);
 	void SendSolarRadiationSensor(const unsigned char NodeID, const int BatteryLevel, const float radiation, const std::string &defaultname);
 	void SendDistanceSensor(const int NodeID, const int ChildID, const int BatteryLevel, const float distance, const std::string &defaultname);
diff --git a/hardware/MySensorsBase.cpp b/hardware/MySensorsBase.cpp
@@ -525,7 +525,7 @@ void MySensorsBase::MakeAndSendWindSensor(const int nodeID, const std::string &s
 		}
 	}
 	int cNode = (nodeID << 8) | ChildID;
-	SendWind(cNode, iBatteryLevel, float(iDirection), fWind, fGust, fTemp, fChill, bHaveTemp, sname);
+	SendWind(cNode, iBatteryLevel, iDirection, fWind, fGust, fTemp, fChill, bHaveTemp, sname);
 }
 
 void MySensorsBase::SendSensor2Domoticz(_tMySensorNode *pNode, _tMySensorChild *pChild, const _eSetType vType)
diff --git a/hardware/Netatmo.cpp b/hardware/Netatmo.cpp
@@ -448,7 +448,7 @@ bool CNetatmo::ParseDashboard(const Json::Value &root, const int DevIdx, const i
 	float rain;
 	int sound;
 
-	float wind_angle = 0;
+	int wind_angle = 0;
 	int wind_gust_angle = 0;
 	float wind_strength = 0;
 	float wind_gust = 0;
@@ -516,7 +516,7 @@ bool CNetatmo::ParseDashboard(const Json::Value &root, const int DevIdx, const i
 			)
 		{
 			bHaveWind = true;
-			wind_angle = float(root["WindAngle"].asInt())/16.0f;
+			wind_angle = root["WindAngle"].asInt();
 			wind_gust_angle = root["GustAngle"].asInt();
 			wind_strength = root["WindStrength"].asFloat()/ 3.6f;
 			wind_gust = root["GustStrength"].asFloat() / 3.6f;
diff --git a/hardware/RFLinkBase.cpp b/hardware/RFLinkBase.cpp
@@ -855,15 +855,15 @@ bool CRFLinkBase::ParseLine(const std::string &sLine)
 
 	if (bHaveWindDir && bHaveWindSpeed && bHaveWindGust && bHaveWindChill)
 	{
-		SendWind(ID, BatteryLevel, float(windir), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);
+		SendWind(ID, BatteryLevel, round(float(windir)*22.5f), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);
 	}
 	else if (bHaveWindDir && bHaveWindGust)
 	{
-		SendWind(ID, BatteryLevel, float(windir), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);
+		SendWind(ID, BatteryLevel, round(float(windir)*22.5f), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);
 	}
 	else if (bHaveWindSpeed)
 	{
-		SendWind(ID, BatteryLevel, float(windir), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);
+		SendWind(ID, BatteryLevel, round(float(windir)*22.5f), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);
 	}
     
 	if (bHaveCO2)
diff --git a/main/RFXNames.cpp b/main/RFXNames.cpp
@@ -226,6 +226,7 @@ const char *Hardware_Type_Desc(int hType)
 		{ HTYPE_RAVEn, "Rainforest RAVEn USB" },
 		{ HTYPE_S0SmartMeterTCP, "S0 Meter with LAN interface" },
 		{ HTYPE_DenkoviSmartdenLan, "Denkovi Smartden with LAN interface" },
+		{ HTYPE_AccuWeather, "AccuWeather (Weather Lookup)" },
 		{ 0, NULL, NULL }
 	};
 	return findTableIDSingle1 (Table, hType);
diff --git a/main/RFXNames.h b/main/RFXNames.h
@@ -158,6 +158,7 @@ enum _eHardwareTypes {
 	HTYPE_RAVEn,	    		//76
 	HTYPE_S0SmartMeterTCP,		//77
 	HTYPE_DenkoviSmartdenLan,	//78
+	HTYPE_AccuWeather,			//79
 	HTYPE_END
 };
 
diff --git a/main/SQLHelper.cpp b/main/SQLHelper.cpp
@@ -1913,6 +1913,7 @@ bool CSQLHelper::OpenDatabase()
 				<< "([Type] = " << HTYPE_TOONTHERMOSTAT << ") OR "
 				<< "([Type] = " << HTYPE_Wunderground << ") OR "
 				<< "([Type] = " << HTYPE_ForecastIO << ") OR "
+				<< "([Type] = " << HTYPE_AccuWeather << ") OR "
 				<< "([Type] = " << HTYPE_RazberryZWave << ") OR "
 				<< "([Type] = " << HTYPE_OpenZWave << ")"
 				<< ")";
diff --git a/main/WebServer.cpp b/main/WebServer.cpp
@@ -19,6 +19,7 @@
 #include "../hardware/EnOceanESP3.h"
 #include "../hardware/Wunderground.h"
 #include "../hardware/ForecastIO.h"
+#include "../hardware/AccuWeather.h"
 #include "../hardware/Kodi.h"
 #include "../hardware/LogitechMediaServer.h"
 #include "../hardware/MySensorsBase.h"
@@ -1070,6 +1071,7 @@ namespace http {
 			else if (
 				(htype == HTYPE_Wunderground) ||
 				(htype == HTYPE_ForecastIO) ||
+				(htype == HTYPE_AccuWeather) ||
 				(htype == HTYPE_ICYTHERMOSTAT) ||
 				(htype == HTYPE_TOONTHERMOSTAT) ||
 				(htype == HTYPE_AtagOne) ||
@@ -1322,6 +1324,7 @@ namespace http {
 			else if (
 				(htype == HTYPE_Wunderground) ||
 				(htype == HTYPE_ForecastIO) ||
+				(htype == HTYPE_AccuWeather) ||
 				(htype == HTYPE_ICYTHERMOSTAT) ||
 				(htype == HTYPE_TOONTHERMOSTAT) ||
 				(htype == HTYPE_AtagOne) ||
@@ -7438,6 +7441,15 @@ namespace http {
 								root["result"][ii]["forecast_url"] = base64_encode((const unsigned char*)forecast_url.c_str(), forecast_url.size());
 							}
 						}
+						else if (pHardware->HwdType == HTYPE_AccuWeather)
+						{
+							CAccuWeather *pWHardware = reinterpret_cast<CAccuWeather*>(pHardware);
+							std::string forecast_url = pWHardware->GetForecastURL();
+							if (forecast_url != "")
+							{
+								root["result"][ii]["forecast_url"] = base64_encode((const unsigned char*)forecast_url.c_str(), forecast_url.size());
+							}
+						}
 					}
 
 					sprintf(szData, "%04X", (unsigned int)atoi(sd[1].c_str()));
diff --git a/main/mainworker.cpp b/main/mainworker.cpp
@@ -94,6 +94,7 @@
 #include "../hardware/Fitbit.h"
 #include "../hardware/RAVEn.h"
 #include "../hardware/DenkoviSmartdenLan.h"
+#include "../hardware/AccuWeather.h"
 
 // load notifications configuration
 #include "../notifications/NotificationHelper.h"
@@ -787,6 +788,9 @@ bool MainWorker::AddHardwareFromParams(
 	case HTYPE_ForecastIO:
 		pHardware = new CForecastIO(ID,Username,Password);
 		break;
+	case HTYPE_AccuWeather:
+		pHardware = new CAccuWeather(ID, Username, Password);
+		break;
 	case HTYPE_SolarEdgeAPI:
 		pHardware = new SolarEdgeAPI(ID, Mode1, Username, Password);
 		break;
diff --git a/msbuild/domoticz.vcxproj b/msbuild/domoticz.vcxproj
@@ -407,6 +407,7 @@
     <ClInclude Include="..\hardware\1Wire\1WireSystem.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="..\hardware\AccuWeather.h" />
     <ClInclude Include="..\hardware\AnnaThermostat.h" />
     <ClInclude Include="..\hardware\ASyncTCP.h" />
     <ClInclude Include="..\hardware\AtagOne.h" />
@@ -613,6 +614,7 @@
     <ClCompile Include="..\hardware\1Wire\1WireForWindows.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\hardware\AccuWeather.cpp" />
     <ClCompile Include="..\hardware\AnnaThermostat.cpp" />
     <ClCompile Include="..\hardware\ASyncSerial.cpp" />
     <ClCompile Include="..\hardware\ASyncTCP.cpp" />
diff --git a/msbuild/domoticz.vcxproj.filters b/msbuild/domoticz.vcxproj.filters
@@ -414,6 +414,9 @@
     <Filter Include="Devices\Denkovi">
       <UniqueIdentifier>{fbed8d30-c2ae-4545-a422-68ebe2c781c3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Devices\AccuWeather">
+      <UniqueIdentifier>{3a086069-f89a-44b7-b3a8-19cb9b7509eb}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\CMakeLists.txt">
@@ -1849,6 +1852,9 @@
     <ClInclude Include="..\hardware\DenkoviSmartdenLan.h">
       <Filter>Devices\Denkovi</Filter>
     </ClInclude>
+    <ClInclude Include="..\hardware\AccuWeather.h">
+      <Filter>Devices\AccuWeather</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\webserver\Base64.cpp">
@@ -2415,6 +2421,9 @@
     <ClCompile Include="..\hardware\DenkoviSmartdenLan.cpp">
       <Filter>Devices\Denkovi</Filter>
     </ClCompile>
+    <ClCompile Include="..\hardware\AccuWeather.cpp">
+      <Filter>Devices\AccuWeather</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="domoticz.rc">
diff --git a/www/app/HardwareController.js b/www/app/HardwareController.js
@@ -409,7 +409,7 @@ define(['app'], function (app) {
                     }
                 });
             }
-            else if ((text.indexOf("Underground") >= 0)||(text.indexOf("Forecast") >= 0))
+            else if ((text.indexOf("Underground") >= 0)||(text.indexOf("Forecast") >= 0)||(text.indexOf("AccuWeather") >= 0))
             {
                 var apikey=$("#hardwarecontent #divunderground #apikey").val();
                 if (apikey=="")
@@ -1008,7 +1008,7 @@ define(['app'], function (app) {
                      }
                 });
             }
-            else if ((text.indexOf("Underground") >= 0)||(text.indexOf("Forecast") >= 0))
+            else if ((text.indexOf("Underground") >= 0)||(text.indexOf("Forecast") >= 0)||(text.indexOf("AccuWeather") >= 0))
             {
                 var apikey=$("#hardwarecontent #divunderground #apikey").val();
                 if (apikey=="")
@@ -4139,7 +4139,7 @@ define(['app'], function (app) {
                             $("#hardwarecontent #hardwareparamsremote #tcpport").val(data["Port"]);
                             $("#hardwarecontent #hardwareparamslogin #password").val(data["Password"]);
                         }
-                        else if ((data["Type"].indexOf("Underground") >= 0)||(data["Type"].indexOf("Forecast") >= 0)) {
+                        else if ((data["Type"].indexOf("Underground") >= 0)||(data["Type"].indexOf("Forecast") >= 0)||(data["Type"].indexOf("AccuWeather") >= 0)) {
                             $("#hardwarecontent #hardwareparamsunderground #apikey").val(data["Username"]);
                             $("#hardwarecontent #hardwareparamsunderground #location").val(data["Password"]);
                         }
@@ -4367,7 +4367,7 @@ define(['app'], function (app) {
                 $("#hardwarecontent #divhttppoller").show();
                 $("#hardwarecontent #hardwareparamshttp #refresh").val(300);
             }
-            else if ((text.indexOf("Underground") >= 0)||(text.indexOf("Forecast") >= 0))
+            else if ((text.indexOf("Underground") >= 0)||(text.indexOf("Forecast") >= 0)||(text.indexOf("AccuWeather") >= 0))
             {
                 $("#hardwarecontent #divserial").hide();
                 $("#hardwarecontent #divremote").hide();
diff --git a/www/html5.appcache b/www/html5.appcache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 1263
+# ref 1264
 
 CACHE:
 # CSS

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`Version 3.xxxx (June xx 2016)`
	`2`	`+- Implemented: AccuWeather support`
`2`	`3`	`- Implemented: Atag One Thermostat support`
`3`	`4`	`- Implemented: Blockly/Lua Camera device, to send camera snapshots with subject after xx seconds`
`4`	`5`	`- Implemented: Blockly upgraded to latest version (fixed and cleaned some code as well), this fixes problem with long sensor lists`
Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ void MySensorsBase::MakeAndSendWindSensor(const int nodeID, const std::string &s`
`525`	`525`	`}`
`526`	`526`	`}`
`527`	`527`	`int cNode = (nodeID << 8) \| ChildID;`
`528`		`- SendWind(cNode, iBatteryLevel, float(iDirection), fWind, fGust, fTemp, fChill, bHaveTemp, sname);`
	`528`	`+ SendWind(cNode, iBatteryLevel, iDirection, fWind, fGust, fTemp, fChill, bHaveTemp, sname);`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`void MySensorsBase::SendSensor2Domoticz(_tMySensorNode pNode, _tMySensorChild pChild, const _eSetType vType)`
Original file line number	Diff line number	Diff line change
`@@ -855,15 +855,15 @@ bool CRFLinkBase::ParseLine(const std::string &sLine)`
`855`	`855`
`856`	`856`	`if (bHaveWindDir && bHaveWindSpeed && bHaveWindGust && bHaveWindChill)`
`857`	`857`	`{`
`858`		`- SendWind(ID, BatteryLevel, float(windir), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);`
	`858`	`+ SendWind(ID, BatteryLevel, round(float(windir)*22.5f), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);`
`859`	`859`	`}`
`860`	`860`	`else if (bHaveWindDir && bHaveWindGust)`
`861`	`861`	`{`
`862`		`- SendWind(ID, BatteryLevel, float(windir), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);`
	`862`	`+ SendWind(ID, BatteryLevel, round(float(windir)*22.5f), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);`
`863`	`863`	`}`
`864`	`864`	`else if (bHaveWindSpeed)`
`865`	`865`	`{`
`866`		`- SendWind(ID, BatteryLevel, float(windir), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);`
	`866`	`+ SendWind(ID, BatteryLevel, round(float(windir)*22.5f), windspeed, windgust, windtemp, windchill, bHaveWindTemp, tmp_Name);`
`867`	`867`	`}`
`868`	`868`
`869`	`869`	`if (bHaveCO2)`