applied new reset system; fixed config issues

MrTroble · Oct 5, 2023 · c25f6b1 · c25f6b1
1 parent 4cb8c2d
commit c25f6b1
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 31 deletions.
diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_hv_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_hv_config.json
@@ -26,7 +26,6 @@
         "(config(zs3.Z13) || config(zs3plate.Z13))": ["zs3v.Z13"],
         "(config(zs3.Z14) || config(zs3plate.Z14))": ["zs3v.Z14"],
         "(config(zs3.Z15) || config(zs3plate.Z15))": ["zs3v.Z15"],
-        "signalRepeater(true)": ["VRLIGHT.TRUE"],
 
         "speed(<.1) || speed(>.15)": ["stopsignal.HP1", "hphome.HP1", "hpblock.HP1"],
         "speed(==.1)": ["zs3.Z1", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/ks_hl_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/ks_hl_config.json
@@ -2,17 +2,19 @@
     "currentSignal": "kssignal",
     "nextSignal": "hlsignal",
     "savedPredicates": {
-        "stop": "(config(mainlightsignal.HP0) || config(mainlightsignal.HP0_ALTERNATE_RED) || config(mainlightsignal.HL_ZS1) || config(mainlightsignal.HL_SHUNTING) || config(exitsignal.HP0) || config(exitsignal.HP0_ALTERNATE_RED) || config(exitsignal.HL_ZS1) || config(exitsignal.HL_SHUNTING) || config(blocksignal.HP0) || config(blocksignal.HP0_ALTERNATE_RED) || config(blocksignal.HL_ZS1) || config(blockexitsignal.HP0) || config(blockexitsignal.HL_ZS1) || config(blockexitsignal.HL_SHUNTING)) && config(mainlightsignallightbar.OFF)",
+        "stop": "(config(mainlightsignal.HP0) || config(mainlightsignal.HP0_ALTERNATE_RED) || config(mainlightsignal.HL_ZS1) || config(mainlightsignal.HL_SHUNTING) || config(exitsignal.HP0) || config(exitsignal.HP0_ALTERNATE_RED) || config(exitsignal.HL_ZS1) || config(exitsignal.HL_SHUNTING) || config(blocksignal.HP0) || config(blocksignal.HP0_ALTERNATE_RED) || config(blocksignal.HL_ZS1) || config(blockexitsignal.HP0) || config(blockexitsignal.HL_ZS1) || config(blockexitsignal.HL_SHUNTING)) && !(config(mainlightsignallightbar.YELLOW) || config(mainlightsignallightbar.GREEN))",
         "drive": "(config(mainlightsignal.HL1) || config(mainlightsignal.HL4) || config(mainlightsignal.HL7) || config(mainlightsignal.HL10) || config(exitsignal.HL1) || config(blocksignal.HL1) || config(blocksignal.HL10) || config(blockexitsignal.HL1)) && (config(mainlightsignallightbar.OFF) || !(config(mainlightsignallightbar.OFF) || config(mainlightsignallightbar.YELLOW) || config(mainlightsignallightbar.GREEN)))",
         "slow": "config(mainlightsignal.HL2_3) || config(mainlightsignal.HL5_6) || config(mainlightsignal.HL8_9) || config(mainlightsignal.HL11_12) || config(exitsignal.HL2_3)"
     },
     "values": {
         "map(stop)": ["kombisignal.KS2", "kombisignal_main.KS1", "kombisignal_distant.KS2", "zs3v.OFF", "zs2v.OFF"],
+        "map(stop) && signalRepeater(true)": ["kombisignal_distant.KS2_REPEAT"],
         "map(drive)": ["kombisignal.KS1", "kombisignal_main.KS1", "kombisignal_distant.KS1"],
 
-        "map(slow) && config(mainlightsignallightbar.OFF)": ["zs3v.Z4", "kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"],
+        "map(slow) && config(mainlightsignallightbar.OFF)": ["zs3v.Z4", "kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"],        
         "map(slow) && config(mainlightsignallightbar.GREEN)": ["zs3v.Z10", "kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"],
         "map(slow) && config(mainlightsignallightbar.YELLOW)": ["zs3v.Z6", "kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"],
+        "map(slow) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"],
 
         "speed(==.1)": ["zs3.Z1"],
         "speed(==.2)": ["zs3.Z2"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/ks_hv_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/ks_hv_config.json
@@ -24,8 +24,10 @@
         "(config(zs3.Z15) || config(zs3plate.Z15))": ["zs3v.Z15"],
 
         "map(stop)": ["kombisignal.KS2", "kombisignal_main.KS1", "kombisignal_distant.KS2", "zs3v.OFF", "zs2v.OFF"],
+        "map(stop) && signalRepeater(true)": ["kombisignal_distant.KS2_REPEAT"],
         "map(drive)": ["kombisignal.KS1", "kombisignal_main.KS1", "kombisignal_distant.KS1"],
         "map(drive) && map(zs3)": ["kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"],
+        "map(drive) && map(zs3) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"],
 
         "speed(==.1)": ["zs3.Z1"],
         "speed(==.2)": ["zs3.Z2"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/ks_sema.json b/src/main/resources/assets/opensignals/signalconfigs/change/ks_sema.json
@@ -25,8 +25,10 @@
         "(config(zs3.Z15) || config(zs3plate.Z15))": ["zs3v.Z15"],
 
         "map(stop)": ["kombisignal.KS2", "kombisignal_main.KS1", "kombisignal_distant.KS2", "zs3v.OFF", "zs2v.OFF"],
+        "map(stop) && signalRepeater(true)": ["kombisignal_distant.KS2_REPEAT"],
         "map(drive) || map(slow)": ["kombisignal.KS1", "kombisignal_main.KS1", "kombisignal_distant.KS1"],
         "(map(drive) || map(slow)) && map(zs3)": ["kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"],
+        "(map(drive) || map(slow)) && map(zs3) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"],
 
         "speed(==.1)": ["zs3.Z1"],
         "speed(==.2)": ["zs3.Z2"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/reset/hl_config.json b/src/main/resources/assets/opensignals/signalconfigs/reset/hl_config.json
@@ -1,13 +1,15 @@
 {
     "currentSignal": "hlsignal",
-    "values": [
-        "mainlightsignallightbar.OFF",
-        "mainlightsignal_distant.HL10",
-        "mainlightsignal.HP0",
-        "exitsignal.HP0",
-        "zs2.OFF",
-        "zs2v.OFF",
-        "blocksignal.HP0",
-        "blockexitsignal.HP0"
-    ]
+    "values": {
+        "true": [
+            "mainlightsignallightbar.OFF",
+            "mainlightsignal_distant.HL10",
+            "mainlightsignal.HP0",
+            "exitsignal.HP0",
+            "zs2.OFF",
+            "zs2v.OFF",
+            "blocksignal.HP0",
+            "blockexitsignal.HP0"
+        ]
+    }
 }
diff --git a/src/main/resources/assets/opensignals/signalconfigs/reset/rasignal.json b/src/main/resources/assets/opensignals/signalconfigs/reset/rasignal.json
@@ -1,6 +1,8 @@
 {
     "currentSignal": "rasignal",
-    "values": [
-        "ralight.FALSE"
-    ]
+    "values": {
+        "true": [
+            "ralight.FALSE"
+        ]
+    }
 }
diff --git a/src/main/resources/assets/opensignals/signalconfigs/reset/semaphoresignal.json b/src/main/resources/assets/opensignals/signalconfigs/reset/semaphoresignal.json
@@ -1,12 +1,14 @@
 {
     "currentSignal": "semaphoresignal",
-    "values": [
-        "semavr.VR0",
-        "zs3.OFF",
-        "wing1.FALSE",
-        "wing2.FALSE",
-        "zs1.FALSE",
-        "zs7.FALSE",
-        "ra12.FALSE"
-    ]
+    "values": {
+        "true": [
+            "semavr.VR0",
+            "zs3.OFF",
+            "wing1.FALSE",
+            "wing2.FALSE",
+            "zs1.FALSE",
+            "zs7.FALSE",
+            "ra12.FALSE"
+        ]
+    }
 }
diff --git a/src/main/resources/assets/opensignals/signalconfigs/reset/shlight.json b/src/main/resources/assets/opensignals/signalconfigs/reset/shlight.json
@@ -1,6 +1,8 @@
 {
     "currentSignal": "shlight",
-    "values": [
-        "sh_light_bottom.SH0"
-    ]
+    "values": {
+        "true": [
+            "sh_light_bottom.SH0"
+        ]
+    }
 }
diff --git a/src/main/resources/assets/opensignals/signalconfigs/reset/shmech.json b/src/main/resources/assets/opensignals/signalconfigs/reset/shmech.json
@@ -1,6 +1,8 @@
 {
     "currentSignal": "shmech",
-    "values": [
-        "sh_mech.SH0"
-    ]
+    "values": {
+        "true": [
+            "sh_mech.SH0"
+        ]
+    }
 }