Merge branch 'development' into jswebsockets

Author: gizmocuz

History.txt

@@ -1,11 +1,13 @@
 Version 4.xxxxx (xxx 2019)
 - Implemented: DarkSky CloudCover sensor
 - Implemented: EventSystem, option in Settings to enable/disable URL call logging containing full URL path
+- Implemented: Floorplan, add support for SVG
 - Implemented: GUI, OpenZWave added Refresh Node Information button, styling
 - Implemented: RTL433, added Power (Watt) type
 - Implemented: RTL433, added rainfall_mm type
 - Implemented: OZW, JSON call to retrieve current battery levels for all nodes
 - Implemented: BuienRadar
+- Implemented: Sun/Rain icons
 - Fixed: Gui, Choosing Icon for ARC type switches
 - Fixed: GUI, Dashboard icon incremental counter (energy generated) not correct (#3231)
 - Fixed: GUI, device table initial order column

hardware/Buienradar.cpp

@@ -13,17 +13,12 @@
 #include <sstream>
 #include <iomanip>
 
-#define round(a) ( int ) ( a + .5 )
-
 #define BUIENRADAR_URL "https://data.buienradar.nl/2.0/feed/json"
 #define BUIENRADAR_ACTUAL_URL "https://observations.buienradar.nl/1.0/actual/weatherstation/" //station_id
 #define BUIENRADAR_GRAFIEK_URL "https://www.buienradar.nl/nederland/weerbericht/weergrafieken/" //station_id
 //#define BUIENRARA_GRAFIEK_HISTORY_URL "https://graphdata.buienradar.nl/1.0/actualarchive/weatherstation/6370?startDate=2019-09-15"
 
 #define BUIENRADAR_RAIN "https://gadgets.buienradar.nl/data/raintext/?lat=" // + m_szMyLatitude + "&lon=" + m_szMyLongitude;
-#define RAIN_ALARM_DURATION 15
-#define RAIN_SWITCH_THRESHOLD 70
-
 
 #ifdef _DEBUG
 // #define DEBUG_BUIENRADARR
@@ -83,9 +78,11 @@ double distanceEarth(double lat1d, double lon1d, double lat2d, double lon2d) {
 	return 2.0 * earthRadiusKm * asin(sqrt(u * u + cos(lat1r) * cos(lat2r) * v * v));
 }
 
-CBuienRadar::CBuienRadar(const int ID)
+CBuienRadar::CBuienRadar(const int ID, const int iForecast, const int iThreshold)
 {
 	m_HwdID = ID;
+	m_iForecast = (iForecast >= 5) ? iForecast : 15;
+	m_iThreshold = (iThreshold > 0) ? iThreshold : 25;
 	Init();
 }
 
@@ -378,13 +375,13 @@ void CBuienRadar::GetMeterDetails()
 
 	if (!root["groundtemperature"].empty())
 	{
-		float temp = root["groundtemperature"].asFloat();
-		SendTempSensor(2, 255, temp, "Ground Temperature (10 cm)");
+		float tempGround = root["groundtemperature"].asFloat();
+		SendTempSensor(2, 255, tempGround, "Ground Temperature (10 cm)");
 	}
 	if (!root["feeltemperature"].empty())
 	{
-		float temp = root["feeltemperature"].asFloat();
-		SendTempSensor(3, 255, temp, "Feel Temperature");
+		float tempFeel = root["feeltemperature"].asFloat();
+		SendTempSensor(3, 255, tempFeel, "Feel Temperature");
 	}
 
 
@@ -469,7 +466,7 @@ void CBuienRadar::GetRainPrediction()
 #ifdef DEBUG_BUIENRADARR
 	startTime = (13 * 60) + 30;
 #endif
-	int endTime = startTime + RAIN_ALARM_DURATION;
+	int endTime = startTime + m_iForecast;
 	int endTimeHour = startTime + 60;
 
 	std::istringstream iStream(sResult);
@@ -523,7 +520,7 @@ void CBuienRadar::GetRainPrediction()
 		//double rain_mm_hour = pow(10, ((rain_avg - 109) / 32));
 		double rain_perc = (rain_avg == 0) ? 0 : (rain_avg * 0.392156862745098);
 		SendPercentageSensor(1, 1, 255, static_cast<float>(rain_perc), "Rain Intensity");
-		SendSwitch(1, 1, 255, (rain_avg >= RAIN_SWITCH_THRESHOLD), 255, "Is it Raining");
+		SendSwitch(1, 1, 255, (rain_perc >= m_iThreshold), 0, "Is it Raining");
 	}
 	if (total_rain_values_next_hour)
 	{

hardware/Buienradar.h

@@ -5,7 +5,7 @@
 class CBuienRadar : public CDomoticzHardwareBase
 {
 public:
-	CBuienRadar(const int ID);
+	CBuienRadar(const int ID, const int iForecast, const int iThreshold);
 	~CBuienRadar(void);
 	bool WriteToHardware(const char *pdata, const unsigned char length) override;
 	std::string GetForecastURL();
@@ -22,5 +22,7 @@ class CBuienRadar : public CDomoticzHardwareBase
 	std::string m_szMyLatitude;
 	std::string m_szMyLongitude;
 	std::shared_ptr<std::thread> m_thread;
+	int m_iForecast = 15;
+	int m_iThreshold = 25;
 };
 

hardware/OpenWebNetTCP.cpp

@@ -835,6 +835,28 @@ void COpenWebNetTCP::UpdateCenPlus(const int who, const int where, const int Com
 	SendSwitch(NodeID, iInterface, BatteryLevel, (bool)Command, 0, devname);
 }
 
+/**
+	Insert/Update sound diffusion device
+**/
+void COpenWebNetTCP::UpdateSoundDiffusion(const int who, const int where, const int what, const int iInterface, const int BatteryLevel, const char* devname)
+{
+	//NOTE: interface id (bus identifier) go in 'Unit' field
+	//make device ID
+	int NodeID = (((int)who << 16) & 0xFFFF0000) | (((int)where) & 0x0000FFFF);
+
+	/* insert switch type */
+	char szIdx[10];
+	sprintf(szIdx, "%07X", NodeID);
+	std::vector<std::vector<std::string> > result;
+	result = m_sql.safe_query("SELECT ID,SwitchType FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%s') AND (Unit==%d)", m_HwdID, szIdx, iInterface);
+	if (result.empty())
+	{
+		//m_sql.InsertDevice(m_HwdID, szIdx, iInterface, pTypeLighting2, sTypeAC, STYPE_Media, 0, "Unavailable", "OpenWebNet Media", 12, 255, 1);
+	}
+
+	//TODO: manage SoundDiffusion device like dimmer (on, off and set volume) or like media device (check how to do it)
+}
+
 /**
 	Insert/Update  switch device
 **/
@@ -1267,6 +1289,15 @@ void COpenWebNetTCP::UpdateDeviceValue(std::vector<bt_openwebnet>::iterator iter
 			break;
 		}
 		break;
+
+	case WHO_SOUND_DIFFUSION:						// 22
+		//iAppValue = atoi(what.c_str());
+		//iWhere = atoi(where.c_str());
+		//devname = OPENWEBNET_SOUND_DIFFUSION;
+		//devname += " " + where;
+		//UpdateSoundDiffusion(WHO_SOUND_DIFFUSION, iWhere, iAppValue, atoi(sInterface.c_str()), 255, devname.c_str());
+		//break;
+
 	case WHO_SCENARIO:                              // 0
 	case WHO_LOAD_CONTROL:                          // 3
 	case WHO_DOOR_ENTRY_SYSTEM:                     // 6
@@ -1276,7 +1307,6 @@ void COpenWebNetTCP::UpdateDeviceValue(std::vector<bt_openwebnet>::iterator iter
 	case WHO_SCENARIO_SCHEDULER_SWITCH:             // 15
 	case WHO_AUDIO:                                 // 16
 	case WHO_SCENARIO_PROGRAMMING:                  // 17
-	case WHO_SOUND_DIFFUSION:						// 22
 	case WHO_LIHGTING_MANAGEMENT:                   // 24
 	case WHO_ZIGBEE_DIAGNOSTIC:                     // 1000
 	case WHO_AUTOMATIC_DIAGNOSTIC:                  // 1001
@@ -1327,7 +1357,6 @@ bool COpenWebNetTCP::WriteToHardware(const char *pdata, const unsigned char leng
 		case WHO_AUTOMATION:
 			//Blinds/Window command
 			sprintf(szIdx, "%07X", ((who << 16) & 0xffff0000) | (where & 0x0000ffff));
-
 			result = m_sql.safe_query("SELECT nValue FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%s') AND (SwitchType==%d)",  //*******is there a better method for get
 				m_HwdID, szIdx, STYPE_BlindsPercentageInverted);																		   //*******SUBtype (STYPE_BlindsPercentageInverted) ??
 
@@ -1401,16 +1430,27 @@ bool COpenWebNetTCP::WriteToHardware(const char *pdata, const unsigned char leng
 				what = AUXILIARY_WHAT_ON;
 			}
 			break;
+		
+		case 0xF00: // Custom command, fake who..
+			sprintf(szIdx, "%07X", ((who << 16) & 0xffff0000) | (where & 0x0000ffff));
+			result = m_sql.safe_query("SELECT StrParam1 FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%s')", m_HwdID, szIdx);
+			if (!result.empty())
+			{
+				// Custom command fount, send it!
+				_log.Log(LOG_STATUS, "COpenWebNetTCP: send custom command: '%s'", result[0][0].c_str());
+				std::vector<bt_openwebnet> responses;
+				bt_openwebnet request(result[0][0]);
+				if (sendCommand(request, responses))
+				{
+					//if (responses.size() > 0) return responses.at(0).IsOKFrame();
+					return true; // if send ok, return always ok without check the response..
+				}
+			}
+			_log.Log(LOG_ERROR, "COpenWebNetTCP: custom command error: '%s'", result[0][0].c_str());
+			return false; // error
 		default:
 			break;
 		}
-
-		//int used = 1;
-		if (!FindDevice(who, where, iInterface, NULL)) {
-			_log.Log(LOG_ERROR, "COpenWebNetTCP: command received for unknown device : %d/%d", who, where);
-			return false;
-		}
-
 		break;
 	default:
 		_log.Log(LOG_STATUS, "COpenWebNetTCP unknown command: packettype=%d subtype=%d", packettype, subtype);
@@ -1611,6 +1651,21 @@ void COpenWebNetTCP::scan_automation_lighting(const int cen_area)
 	sendCommand(request, responses, 0, false);
 }
 
+/**
+	automatic scan of sound diffusion device
+**/
+void COpenWebNetTCP::scan_sound_diffusion()
+{
+	bt_openwebnet request;
+	std::vector<bt_openwebnet> responses;
+	std::stringstream whoStr;
+	std::stringstream whereStr;
+	whoStr << WHO_SOUND_DIFFUSION;
+	whereStr << 0;
+	request.CreateStateMsgOpen(whoStr.str(), whereStr.str());
+	sendCommand(request, responses, 0, false);
+}
+
 /**
 	automatic scan of temperature control device
 **/
@@ -1761,6 +1816,9 @@ void COpenWebNetTCP::scan_device()
 		//_log.Log(LOG_STATUS, "COpenWebNetTCP: scanning temperature control...");
 		//scan_temperature_control();
 
+		// Scan of sound diffusion device 
+		//scan_sound_diffusion();
+
 		_log.Log(LOG_STATUS, "COpenWebNetTCP: scan device complete, wait all the update data..");
 
 		/* Update complete scan time*/
@@ -1831,72 +1889,3 @@ void COpenWebNetTCP::Do_Work()
 	}
 	_log.Log(LOG_STATUS, "COpenWebNetTCP: Heartbeat worker stopped...");
 }
