fix: Zs3V on when it should be off

MrTroble · Aug 13, 2024 · dbfacf4 · dbfacf4
1 parent 0affb94
commit dbfacf4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 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
@@ -7,10 +7,6 @@
         "slow": "config(stopsignal.HP2) || config(hphome.HP2)"
     },
     "values": {
-        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
-        "map(drive)": ["distantsignal.VR1"],
-        "map(slow)": ["distantsignal.VR2"],
-        "signalRepeater(true)": ["vrlight.true"],
 
         "(config(zs3.Z1) || config(zs3plate.Z1))": ["zs3v.Z1"],
         "(config(zs3.Z2) || config(zs3plate.Z2))": ["zs3v.Z2"],
@@ -28,6 +24,11 @@
         "(config(zs3.Z14) || config(zs3plate.Z14))": ["zs3v.Z14"],
         "(config(zs3.Z15) || config(zs3plate.Z15))": ["zs3v.Z15"],
 
+        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
+        "map(drive)": ["distantsignal.VR1"],
+        "map(slow)": ["distantsignal.VR2"],
+        "signalRepeater(true)": ["vrlight.true"],
+
         "speed(<.1) || speed(>.15)": ["stopsignal.HP1", "hphome.HP1", "hpblock.HP1"],
         "speed(==.1)": ["zs3.Z1", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],
         "speed(==.2)": ["zs3.Z2", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_ks_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_ks_config.json
@@ -6,9 +6,6 @@
         "drive": "config(kombisignal.KS1) || config(kombisignal_main.KS1) || config(kombisignal.KS1_BLINK) || config(kombisignal.KS1_BLINK_LIGHT) || config(kombisignal.KS2) || config(kombisignal.KS2_LIGHT)"
     },
     "values": {
-        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
-        "map(drive)": ["distantsignal.VR1"],
-        "signalRepeater(true)": ["vrlight.true"],
 
         "(config(zs3.Z1) || config(zs3plate.Z1))": ["zs3v.Z1", "distantsignal.VR2"],
         "(config(zs3.Z2) || config(zs3plate.Z2))": ["zs3v.Z2", "distantsignal.VR2"],
@@ -26,6 +23,10 @@
         "(config(zs3.Z14) || config(zs3plate.Z14))": ["zs3v.Z14", "distantsignal.VR1"],
         "(config(zs3.Z15) || config(zs3plate.Z15))": ["zs3v.Z15", "distantsignal.VR1"],
 
+        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
+        "map(drive)": ["distantsignal.VR1"],
+        "signalRepeater(true)": ["vrlight.true"],
+
         "speed(<.1) || speed(>.15)": ["stopsignal.HP1", "hphome.HP1", "hpblock.HP1"],
         "speed(==.1)": ["zs3.Z1", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],
         "speed(==.2)": ["zs3.Z2", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_sema.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_sema.json
@@ -7,10 +7,6 @@
         "slow": "config(wing1.TRUE) && config(wing2.TRUE)"
     },
     "values": {
-        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
-        "map(drive)": ["distantsignal.VR1"],
-        "map(slow)": ["distantsignal.VR2"],
-        "signalRepeater(true)": ["vrlight.true"],
 
         "(config(zs3.Z1) || config(zs3plate.Z1))": ["zs3v.Z1"],
         "(config(zs3.Z2) || config(zs3plate.Z2))": ["zs3v.Z2"],
@@ -28,6 +24,11 @@
         "(config(zs3.Z14) || config(zs3plate.Z14))": ["zs3v.Z14"],
         "(config(zs3.Z15) || config(zs3plate.Z15))": ["zs3v.Z15"],
 
+        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
+        "map(drive)": ["distantsignal.VR1"],
+        "map(slow)": ["distantsignal.VR2"],
+        "signalRepeater(true)": ["vrlight.true"],
+
         "speed(<.1) || speed(>.15)": ["stopsignal.HP1", "hphome.HP1", "hpblock.HP1"],
         "speed(==.1)": ["zs3.Z1", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],
         "speed(==.2)": ["zs3.Z2", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],