# HG changeset patch
# User drewp@bigasterisk.com
# Date 1585375630 25200
# Node ID b15bc47b97a068d202a03581b698fecaac7aa444
# Parent  55d13b5e17bc331343252ae31c29445536fd0280
rename living lamps
Ignore-this: 4ccc9c8869cb489d89f5d19da475db69

diff -r 55d13b5e17bc -r b15bc47b97a0 service/rdf_to_mqtt/index.html
--- a/service/rdf_to_mqtt/index.html	Fri Feb 14 17:00:54 2020 -0800
+++ b/service/rdf_to_mqtt/index.html	Fri Mar 27 23:07:10 2020 -0700
@@ -21,14 +21,14 @@
     <div><button data-post="output?s=:kitchenCounterLight&p=:brightness" data-body="1.0">Send (:kitchenCounterLight :brightness 1.0)</button></div>
     <div><button data-post="output?s=:livingLampShelf&p=:brightness" data-body="0.0">Send (:livingLampShelf :brightness 0.0)</button></div>
     <div><button data-post="output?s=:livingLampShelf&p=:brightness" data-body="1.0">Send (:livingLampShelf :brightness 1.0)</button></div>
-    <div><button data-post="output?s=:livingLamp1&p=:brightness" data-body="0.0">Send (:livingLamp1 :brightness 0.0)</button></div>
-    <div><button data-post="output?s=:livingLamp1&p=:brightness" data-body="1.0">Send (:livingLamp1 :brightness 1.0)</button></div>
-    <div><button data-post="output?s=:livingLamp2&p=:brightness" data-body="0.0">Send (:livingLamp2 :brightness 0.0)</button></div>
-    <div><button data-post="output?s=:livingLamp2&p=:brightness" data-body="1.0">Send (:livingLamp2 :brightness 1.0)</button></div>
-    <div><button data-post="output?s=:livingLamp3&p=:brightness" data-body="0.0">Send (:livingLamp3 :brightness 0.0)</button></div>
-    <div><button data-post="output?s=:livingLamp3&p=:brightness" data-body="1.0">Send (:livingLamp3 :brightness 1.0)</button></div>
-    <div><button data-post="output?s=:livingLamp4&p=:brightness" data-body="0.0">Send (:livingLamp4 :brightness 0.0)</button></div>
-    <div><button data-post="output?s=:livingLamp4&p=:brightness" data-body="1.0">Send (:livingLamp4 :brightness 1.0)</button></div>
+    <div><button data-post="output?s=:livingLampMantleEntry&p=:brightness" data-body="0.0">Send (:livingLamp1 :brightness 0.0)</button></div>
+    <div><button data-post="output?s=:livingLampMantleEntry&p=:brightness" data-body="1.0">Send (:livingLamp1 :brightness 1.0)</button></div>
+    <div><button data-post="output?s=:livingLampMantleChair&p=:brightness" data-body="0.0">Send (:livingLamp2 :brightness 0.0)</button></div>
+    <div><button data-post="output?s=:livingLampMantleChair&p=:brightness" data-body="1.0">Send (:livingLamp2 :brightness 1.0)</button></div>
+    <div><button data-post="output?s=:livingLampToyShelf&p=:brightness" data-body="0.0">Send (:livingLamp3 :brightness 0.0)</button></div>
+    <div><button data-post="output?s=:livingLampToyShelf&p=:brightness" data-body="1.0">Send (:livingLamp3 :brightness 1.0)</button></div>
+    <div><button data-post="output?s=:livingLampPiano&p=:brightness" data-body="0.0">Send (:livingLamp4 :brightness 0.0)</button></div>
+    <div><button data-post="output?s=:livingLampPiano&p=:brightness" data-body="1.0">Send (:livingLamp4 :brightness 1.0)</button></div>
 
     <div><button data-post="output?s=:theater&p=:inputSelector" data-body="bd">Theater to chromecast</button></div>
     <div><button data-post="output?s=:theater&p=:inputSelector" data-body="game">Theater to PS4</button></div>
diff -r 55d13b5e17bc -r b15bc47b97a0 service/rdf_to_mqtt/rdf_to_mqtt.py
--- a/service/rdf_to_mqtt/rdf_to_mqtt.py	Fri Feb 14 17:00:54 2020 -0800
+++ b/service/rdf_to_mqtt/rdf_to_mqtt.py	Fri Mar 27 23:07:10 2020 -0700
@@ -36,26 +36,22 @@
         'root': 'sonoff_0/switch/sonoff_basic_relay/command',
         'values': 'binary',
     },
-    ROOM['livingLamp1']: {
+    ROOM['livingLampMantleEntry']: {
         'root': 'sonoff_1/switch/sonoff_basic_relay/command',
         'values': 'binary',
     },
-    ROOM['livingLamp2']: {
+    ROOM['livingLampMantleChair']: {
         'root': 'sonoff_2/switch/sonoff_basic_relay/command',
         'values': 'binary',
     },
-    ROOM['livingLamp3']: {
+    ROOM['livingLampToyShelf']: {
         'root': 'sonoff_3/switch/sonoff_basic_relay/command',
         'values': 'binary',
     },
-    ROOM['livingLamp4']: {
+    ROOM['livingLampPiano']: {
         'root': 'sonoff_4/switch/sonoff_basic_relay/command',
         'values': 'binary',
     },
-    ROOM['livingLamp5']: {
-        'root': 'sonoff_5/switch/sonoff_basic_relay/command',
-        'values': 'binary',
-    },
     ROOM['theater']: {
         'root': 'theater_blaster/ir_out',
         'values': 'theaterOutputs',