-
-/**
-   Find OpenWebNetDevice in DB
-**/
-bool COpenWebNetTCP::FindDevice(const int who, const int where, const int iInterface, int* used)
-{
-	std::vector<std::vector<std::string> > result;
-	int devType = -1;
-
-	//make device ID
-	int NodeID = (((int)who << 16) & 0xFFFF0000) | (((int)where) & 0x0000FFFF);
-
-	switch (who) {
-	case WHO_LIGHTING:                              // 1
-	case WHO_AUTOMATION:                            // 2
-	case WHO_AUXILIARY:                             // 9
-	case WHO_CEN_PLUS_DRY_CONTACT_IR_DETECTION:     // 25
-		//devType = pTypeGeneralSwitch;
-		devType = pTypeLighting2;
-		break;
-	case WHO_TEMPERATURE_CONTROL:                   // 4
-		return true; // device always present
-	case WHO_SCENARIO:                              // 0
-	case WHO_LOAD_CONTROL:                          // 3
-	case WHO_BURGLAR_ALARM:                         // 5
-	case WHO_DOOR_ENTRY_SYSTEM:                     // 6
-	case WHO_MULTIMEDIA:                            // 7
-	case WHO_GATEWAY_INTERFACES_MANAGEMENT:         // 13
-	case WHO_LIGHT_SHUTTER_ACTUATOR_LOCK:           // 14
-	case WHO_SCENARIO_SCHEDULER_SWITCH:             // 15
-	case WHO_AUDIO:                                 // 16
-	case WHO_SCENARIO_PROGRAMMING:                  // 17
-	case WHO_ENERGY_MANAGEMENT:                     // 18
-	case WHO_LIHGTING_MANAGEMENT:                   // 24
-	case WHO_ZIGBEE_DIAGNOSTIC:                     // 1000
-	case WHO_AUTOMATIC_DIAGNOSTIC:                  // 1001
-	case WHO_THERMOREGULATION_DIAGNOSTIC_FAILURES:  // 1004
-	case WHO_DEVICE_DIAGNOSTIC:                     // 1013
-	default:
-		return false;
-	}
-
-	if (devType >= 0)
-	{
-		char szIdx[10];
-		sprintf(szIdx, "%07X", NodeID);
-
-		if (used != NULL)
-		{
-			result = m_sql.safe_query("SELECT ID FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit == %d) AND (Type==%d) AND Used == %d",
-				m_HwdID, szIdx, iInterface, devType, *used);
-		}
-		else
-		{
-			result = m_sql.safe_query("SELECT ID FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit == %d) AND (Type==%d)",
-				m_HwdID, szIdx, iInterface, devType);
-		}
-	}
-	else
-		return false;
-
-
-	if (!result.empty())
-	{
-		return true;
-	}
-
-	return false;
-}

