Skip to content

Commit

Permalink
Anpassungen bei der Umstellung auf OpenHab 2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ingo authored and ingo committed Jun 5, 2018
1 parent b67f877 commit 078b8bc
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
1 change: 1 addition & 0 deletions hcanhab2_mqtt/AlexaKommandos.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ Alexa
- schalte Büro Tür-Licht aus -> tts: "OK"

- stelle die Heizung im Büro auf 23 Grad-> tts: "automatischer Modus ist auf 23 Grad gestellt"
(ggf. muss "Grad" weggelassen werden: "stelle die Heizung im Büro auf 23")

- wie ist die Temperatur in der Küche -> tts: "Die Temperatur von Küche ist 22,6 Grad"
5 changes: 2 additions & 3 deletions hcanhab2_mqtt/BeispielKonfiguration/addons.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@ ui = basic,paper
persistence =

# A comma-separated list of actions to install (e.g. "mail,pushover")
action = nma
action = pushover

# A comma-separated list of transformation services to install (e.g. "map,jsonpath")
transformation = map,javascript,regex

# A comma-separated list of text-to-speech engines to install (e.g. "marytts,freetts")
tts = marytts
tts = mactts

# A comma-separated list of miscellaneous services to install (e.g. "myopenhab")
#misc = hueemulation,myopenhab
misc = openhabcloud
8 changes: 4 additions & 4 deletions hcanhab2_mqtt/xsl/items_heizung.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
</xsl:template>

<xsl:template match="heizung">
Group <xsl:value-of select="substring-before(@name,'__')" /> "<xsl:value-of select="@stt" />" (Heizungen) [ "Thermostat" ]
Number TEMPERATUR_<xsl:value-of select="@name" /> "<xsl:value-of select="substring-after(@name,'__')" /> [%.1f °C]" &lt;temperature&gt; (<xsl:value-of select="substring-before(@name,'__')" />) [ "CurrentTemperature" ] {mqtt="&lt;[bpiBroker:cb&gt;:state:JS(getTemp.js):<xsl:value-of select="@gruppe" />/T/.*]", autoupdate="true"}
Number SOLLTEMP_<xsl:value-of select="@name" /> &lt;temperature&gt; (<xsl:value-of select="substring-before(@name,'__')" />) [ "TargetTemperature" ] {mqtt="&lt;[bpiBroker:cb&gt;:state:JS(getSolltemp.js):<xsl:value-of select="@gruppe" />/H/(auto|therm)/.*], &gt;[bpiBroker:cb&lt;:command:*:H/therm/<xsl:value-of select="@gruppe" />/${command}]", autoupdate="true"}
Group <xsl:value-of select="substring-before(@name,'__')" /> "<xsl:value-of select="@stt" />" (Heizungen) ["Thermostat"]
Number TEMPERATUR_<xsl:value-of select="@name" /> "<xsl:value-of select="substring-after(@name,'__')" /> [%.1f °C]" &lt;temperature&gt; (<xsl:value-of select="substring-before(@name,'__')" />) ["CurrentTemperature"] {mqtt="&lt;[bpiBroker:cb&gt;:state:JS(getTemp.js):<xsl:value-of select="@gruppe" />/T/.*]", autoupdate="true"}
Number SOLLTEMP_<xsl:value-of select="@name" /> &lt;temperature&gt; (<xsl:value-of select="substring-before(@name,'__')" />) ["TargetTemperature"] {mqtt="&lt;[bpiBroker:cb&gt;:state:JS(getSolltemp.js):<xsl:value-of select="@gruppe" />/H/(auto|therm)/.*], &gt;[bpiBroker:cb&lt;:command:*:H/therm/<xsl:value-of select="@gruppe" />/${command}]", autoupdate="true"}
String SOLLTEMP_DAUER_<xsl:value-of select="@name" /> {mqtt="&gt;[bpiBroker:cb&lt;:command:*:H/therm/<xsl:value-of select="@gruppe" />/${command}]"}
String HEIZMODE_<xsl:value-of select="@name" /> "<xsl:value-of select="substring-after(@name,'__')" />" &lt;heating&gt; (<xsl:value-of select="substring-before(@name,'__')" />) [ "homekit:HeatingCooling" ] {mqtt="&lt;[bpiBroker:cb&gt;:state:JS(getHeizmodeState.js):<xsl:value-of select="@gruppe" />/H/.*], &gt;[bpiBroker:cb&lt;:command:1:H/aus/<xsl:value-of select="@gruppe" />], &gt;[bpiBroker:cb&lt;:command:2:H/auto/<xsl:value-of select="@gruppe" />]", autoupdate="true"}
String HEIZMODE_<xsl:value-of select="@name" /> "<xsl:value-of select="substring-after(@name,'__')" />" &lt;heating&gt; (<xsl:value-of select="substring-before(@name,'__')" />) ["homekit:HeatingCooling"] {mqtt="&lt;[bpiBroker:cb&gt;:state:JS(getHeizmodeState.js):<xsl:value-of select="@gruppe" />/H/.*], &gt;[bpiBroker:cb&lt;:command:1:H/aus/<xsl:value-of select="@gruppe" />], &gt;[bpiBroker:cb&lt;:command:2:H/auto/<xsl:value-of select="@gruppe" />]", autoupdate="true"}

