Implemented: OpenZWave, Controller Node, option for Nightly Network Heal (disabled by default)

Author: gizmocuz

History.txt

@@ -39,6 +39,7 @@ Version 2.0.xxxx (October xxth 2014)
 - Implemented: Manual add Thermostat2 switch (type HE105)
 - Implemented: OpenZWave, Blinds Percentage Inverted (Thanks to PIM)
 - Implemented: OpenZWave, polling all multi_sensor values now (if polling enabled)
+- Implemented: OpenZWave, Controller Node, option for Nightly Network Heal (disabled by default)
 
 Version 2.0.2025 (September 28th 2014)
 - Implemented: Fibaro Link data pusher

hardware/OpenZWave.cpp

@@ -265,6 +265,7 @@ m_szSerialPort(devname)
 	m_allNodesQueried = false;
 	m_awakeNodesQueried = false;
 	m_bInUserCodeEnrollmentMode = false;
+	m_bNightlyNetworkHeal = false;
 	m_pManager = NULL;
 }
 
@@ -745,6 +746,11 @@ bool COpenZWave::OpenSerialConnector()
 	OpenZWave::Manager::Get()->AddDriver(m_szSerialPort.c_str());
 #endif
 	m_LastControllerConfigWrite = mytime(NULL);
+
+	int nightly_heal = 0;
+	m_sql.GetPreferencesVar("ZWaveEnableNightlyNetworkHeal", nightly_heal);
+	m_bNightlyNetworkHeal = (nightly_heal != 0);
+
 	//Manager::Get()->AddDriver( "HID Controller", Driver::ControllerInterface_Hid );
 	return true;
 }
@@ -2727,14 +2733,29 @@ void COpenZWave::GetNodeValuesJson(const unsigned int homeID, const int nodeID,
 		root["result"][index]["config"][ivalue]["LastUpdate"] = "-";
 		ivalue++;
 
+		//Nightly Node Heal
+		root["result"][index]["config"][ivalue]["type"] = "short";
+
+		int nightly_heal = 0;
+		m_sql.GetPreferencesVar("ZWaveEnableNightlyNetworkHeal", nightly_heal);
+		root["result"][index]["config"][ivalue]["value"] = nightly_heal;
+
+		root["result"][index]["config"][ivalue]["index"] = 3;
+		root["result"][index]["config"][ivalue]["label"] = "Enable Nightly Heal Network (04:00 am)";
+		root["result"][index]["config"][ivalue]["units"] = "";
+		root["result"][index]["config"][ivalue]["help"] =
+			"Enable/Disable nightly heal network. Disabled=0, Enabled=1 ";
+		root["result"][index]["config"][ivalue]["LastUpdate"] = "-";
+		ivalue++;
+
 		//Network Key
 		root["result"][index]["config"][ivalue]["type"] = "string";
 
 		std::string sValue = "0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10";
 		m_sql.GetPreferencesVar("ZWaveNetworkKey", sValue);
 		root["result"][index]["config"][ivalue]["value"] = sValue;
 
-		root["result"][index]["config"][ivalue]["index"] = 3;
+		root["result"][index]["config"][ivalue]["index"] = 4;
 		root["result"][index]["config"][ivalue]["label"] = "Security Network Key";
 		root["result"][index]["config"][ivalue]["units"] = "";
 		root["result"][index]["config"][ivalue]["help"] =
@@ -2896,6 +2917,18 @@ bool COpenZWave::ApplyNodeConfig(const unsigned int homeID, const int nodeID, co
 				}
 			}
 			else if (rvIndex == 3)
+			{
+				//Nightly Node Heal
+				int nightly_heal = atoi(ValueVal.c_str());
+				int old_nightly_heal = 0;
+				m_sql.GetPreferencesVar("ZWaveEnableNightlyNetworkHeal", old_nightly_heal);
+				if (old_nightly_heal != nightly_heal)
+				{
+					m_sql.UpdatePreferencesVar("ZWaveEnableNightlyNetworkHeal", nightly_heal);
+					m_bNightlyNetworkHeal = (nightly_heal != 0);
+				}
+			}
+			else if (rvIndex == 4)
 			{
 				//Security Key
 				std::string networkkey = ValueVal;
@@ -3031,5 +3064,12 @@ bool COpenZWave::RemoveUserCode(const unsigned int homeID, const int nodeID, con
 	return true;
 }
 
+void COpenZWave::NightlyNodeHeal()
+{
+	if (!m_bNightlyNetworkHeal)
+		return; //not enabled
+	HealNetwork();
+}
+
 #endif //WITH_OPENZWAVE
 

hardware/OpenZWave.h

@@ -104,6 +104,8 @@ class COpenZWave : public AsyncSerial, public ZWaveBase
 	bool RemoveNodeFromGroup(const int nodeID,const int groupID, const int removeID);
 	std::string GetConfigFile(std::string &szConfigFile);
 
+	void NightlyNodeHeal();
+
 	bool m_awakeNodesQueried;
 	bool m_allNodesQueried;
 
@@ -150,6 +152,7 @@ class COpenZWave : public AsyncSerial, public ZWaveBase
 	bool m_bIsShuttingDown;
 	bool m_initFailed;
 	bool m_bInUserCodeEnrollmentMode;
+	bool m_bNightlyNetworkHeal;
 };
 
 #endif //WITH_OPENZWAVE

main/SQLHelper.cpp

@@ -1258,6 +1258,10 @@ bool CSQLHelper::OpenDatabase()
 	{
 		UpdatePreferencesVar("ZWaveNetworkKey", "0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10");
 	}
+	if (!GetPreferencesVar("ZWaveEnableNightlyNetworkHeal", nValue))
+	{
+		UpdatePreferencesVar("ZWaveEnableNightlyNetworkHeal", 0);
+	}
 	if (!GetPreferencesVar("BatteryLowNotification", nValue))
 	{
 		UpdatePreferencesVar("BatteryLowNotification", 0); //default disabled

main/mainworker.cpp

@@ -1027,7 +1027,7 @@ void MainWorker::Do_Work()
 					if (pHardware->HwdType == HTYPE_OpenZWave)
 					{
 						COpenZWave *pZWave = (COpenZWave *)pHardware;
-						pZWave->HealNetwork();
+						pZWave->NightlyNodeHeal();
 					}
 				}
 			}

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 639
+# ref 641
 
 CACHE:
 # CSS