hardware/OpenWebNetTCP.h

@@ -66,7 +66,6 @@ class COpenWebNetTCP : public CDomoticzHardwareBase
 	int ownRead(csocket* connectionSocket, char* pdata, size_t size);
 	bool sendCommand(bt_openwebnet& command, std::vector<bt_openwebnet>& response, int waitForResponse = 0, bool silent = false);
 	bool ParseData(char* data, int length, std::vector<bt_openwebnet>& messages);
-	bool FindDevice(const int who, const int where, const int iInterface, int *used);
 	void UpdateSwitch(const int who, const int where, const int Level, const int iInterface, const int BatteryLevel, const char *devname);
 	void UpdateBlinds(const int who, const int where, const int Command, const int iInterface, const int iLevel, const int BatteryLevel, const char *devname);
 	void UpdateAlarm(const int who, const int where, const int Command, const char *sCommand, const int iInterface, const int BatteryLevel, const char *devname);
@@ -75,9 +74,11 @@ class COpenWebNetTCP : public CDomoticzHardwareBase
 	void UpdateSetPoint(const int who, const int where, float fval, const int iInterface, const char *devname);
 	void UpdatePower(const int who, const int where, double fval, const int iInterface, const int BatteryLevel, const char *devname);
 	void UpdateEnergy(const int who, const int where, double fval, const int iInterface, const int BatteryLevel, const char *devname);
