Merge pull request #482 from gaudryc/send_device_options_on_MQTT_device_info_request

Fix missing Selector switch levels in MQTT device info response by returning all device options (#459)

Author: gizmocuz

History.txt

@@ -77,6 +77,7 @@ Version 2.4xxx
 - Fixed: Refactor the http::server::reply structure and add some helper methods.
 - Fixed: Fix filename attachment when saving ZWave configuration file (use filename instead of path).
 - Fixed: Fix Security devices edit form by hiding Selector switch options (#473).
+- Fixed: Fix missing Selector switch levels in MQTT device info response by returning all device options (#459)
 - Updated: OpenZWave, configuration files
 
 Version 2.3530 (November 1th 2015)

hardware/MQTT.cpp

@@ -493,7 +493,7 @@ void MQTT::SendDeviceInfo(const int m_HwdID, const unsigned long long DeviceRowI
 	if (!m_IsConnected)
 		return;
 	std::vector<std::vector<std::string> > result;
-	result = m_sql.safe_query("SELECT DeviceID, Unit, Name, [Type], SubType, nValue, sValue, SwitchType, SignalLevel, BatteryLevel FROM DeviceStatus WHERE (HardwareID==%d) AND (ID==%llu)", m_HwdID, DeviceRowIdx);
+	result = m_sql.safe_query("SELECT DeviceID, Unit, Name, [Type], SubType, nValue, sValue, SwitchType, SignalLevel, BatteryLevel, Options FROM DeviceStatus WHERE (HardwareID==%d) AND (ID==%llu)", m_HwdID, DeviceRowIdx);
 	if (result.size() > 0)
 	{
 		std::vector<std::string> sd = result[0];
@@ -507,6 +507,7 @@ void MQTT::SendDeviceInfo(const int m_HwdID, const unsigned long long DeviceRowI
 		_eSwitchType switchType = (_eSwitchType)atoi(sd[7].c_str());
 		int RSSI = atoi(sd[8].c_str());
 		int BatteryLevel = atoi(sd[9].c_str());
+		std::map<std::string, std::string> options = m_sql.BuildDeviceOptions(sd[10]);
 
 		Json::Value root;
 
@@ -520,6 +521,14 @@ void MQTT::SendDeviceInfo(const int m_HwdID, const unsigned long long DeviceRowI
 		if (IsLightOrSwitch(dType, dSubType) == true) {
 			root["switchType"] = Switch_Type_Desc(switchType);
 		}
+		// Add device options
+		std::map<std::string, std::string>::const_iterator itt;
+		for (itt = options.begin(); itt != options.end(); ++itt)
+		{
+			std::string optionName = itt->first.c_str();
+			std::string optionValue = itt->second.c_str();
+			root[optionName] = optionValue;
+		}
 
 		root["RSSI"] = RSSI;
 		root["Battery"] = BatteryLevel;