Implemented: MySensors, Saving/Loading VAR values

Author: gizmocuz

History.txt

@@ -22,6 +22,7 @@ Version 2.0.xxxx (xxxx 2015)
 - Fixed: TeleInfo (TDF) Hardware ID
 - Changed: Air Quality (CO-2) sensor class
 - Implemented: MySensors Water meter
+- Implemented: MySensors, Saving/Loading VAR values
 
 Version 2.0.2284 (February 22th 2015)
 - Fixed: Firefox, RGBW/Setpoint popup

hardware/MySensorsBase.cpp

@@ -528,6 +528,45 @@ bool MySensorsBase::WriteToHardware(const char *pdata, const unsigned char lengt
 	return true;
 }
 
+void MySensorsBase::UpdateVar(const int NodeID, const int ChildID, const int VarID, const std::string &svalue)
+{
+	std::stringstream sstr;
+
+	std::vector<std::vector<std::string> > result;
+	sstr << "SELECT ROWID FROM MySensorsVars WHERE (HardwareID=" << m_HwdID << ") AND (NodeID=" << NodeID << ") AND (NodeID=" << NodeID << ") AND (ChildID=" << ChildID << ") AND (VarID=" << VarID << ")";
+	result = m_sql.query(sstr.str());
+	if (result.size() == 0)
+	{
+		//Insert
+		sstr.clear();
+		sstr.str("");
+		sstr << "INSERT INTO MySensorsVars (HardwareID, NodeID, ChildID, VarID, [Value]) VALUES (" << m_HwdID << ", " << NodeID << "," << ChildID << ", " << VarID << ",'" << svalue << "')";
+		result = m_sql.query(sstr.str());
+	}
+	else
+	{
+		//Update
+		sstr.clear();
+		sstr.str("");
+		sstr << "UPDATE MySensorsVars SET [Value]='" << svalue << "' WHERE (ROWID = " << result[0][0] << ")";
+		result = m_sql.query(sstr.str());
+	}
+
+}
+
+bool MySensorsBase::GetVar(const int NodeID, const int ChildID, const int VarID, std::string &sValue)
+{
+	std::stringstream sstr;
+
+	std::vector<std::vector<std::string> > result;
+	sstr << "SELECT [Value] FROM MySensorsVars WHERE (HardwareID=" << m_HwdID << ") AND (NodeID=" << NodeID << ") AND (NodeID=" << NodeID << ") AND (ChildID=" << ChildID << ") AND (VarID=" << VarID << ")";
+	result = m_sql.query(sstr.str());
+	if (result.size() < 1)
+		return false;
+	std::vector<std::string> sd = result[0];
+	sValue = sd[0];
+	return true;
+}
 
 void MySensorsBase::ParseLine()
 {
@@ -668,7 +707,7 @@ void MySensorsBase::ParseLine()
 		case V_VAR3:
 		case V_VAR4:
 		case V_VAR5:
-			//_log.Log(LOG_STATUS, "MySensors: Custom vars ignored! Node: %d, Child: %d, Payload: %s", node_id, child_sensor_id, payload.c_str());
+			UpdateVar(node_id, child_sensor_id, sub_type, payload);
 			break;
 		case V_TRIPPED:
 			//	Tripped status of a security sensor. 1 = Tripped, 0 = Untripped
@@ -833,6 +872,9 @@ void MySensorsBase::ParseLine()
 		case V_VAR4:
 		case V_VAR5:
 			//cant send back a custom variable
+			tmpstr = "";
+			if (GetVar(node_id, child_sensor_id, sub_type, tmpstr)==true)
+				SendCommand(node_id, child_sensor_id, message_type, sub_type, tmpstr);
 			break;
 		default:
 			while (1==0);

hardware/MySensorsBase.h

@@ -183,6 +183,9 @@ class MySensorsBase : public CDomoticzHardwareBase
 	void InsertSensor(_tMySensorSensor device);
 	void UpdateNodeBatteryLevel(const int nodeID, const int Level);
 
+	void UpdateVar(const int NodeID, const int ChildID, const int VarID, const std::string &svalue);
+	bool GetVar(const int NodeID, const int ChildID, const int VarID, std::string &sValue);
+
 	std::map<int, _tMySensorNode> m_nodes;
 
 	static const int readBufferSize=1028;

main/SQLHelper.cpp

@@ -26,7 +26,7 @@
 	#include "../msbuild/WindowsHelper.h"
 #endif
 
-#define DB_VERSION 62
+#define DB_VERSION 63
 
 extern http::server::CWebServer m_webserver;
 extern std::string szWWWFolder;
@@ -138,12 +138,6 @@ const char *sqlCreateTemperature_Calendar =
 "[SetPoint_Avg] FLOAT DEFAULT 0, "
 "[Date] DATE NOT NULL);";
 
-const char *sqlCreateTempVars =
-"CREATE TABLE IF NOT EXISTS [TempVars] ("
-"[Key] VARCHAR(200) NOT NULL, "
-"[nValue] INTEGER DEFAULT 0, "
-"[sValue] VARCHAR(200));";
-
 const char *sqlCreateTimers =
 "CREATE TABLE IF NOT EXISTS [Timers] ("
 "[ID] INTEGER PRIMARY KEY, "
@@ -523,6 +517,14 @@ const char *sqlCreateMySensors =
 	" [SketchName] VARCHAR(100) DEFAULT Unknown,"
 	" [SketchVersion] VARCHAR(40) DEFAULT(1.0));";
 
+const char *sqlCreateMySensorsVariables =
+"CREATE TABLE IF NOT EXISTS [MySensorsVars]("
+" [HardwareID] INTEGER NOT NULL,"
+" [NodeID] INTEGER NOT NULL,"
+" [ChildID] INTEGER NOT NULL,"
+" [VarID] INTEGER NOT NULL,"
+" [Value] VARCHAR(100) NOT NULL);";
+
 extern std::string szStartupFolder;
 
 CSQLHelper::CSQLHelper(void)
@@ -597,7 +599,6 @@ bool CSQLHelper::OpenDatabase()
 	query(sqlCreateRain_Calendar);
 	query(sqlCreateTemperature);
 	query(sqlCreateTemperature_Calendar);
-	//query(sqlCreateTempVars);
 	query(sqlCreateTimers);
 	query(sqlCreateSetpointTimers);
 	query(sqlCreateUV);
@@ -640,6 +641,7 @@ bool CSQLHelper::OpenDatabase()
 	query(sqlCreateFloorplanOrderTrigger);
 	query(sqlCreateCustomImages);
 	query(sqlCreateMySensors);
+	query(sqlCreateMySensorsVariables);
 
 	if ((!bNewInstall) && (dbversion < DB_VERSION))
 	{
@@ -1225,6 +1227,10 @@ bool CSQLHelper::OpenDatabase()
 				query(szQuery2.str());
 			}
 		}
+		if (dbversion < 63)
+		{
+			query("DROP TABLE IF EXISTS [TempVars]");
+		}
 	}
 	else if (bNewInstall)
 	{
@@ -6983,7 +6989,7 @@ std::string CSQLHelper::CheckUserVariable(const int vartype, const std::string &
 			return "Not a valid integer";
 		}
 	}
-	if (vartype == 1) {
+	else if (vartype == 1) {
 		//float 
 		std::istringstream iss(varvalue);
 		float f;
@@ -6993,19 +6999,22 @@ std::string CSQLHelper::CheckUserVariable(const int vartype, const std::string &
 			return "Not a valid float";
 		}
 	}
-	if (vartype == 3) {
+	else if (vartype == 3) {
 		//date  
 		int d, m, y;
 		if (!CheckDate(varvalue, d, m, y))
 		{
 			return "Not a valid date notation (DD/MM/YYYY)";
 		}
 	}
-	if (vartype == 4) {
+	else if (vartype == 4) {
 		//time
 		if (!CheckTime(varvalue))
 			return "Not a valid time notation (HH:MM)";
 	}
+	else if (vartype == 5) {
+		return "OK";
+	}
 	return "OK";
 }