</xsl:template>

Expand Down
4 changes: 2 additions & 2 deletions hcanhab2_mqtt/xsl/items_powerport.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
<xsl:template match="powerport">
<xsl:choose>
<xsl:when test="(@typ = 'lampe')">
Switch LAMPE_<xsl:value-of select="@name" /> "<xsl:value-of select="@stt" />-Licht" &lt;light&gt; (<xsl:value-of select="substring-before(@name,'__')" />, Lampen) [ "Lighting" ] {mqtt="&gt;[bpiBroker:cb&lt;:command:ON:ON/<xsl:value-of select="@gruppe" />], &gt;[bpiBroker:cb&lt;:command:OFF:OFF/<xsl:value-of select="@gruppe" />], &lt;[bpiBroker:cb&gt;:state:ON:<xsl:value-of select="@gruppe" />/ON], &lt;[bpiBroker:cb&gt;:state:OFF:<xsl:value-of select="@gruppe" />/OFF]", autoupdate="true"}
Switch LAMPE_<xsl:value-of select="@name" /> "<xsl:value-of select="@stt" />-Licht" &lt;light&gt; (<xsl:value-of select="substring-before(@name,'__')" />, Lampen) ["Lighting"] {mqtt="&gt;[bpiBroker:cb&lt;:command:ON:ON/<xsl:value-of select="@gruppe" />], &gt;[bpiBroker:cb&lt;:command:OFF:OFF/<xsl:value-of select="@gruppe" />], &lt;[bpiBroker:cb&gt;:state:ON:<xsl:value-of select="@gruppe" />/ON], &lt;[bpiBroker:cb&gt;:state:OFF:<xsl:value-of select="@gruppe" />/OFF]", autoupdate="true"}
</xsl:when>
<xsl:otherwise>

//Switch SONSTIGE_<xsl:value-of select="@name" /> (<xsl:value-of select="substring-before(@name,'__')" />, Sonstige) {mqtt="&gt;[bpiBroker:cb&lt;:command:ON:ON/<xsl:value-of select="@gruppe" />], &gt;[bpiBroker:cb&lt;:command:OFF:OFF/<xsl:value-of select="@gruppe" />], &lt;[bpiBroker:cb&gt;:state:ON:<xsl:value-of select="@gruppe" />/ON], &lt;[bpiBroker:cb&gt;:state:OFF:<xsl:value-of select="@gruppe" />/OFF]", autoupdate="true"}
Switch SONSTIGE_<xsl:value-of select="@name" /> "<xsl:value-of select="@stt" />" &lt;switch&gt; (<xsl:value-of select="substring-before(@name,'__')" />, Sonstige) [ "Switchable" ] {mqtt="&gt;[bpiBroker:cb&lt;:command:ON:ON/<xsl:value-of select="@gruppe" />], &gt;[bpiBroker:cb&lt;:command:OFF:OFF/<xsl:value-of select="@gruppe" />], &lt;[bpiBroker:cb&gt;:state:ON:<xsl:value-of select="@gruppe" />/ON], &lt;[bpiBroker:cb&gt;:state:OFF:<xsl:value-of select="@gruppe" />/OFF]", autoupdate="true"}
Switch SONSTIGE_<xsl:value-of select="@name" /> "<xsl:value-of select="@stt" />" &lt;switch&gt; (<xsl:value-of select="substring-before(@name,'__')" />, Sonstige) ["Switchable"] {mqtt="&gt;[bpiBroker:cb&lt;:command:ON:ON/<xsl:value-of select="@gruppe" />], &gt;[bpiBroker:cb&lt;:command:OFF:OFF/<xsl:value-of select="@gruppe" />], &lt;[bpiBroker:cb&gt;:state:ON:<xsl:value-of select="@gruppe" />/ON], &lt;[bpiBroker:cb&gt;:state:OFF:<xsl:value-of select="@gruppe" />/OFF]", autoupdate="true"}
</xsl:otherwise>
</xsl:choose>

Expand Down

0 comments on commit 078b8bc

Please sign in to comment.