From 00ba1300105d474b248a90ad84936f909d17e73f Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Sat, 7 Apr 2018 09:59:38 +0200
Subject: [PATCH] in topic

---
 dist/Export.js        | 6 +++---
 dist/MaxThermostat.js | 2 +-
 src/Export.ts         | 6 +++---
 src/MaxThermostat.ts  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dist/Export.js b/dist/Export.js
index 10904a4..7ab8cbe 100644
--- a/dist/Export.js
+++ b/dist/Export.js
@@ -40,7 +40,7 @@ function RelayBoxOpenHABExport(itemId, stateTopicPre, feedbackTopicPre, conflict
     let o = [];
     itemNames.forEach((label, index) => {
         o.push(`Switch ${itemId}${index} "${label}" {mqtt=">[localbroker:${stateTopicPre}/${index}:command:*:default],<[localbroker:${feedbackTopicPre}/${index}:state:default]"}`);
-        o.push(`Switch ${itemId}${index}Conflict "${label} [%s]" {mqtt="<[localbroker:${conflictTopicPre}/${index}:state:default]"}`);
+        o.push(`String ${itemId}${index}Conflict "${label} [%s]" {mqtt="<[localbroker:${conflictTopicPre}/${index}:state:default]"}`);
     });
     return o;
 }
@@ -119,8 +119,8 @@ function ContactOpenHABExport(id, label, status) {
 }
 function ThermostatOpenHAPExport(id, label, setTemperature, statusTemperature, presetTemperature, presetStatusTemperature) {
     let o = [];
-    o.push(`Number ${id} "${label}" {mqtt=">[localbroker:${setTemperature}:command:*:default],<[localbroker:${statusTemperature}:state:default]"}`);
-    o.push(`Number Preset-${id} "Preset-${label}" {mqtt=">[localbroker:${presetTemperature}:command:*:default],<[localbroker:${presetStatusTemperature}:state:default]"}`);
+    o.push(`Number ${id} "${label} [%.1f °C]" {mqtt=">[localbroker:${setTemperature}:command:*:default],<[localbroker:${statusTemperature}:state:default]"}`);
+    o.push(`Number Preset_${id} "Preset_${label} [%.1f °C]" {mqtt=">[localbroker:${presetTemperature}:command:*:default],<[localbroker:${presetStatusTemperature}:state:default]"}`);
     return o;
 }
 function HueColorLightHomekitExport(id, label, stateTopic, stateFeedbackTopic, brightnessTopic, brightnessFeedbackTopic, hueTopic, hueFeedbackTopic, saturationTopic, saturationFeedbackTopic, colorTemperatureTopic, colorTemperatureFeedbackTopic) {
diff --git a/dist/MaxThermostat.js b/dist/MaxThermostat.js
index 47e9b40..054c1cb 100644
--- a/dist/MaxThermostat.js
+++ b/dist/MaxThermostat.js
@@ -8,7 +8,7 @@ const DISABLED_TEMPERATURE = 5.0;
 class MaxThermostat extends AHomegearItem_1.AHomegearItem {
     //    Thermostat: homegear/instance1/set/3/1/SET_TEMPERATURE
     getInTopic() {
-        return this.temperatureTopic;
+        return this.commandTopic;
     }
     exportItem() {
         return Export_1.ThermostatExport(this.itemId, this.label, this.temperatureTopic, this.temperatureFeedbackTopic, this.presetTemperatureTopic, this.presetTemperatureFeedbackTopic);
diff --git a/src/Export.ts b/src/Export.ts
index 17882a2..53e924b 100644
--- a/src/Export.ts
+++ b/src/Export.ts
@@ -59,7 +59,7 @@ function RelayBoxOpenHABExport(itemId: string, stateTopicPre: string, feedbackTo
     let o : string[] = []
     itemNames.forEach((label: string, index: number) => {
         o.push(`Switch ${itemId}${index} "${label}" {mqtt=">[localbroker:${stateTopicPre}/${index}:command:*:default],<[localbroker:${feedbackTopicPre}/${index}:state:default]"}`)
-        o.push(`Switch ${itemId}${index}Conflict "${label} [%s]" {mqtt="<[localbroker:${conflictTopicPre}/${index}:state:default]"}`)
+        o.push(`String ${itemId}${index}Conflict "${label} [%s]" {mqtt="<[localbroker:${conflictTopicPre}/${index}:state:default]"}`)
     })
     return o
 }
@@ -147,8 +147,8 @@ function ContactOpenHABExport(id: string, label: string, status: string): string
 
 function ThermostatOpenHAPExport(id: string, label: string, setTemperature: string, statusTemperature: string, presetTemperature: string, presetStatusTemperature: string) : string[] {
     let o : string[] = []
-    o.push(`Number ${id} "${label}" {mqtt=">[localbroker:${setTemperature}:command:*:default],<[localbroker:${statusTemperature}:state:default]"}`)
-    o.push(`Number Preset_${id} "Preset_${label}" {mqtt=">[localbroker:${presetTemperature}:command:*:default],<[localbroker:${presetStatusTemperature}:state:default]"}`)
+    o.push(`Number ${id} "${label} [%.1f °C]" {mqtt=">[localbroker:${setTemperature}:command:*:default],<[localbroker:${statusTemperature}:state:default]"}`)
+    o.push(`Number Preset_${id} "Preset_${label} [%.1f °C]" {mqtt=">[localbroker:${presetTemperature}:command:*:default],<[localbroker:${presetStatusTemperature}:state:default]"}`)
     return o
 } 
 
diff --git a/src/MaxThermostat.ts b/src/MaxThermostat.ts
index 7fa9709..d3b020d 100644
--- a/src/MaxThermostat.ts
+++ b/src/MaxThermostat.ts
@@ -30,7 +30,7 @@ export class MaxThermostat extends AHomegearItem implements HasInTopic {
     //    Thermostat: homegear/instance1/set/3/1/SET_TEMPERATURE
 
     getInTopic() : string {
-        return this.temperatureTopic
+        return this.commandTopic
     }
 
     exportItem() : ExportType|null {