From f833578517fd69e2ccd63f6cdc93e86c19e16198 Mon Sep 17 00:00:00 2001
From: Snorre Selmer <snorre.selmer@gmail.com>
Date: Thu, 17 Nov 2022 15:33:44 +0100
Subject: [PATCH 1/3] Removed useless jump

---
 storm_warning.ic10 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/storm_warning.ic10 b/storm_warning.ic10
index b2bf292..d965cdd 100644
--- a/storm_warning.ic10
+++ b/storm_warning.ic10
@@ -32,12 +32,9 @@ l Minutes Weather NextWeatherEventTime
 div Minutes Minutes 60 # convert to minutes
 trunc Minutes Minutes # drop decimals
 s Readout Setting Minutes # send to display
-j warning
-
-warning:
 slt SirenHigh Minutes 3 # got less than 3m?
 sgt SirenLow Minutes 0 # got more than 60s?
 and SirenOn SirenHigh SirenLow # sound siren?
 s Siren On SirenOn # start siren if 1<minutes<3
 beq StormMode 1 countdown # still waiting? go back
-j start # reset and start waiting again
\ No newline at end of file
+j start # reset and start waiting again

From 3b8b6b6f5e640095f8a4b522619b91da22d3c3b4 Mon Sep 17 00:00:00 2001
From: Snorre Selmer <snorre.selmer@gmail.com>
Date: Thu, 17 Nov 2022 15:53:42 +0100
Subject: [PATCH 2/3] Short-circuit eval in countdown.

---
 storm_warning.ic10 | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/storm_warning.ic10 b/storm_warning.ic10
index d965cdd..085f742 100644
--- a/storm_warning.ic10
+++ b/storm_warning.ic10
@@ -1,7 +1,3 @@
-# needs a Weather Station
-# a siren and an announcer (2x Kit (Speaker))
-# and a display of some sort (Kit (Console))
-
 alias Weather d0 # Weather Station
 alias Readout d1 # Kit (Console)
 alias Announcer d2 # Kit (Speaker)
@@ -9,9 +5,7 @@ alias Siren d3 # Kit (Speaker)
 
 alias StormMode r0
 alias Minutes r1
-alias SirenHigh r2
-alias SirenLow r3
-alias SirenOn r4
+alias SirenOn r2
 
 s Announcer Mode 18 # "StormIncoming"
 s Siren Mode 10 # "Alarm8"
@@ -32,9 +26,8 @@ l Minutes Weather NextWeatherEventTime
 div Minutes Minutes 60 # convert to minutes
 trunc Minutes Minutes # drop decimals
 s Readout Setting Minutes # send to display
-slt SirenHigh Minutes 3 # got less than 3m?
-sgt SirenLow Minutes 0 # got more than 60s?
-and SirenOn SirenHigh SirenLow # sound siren?
+bgt Minutes 2 countdown # got more than 3m?
+sgt SirenOn Minutes 0 # got more than 60s?
 s Siren On SirenOn # start siren if 1<minutes<3
 beq StormMode 1 countdown # still waiting? go back
 j start # reset and start waiting again

From 978b9732c17eeb6d460ccb91609df0a1e1b93aed Mon Sep 17 00:00:00 2001
From: Snorre Selmer <snorre.selmer@gmail.com>
Date: Fri, 18 Nov 2022 15:34:10 +0100
Subject: [PATCH 3/3] Hard-coded temperature variance

---
 heating_cooling.ic10 | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/heating_cooling.ic10 b/heating_cooling.ic10
index 58bbb5a..398c6b3 100644
--- a/heating_cooling.ic10
+++ b/heating_cooling.ic10
@@ -1,26 +1,24 @@
 alias GasSensor d0
 # d1= Logic Switch, Dial variant (Max=30)
 alias Thermostat d1
-# d2 = Logic Memory, must be more than 0
-alias TempVariance d2
-# d3 = Console, LED Display variant, optional
-alias TempDisplay d3
-# d4 = Wall Cooler
-alias WallCooler d4
-# d5 = Wall Heater
-alias WallHeater d5
+# d2 = Console, LED Display variant, optional
+alias TempDisplay d2
+# d3 = Wall Cooler
+alias WallCooler d3
+# d4 = Wall Heater
+alias WallHeater d4
 
 alias CurrentTemp r0
 alias TargetTemp r1
-alias Variance r2
-alias MinTemp r3
-alias MaxTemp r4
-alias CoolingActive r5
-alias HeatingActive r6
-alias Cooler r7
-alias Heater r8
+alias MinTemp r2
+alias MaxTemp r3
+alias CoolingActive r4
+alias HeatingActive r5
+alias Cooler r6
+alias Heater r7
 
 define TEMPCONVERT 273.15
+define VARIANCE 2
 
 move CoolingActive 0
 move HeatingActive 0
@@ -31,10 +29,9 @@ l Heater WallHeater PrefabHash
 start:
 yield
 # establish min- and max-temps to registry
-l Variance TempVariance Setting
 l TargetTemp Thermostat Setting
-sub MinTemp TargetTemp Variance
-add MaxTemp TargetTemp Variance
+sub MinTemp TargetTemp VARIANCE
+add MaxTemp TargetTemp VARIANCE
 
 # get current temperature
 jal temp_read
@@ -92,4 +89,4 @@ bdseal TempDisplay display
 sb Heater On HeatingActive
 
 bgtz HeatingActive heating
-j start
\ No newline at end of file
+j start