From 2133eae239979b1075a469fd60dca5480c064382 Mon Sep 17 00:00:00 2001
From: Georges herber <georges@dontpanic.lu>
Date: Fri, 27 Dec 2019 12:56:16 +0100
Subject: [PATCH] add things, items and rules for Area42 table lamps

---
 items/uncritical.items   |  3 +++
 rules/alllights.rules    |  4 ++++
 rules/area42lights.rules | 18 ++++++++++++++++++
 rules/level2.rules       |  4 ++++
 things/level2.things     | 14 ++++++++++++++
 5 files changed, 43 insertions(+)
 create mode 100644 rules/area42lights.rules

diff --git a/items/uncritical.items b/items/uncritical.items
index d784e0d..7340729 100644
--- a/items/uncritical.items
+++ b/items/uncritical.items
@@ -23,6 +23,8 @@ Switch  engineering_ceiling_lamps       "Ceiling Lamps"         <lightbulb> (eng
 Switch  engineering_status_lamp         "Status Lamp"           <lightbulb> (engineering)   { channel="mqtt:topic:engineering_status_lamp:power"   }
 Switch  engineering_ceiling_phone_flash "Ceiling Phone Flash"   <lightbulb> (engineering)   { channel="mqtt:topic:engineering_phone_flash:pulse"   }
 Switch  area42_status_lamp              "Status Lamp"           <lightbulb> (area42)        { channel="mqtt:topic:mosquitto:area42_status_lamp:power" }
+Switch  area42_table_lamp1              "Table Lamp1"           <lightbulb> (area42)        { channel="mqtt:topic:mosquitto:area42_table_lamp1:power" }
+Switch  area42_table_lamp2              "Table Lamp2"           <lightbulb> (area42)        { channel="mqtt:topic:mosquitto:area42_table_lamp2:power" }
 Switch  lab_soldering_table             "Soldering table"       <lightbulb> (lab)           { channel="mqtt:topic:mosquitto:lab_soldering_table:power" }
 
 // ----------------------------------------------------------------------------
@@ -55,3 +57,4 @@ String proxyIR
 Switch  all_lights              "All Lights"                <lightbulb> (level2)
 Switch  all_status_lights       "All Status Lights"         <lightbulb> (engineering)
 Switch  all_engineering_lights  "All Engineering Lights"    <lightbulb> (engineering)
+Switch  all_area42_table_lights "All Area42 Table Lights"   <lightbulb> (area42)
diff --git a/rules/alllights.rules b/rules/alllights.rules
index 43900c7..3417b34 100644
--- a/rules/alllights.rules
+++ b/rules/alllights.rules
@@ -9,6 +9,8 @@ then
   chill_zone_ikea_led.sendCommand("ON")
   entrance_ceiling_lamps.sendCommand("ON")
   entrance_marbleadder_lamps.sendCommand("ON")
+  area42_table_lamp1.sendCommand("ON")
+  area42_table_lamp2.sendCommand("ON")
 end
 
 
@@ -22,6 +24,8 @@ then
   chill_zone_ikea_led.sendCommand("OFF")
   entrance_ceiling_lamps.sendCommand("OFF")
   entrance_marbleadder_lamps.sendCommand("OFF")
+  area42_table_lamp1.sendCommand("OFF")
+  area42_table_lamp2.sendCommand("OFF")
 end
 
 
diff --git a/rules/area42lights.rules b/rules/area42lights.rules
new file mode 100644
index 0000000..790988c
--- /dev/null
+++ b/rules/area42lights.rules
@@ -0,0 +1,18 @@
+rule "Area42 Table Lights ON"
+when
+    Item all_area42_table_lights changed from OFF to ON
+then
+    area42_table_lamp1.sendCommand("ON")
+    area42_table_lamp2.sendCommand("ON")
+end
+
+
+rule "Engineering Lights OFF"
+when
+    Item all_area42_table_lights changed from ON to OFF
+then
+    area42_table_lamp1.sendCommand("OFF")
+    area42_table_lamp2.sendCommand("OFF")
+end
+
+
diff --git a/rules/level2.rules b/rules/level2.rules
index 863c169..ee68cb9 100644
--- a/rules/level2.rules
+++ b/rules/level2.rules
@@ -34,6 +34,8 @@ then
         engineering_ceiling_lamps.sendCommand("ON")
         engineering_status_lamp.sendCommand("ON")
         area42_status_lamp.sendCommand("ON")
+        area42_table_lamp1.sendCommand("ON")
+        area42_table_lamp2.sendCommand("ON")
         executeCommandLine("/etc/openhab2/syn2cat/spaceapi-set-status.sh open")
         // needs current time in OpenTime
         // sendTweet("It's "+OpenTime+" and we are open \o/ \ncome in and create something awesome =) \nhttps://Level2.lu/openingTimes")
@@ -52,6 +54,8 @@ then
         engineering_ceiling_lamps.sendCommand("OFF")
         engineering_status_lamp.sendCommand("OFF")
         area42_status_lamp.sendCommand("OFF")
+        area42_table_lamp1.sendCommand("OFF")
+        area42_table_lamp2.sendCommand("OFF")
         lab_soldering_table.sendCommand("OFF")
         IRCode.sendCommand(transform("MAP", "ir.map", "amp_off"))
         executeCommandLine("/etc/openhab2/syn2cat/spaceapi-set-status.sh closed")
diff --git a/things/level2.things b/things/level2.things
index 11911d4..603e6bc 100644
--- a/things/level2.things
+++ b/things/level2.things
@@ -99,6 +99,20 @@ Bridge mqtt:broker:mosquitto "Mosquitto" [
             ]
     }
 
+    Thing topic area42_table_lamp1 "Area42 Table Lamp1" @ "Area42" {
+        Channels:
+            Type switch : power  "Power"  [
+                commandTopic="cmnd/area42/table/lamp1/Power"
+            ]
+    }
+
+    Thing topic area42_table_lamp2 "Area42 Table Lamp2" @ "Area42" {
+        Channels:
+            Type switch : power  "Power"  [
+                commandTopic="cmnd/area42/table/lamp2/Power"
+            ]
+    }
+
     // ----------------------------------------------------------------------------
 
     Thing topic lab_soldering_table "Soldering table" @ "Lab" {