summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@atticmac.backdown.james.local>2021-01-24 12:27:45 +0000
committerroot <root@atticmac.backdown.james.local>2021-01-24 12:28:21 +0000
commitfcafd1abdc198b1f70144ac29c78a005d2846b8e (patch)
tree5d97e889b46c42e659f2e578ca89c314b50b0236
parent25fbb8a03c72f473a2d7f6cfb5961a1c43b1a6a2 (diff)
downloadheating-fcafd1abdc198b1f70144ac29c78a005d2846b8e.zip
heating-fcafd1abdc198b1f70144ac29c78a005d2846b8e.tar.gz
heating-fcafd1abdc198b1f70144ac29c78a005d2846b8e.tar.bz2
piano moved
-rwxr-xr-xprometheus/usr/local/bin/make_habitable2
-rwxr-xr-xprometheus/usr/local/bin/midnight_tidy2
-rw-r--r--radiator-plc/stm32/app/logic.c8
3 files changed, 4 insertions, 8 deletions
diff --git a/prometheus/usr/local/bin/make_habitable b/prometheus/usr/local/bin/make_habitable
index 730d632..77fa2e1 100755
--- a/prometheus/usr/local/bin/make_habitable
+++ b/prometheus/usr/local/bin/make_habitable
@@ -6,6 +6,6 @@ for i in 2fl_main_radiator 2fl_stair_radiator bathroom_radiator; do
done
-for i in hall_radiator kitchen_radiator laundry_radiator kstudy_radiator bedroom_radiator ; do
+for i in hall_radiator kitchen_radiator laundry_radiator kstudy_radiator bedroom_radiator dd_radiator1 dd_radiator2 dd_radiator3 ; do
set_radiator_target $i 18
done
diff --git a/prometheus/usr/local/bin/midnight_tidy b/prometheus/usr/local/bin/midnight_tidy
index 2e6686e..27400dd 100755
--- a/prometheus/usr/local/bin/midnight_tidy
+++ b/prometheus/usr/local/bin/midnight_tidy
@@ -3,7 +3,7 @@ set -x
/usr/local/bin/vent close
-for i in 2fl_main_radiator 2fl_stair_radiator bathroom_radiator bedroom_radiator hall_radiator kitchen_radiator kstudy_radiator laundry_radiator spare_bedroom_radiator; do
+for i in 2fl_main_radiator 2fl_stair_radiator bathroom_radiator bedroom_radiator hall_radiator kitchen_radiator kstudy_radiator laundry_radiator spare_bedroom_radiator dd_radiator1 dd_radiator2 dd_radiator3 ; do
/usr/local/bin/set_radiator_target $i 10
done
diff --git a/radiator-plc/stm32/app/logic.c b/radiator-plc/stm32/app/logic.c
index a9f845c..b5b768d 100644
--- a/radiator-plc/stm32/app/logic.c
+++ b/radiator-plc/stm32/app/logic.c
@@ -225,18 +225,14 @@ void logic_dispatch (void)
void logic_init (void)
{
char serial[25] = {0};
- unsigned i;
desig_get_unique_id_as_string (serial, sizeof (serial));
if (!strcmp (serial, "325715574155303632FFD305")) {
valve_name = plc0_valve_names;
valve_owa = plc0_valve_owas;
-
- for (i = 0; i < 3; ++i) {
- low_limit[i] = 19000;
- high_limit[i] = 20000;
- }
+ low_limit[5] = 18000;
+ high_limit[5] = 19000;
} else if (!strcmp (serial, "378125574155383139FFD805")) {
valve_name = plc1_valve_names;
valve_owa = plc1_valve_owas;