Merge branch 'master' of github.com:domoticz/domoticz

Author: gizmocuz

hardware/MultiFun.cpp

@@ -119,6 +119,8 @@ MultiFun::MultiFun(const int ID, const std::string &IPAddress, const unsigned sh
 
 	m_isSensorExists[0] = false;
 	m_isSensorExists[1] = false;
+	m_isWeatherWork[0] = false;
+	m_isWeatherWork[1] = false;
 }
 
 MultiFun::~MultiFun()
@@ -240,7 +242,8 @@ bool MultiFun::WriteToHardware(const char *pdata, const unsigned char length)
 
 		float temp = therm->temp;
 
-		if (therm->id2 == 0x1F || therm->id2 == 0x20)
+		if ((therm->id2 == 0x1F || therm->id2 == 0x20) ||
+			((therm->id2 == 0x1C || therm->id2 == 0x1D) && m_isWeatherWork[therm->id2 - 0x1C]))
 		{
 			temp = temp * 5;
 			temp = (int)temp | 0x8000;
@@ -346,7 +349,7 @@ void MultiFun::GetTemperatures()
 
 				if ((temp > -39) && (temp < 1000))
 				{			
-					SendTempSensor(i, -1, temp, sensors[i].name);
+					SendTempSensor(i, 255, temp, sensors[i].name);
 				}
 				if ((i == 1) || (i == 2))
 				{
@@ -400,17 +403,17 @@ void MultiFun::GetRegisters(bool firstTime)
 					{
 						if (((*it).first & value) && !((*it).first & m_LastAlarms))
 						{
-							SendTextSensor(1, 0, -1, (*it).second, "Alarms");
+							SendTextSensor(1, 0, 255, (*it).second, "Alarms");
 						}
 						else
 							if (!((*it).first & value) && ((*it).first & m_LastAlarms))
 							{
-								SendTextSensor(1, 0, -1, "End - " + (*it).second, "Alarms");
+								SendTextSensor(1, 0, 255, "End - " + (*it).second, "Alarms");
 							}
 					}
 					if (((bool)m_LastAlarms != bool(value)) || firstTime)
 					{
-						SendAlertSensor(0, -1, value ? 4 : 1, "Alarm");
+						SendAlertSensor(0, 255, value ? 4 : 1, "Alarm");
 					}
 					m_LastAlarms = value;
 					break;
@@ -422,17 +425,17 @@ void MultiFun::GetRegisters(bool firstTime)
 					{
 						if (((*it).first & value) && !((*it).first & m_LastWarnings))
 						{
-							SendTextSensor(1, 1, -1, (*it).second, "Warnings");
+							SendTextSensor(1, 1, 255, (*it).second, "Warnings");
 						}
 						else
 							if (!((*it).first & value) && ((*it).first & m_LastWarnings))
 							{
-								SendTextSensor(1, 1, -1, "End - " + (*it).second, "Warnings");
+								SendTextSensor(1, 1, 255, "End - " + (*it).second, "Warnings");
 							}
 					}
 					if (((bool)m_LastWarnings != bool(value)) || firstTime)
 					{
-						SendAlertSensor(1, -1, value ? 3 : 1, "Warning");
+						SendAlertSensor(1, 255, value ? 3 : 1, "Warning");
 					}
 					m_LastWarnings = value;
 					break;
@@ -444,18 +447,18 @@ void MultiFun::GetRegisters(bool firstTime)
 					{
 						if (((*it).first & value) && !((*it).first & m_LastDevices))
 						{
-							SendGeneralSwitchSensor(2, -1, true, (*it).second.c_str(), (*it).first);
+							SendGeneralSwitchSensor(2, 255, true, (*it).second.c_str(), (*it).first);
 						}
 						else
 							if (!((*it).first & value) && ((*it).first & m_LastDevices))
 							{
-								SendGeneralSwitchSensor(2, -1, false, (*it).second.c_str(), (*it).first);
+								SendGeneralSwitchSensor(2, 255, false, (*it).second.c_str(), (*it).first);
 							}
 					}
 					m_LastDevices = value;
 
 					float level = (value & 0xFC00) >> 10;
-					SendPercentageSensor(2, 1, -1, level, "BLOWER POWER");
+					SendPercentageSensor(2, 1, 255, level, "BLOWER POWER");
 					break;
 				}
 				case 0x03:
@@ -465,18 +468,18 @@ void MultiFun::GetRegisters(bool firstTime)
 					{
 						if (((*it).first & value) && !((*it).first & m_LastState))
 						{
-							SendTextSensor(3, 1, -1, (*it).second, "State");
+							SendTextSensor(3, 1, 255, (*it).second, "State");
 						}
 						else
 							if (!((*it).first & value) && ((*it).first & m_LastState))
 							{
-								SendTextSensor(3, 1, -1, "End - " + (*it).second, "State");
+								SendTextSensor(3, 1, 255, "End - " + (*it).second, "State");
 							}
 					}
 					m_LastState = value;
 
 					float level = (value & 0xFC00) >> 10;
-					SendPercentageSensor(3, 1, -1, level, "Fuel Level");
+					SendPercentageSensor(3, 1, 255, level, "Fuel Level");
 					break;
 				}
 
@@ -491,6 +494,7 @@ void MultiFun::GetRegisters(bool firstTime)
 					{
 						temp = (value & 0x0FFF) * 0.2;
 					}
+					m_isWeatherWork[i - 0x1C] = (value & 0x8000) == 0x8000;
 					SendSetPointSensor(i, 1, 1, temp, name);
 					break;
 				}
@@ -514,7 +518,7 @@ void MultiFun::GetRegisters(bool firstTime)
 					}
 					else
 					{
-						//SendGeneralSwitchSensor(i, -1, value, name, 1); // TODO - send level (dimmer)
+						//SendGeneralSwitchSensor(i, 255, value, name, 1); // TODO - send level (dimmer)
 					}					
 					break;
 				}
@@ -526,12 +530,12 @@ void MultiFun::GetRegisters(bool firstTime)
 					{
 						if (((*it).first & value) && !((*it).first & m_LastQuickAccess))
 						{
-							SendGeneralSwitchSensor(0x21, -1, true, (*it).second.c_str(), (*it).first);
+							SendGeneralSwitchSensor(0x21, 255, true, (*it).second.c_str(), (*it).first);
 						}
 						else
 							if ((!((*it).first & value) && ((*it).first & m_LastQuickAccess)) || firstTime)
 							{
-								SendGeneralSwitchSensor(0x21, -1, false, (*it).second.c_str(), (*it).first);
+								SendGeneralSwitchSensor(0x21, 255, false, (*it).second.c_str(), (*it).first);
 							}
 					}
 					m_LastQuickAccess = value;
@@ -625,7 +629,7 @@ int MultiFun::SendCommand(const unsigned char* cmd, const unsigned int cmdLength
 				{
 					if (databuffer[8] >= 1 && databuffer[8] <= 4)
 					{
-						_log.Log(LOG_ERROR, "MultiFun: Receive error (%s)", errors[databuffer[8]].c_str());
+						_log.Log(LOG_ERROR, "MultiFun: Receive error (%s)", errors[databuffer[8] - 1].c_str());
 					}
 					else
 					{

hardware/MultiFun.h

@@ -32,6 +32,7 @@ class MultiFun : public CDomoticzHardwareBase
 	int m_LastState;
 	int m_LastQuickAccess;
 	bool m_isSensorExists[2]; 
+	bool m_isWeatherWork[2];
 
 	bool StartHardware();
 	bool StopHardware();