+	void UpdateSoundDiffusion(const int who, const int where, const int what, const int iInterface, const int BatteryLevel, const char* devname);
 	bool GetValueMeter(const int NodeID, const int ChildID, double *usage, double *energy);
 	void UpdateDeviceValue(std::vector<bt_openwebnet>::iterator iter);
 	void scan_automation_lighting(const int cen_area);
+	void scan_sound_diffusion();
 	void scan_temperature_control();
 	void scan_device();
 	void requestTime();

hardware/OpenZWave.cpp

@@ -4965,9 +4965,25 @@ void COpenZWave::UpdateDeviceBatteryStatus(const int nodeID, const int value)
 bool COpenZWave::GetBatteryLevels(Json::Value& root)
 {
 	int ii = 0;
+
+	std::vector<std::vector<std::string> > result;
+	result = m_sql.safe_query("SELECT NodeID,Name FROM ZWaveNodes WHERE (HardwareID==%d)", m_HwdID);
+
+	std::map<uint16_t, std::string> _NodeNames;
+	for (const auto itt : result)
+	{
+		uint16_t nodeID = (uint16_t)atoi(itt[0].c_str());
+		_NodeNames[nodeID] = itt[1];
+	}
+
+
 	for (std::list<NodeInfo>::iterator it = m_nodes.begin(); it != m_nodes.end(); ++it)
 	{
 		root["result"][ii]["nodeID"] = it->nodeId;
+		std::string nodeName;
+		if (_NodeNames.find(it->nodeId) != _NodeNames.end())
+			nodeName = _NodeNames[it->nodeId];
+		root["result"][ii]["nodeName"] = nodeName;
 		root["result"][ii]["battery"] = it->batValue;
 		ii++;
 	}