From 9db76ae9a64fafdebcda83be4404486a40cea0cc Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 21 Nov 2023 17:48:35 +0100 Subject: [PATCH] fix: signalRepeater in config files --- .../assets/opensignals/signalconfigs/change/hv_hl_config.json | 1 + .../assets/opensignals/signalconfigs/change/hv_hv_config.json | 1 + .../assets/opensignals/signalconfigs/change/hv_ks_config.json | 1 + .../assets/opensignals/signalconfigs/change/hv_sema.json | 1 + .../assets/opensignals/signalconfigs/change/ks_hl_config.json | 1 + .../assets/opensignals/signalconfigs/change/ks_hv_config.json | 1 + .../assets/opensignals/signalconfigs/change/ks_ks_config.json | 1 + .../assets/opensignals/signalconfigs/change/ks_sema.json | 1 + 8 files changed, 8 insertions(+) diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_hl_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_hl_config.json index a6168ccd8..c40d0f6df 100644 --- a/src/main/resources/assets/opensignals/signalconfigs/change/hv_hl_config.json +++ b/src/main/resources/assets/opensignals/signalconfigs/change/hv_hl_config.json @@ -13,6 +13,7 @@ "map(slow) && config(mainlightsignallightbar.OFF)": ["zs3v.Z4", "distantsignal.VR2"], "map(slow) && config(mainlightsignallightbar.GREEN)": ["zs3v.Z10", "distantsignal.VR1"], "map(slow) && config(mainlightsignallightbar.YELLOW)": ["zs3v.Z6", "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"], 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 index 28a2fb098..7043a660f 100644 --- a/src/main/resources/assets/opensignals/signalconfigs/change/hv_hv_config.json +++ b/src/main/resources/assets/opensignals/signalconfigs/change/hv_hv_config.json @@ -10,6 +10,7 @@ "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"], 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 index 04d6797db..30f04696b 100644 --- a/src/main/resources/assets/opensignals/signalconfigs/change/hv_ks_config.json +++ b/src/main/resources/assets/opensignals/signalconfigs/change/hv_ks_config.json @@ -8,6 +8,7 @@ "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"], diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_sema.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_sema.json index 7cde8f7ca..2f40a4603 100644 --- a/src/main/resources/assets/opensignals/signalconfigs/change/hv_sema.json +++ b/src/main/resources/assets/opensignals/signalconfigs/change/hv_sema.json @@ -10,6 +10,7 @@ "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"], 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 index 8bb9376d3..09c97c33a 100644 --- a/src/main/resources/assets/opensignals/signalconfigs/change/ks_hl_config.json +++ b/src/main/resources/assets/opensignals/signalconfigs/change/ks_hl_config.json @@ -10,6 +10,7 @@ "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) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"], "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"], 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 index 1b755342a..fc212a1bb 100644 --- a/src/main/resources/assets/opensignals/signalconfigs/change/ks_hv_config.json +++ b/src/main/resources/assets/opensignals/signalconfigs/change/ks_hv_config.json @@ -26,6 +26,7 @@ "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) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"], "map(drive) && map(zs3)": ["kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"], "map(drive) && map(zs3) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"], diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/ks_ks_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/ks_ks_config.json index 7eee750b8..7ce4c4a2d 100644 --- a/src/main/resources/assets/opensignals/signalconfigs/change/ks_ks_config.json +++ b/src/main/resources/assets/opensignals/signalconfigs/change/ks_ks_config.json @@ -26,6 +26,7 @@ "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) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"], "map(drive) && map(zs3)": ["kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"], "map(drive) && map(zs3) && signalRepeater(true)": ["kombisignal_distant.KS1_BLINK_REPEAT"], diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/ks_sema.json b/src/main/resources/assets/opensignals/signalconfigs/change/ks_sema.json index 6c0108f28..97238d1e4 100644 --- a/src/main/resources/assets/opensignals/signalconfigs/change/ks_sema.json +++ b/src/main/resources/assets/opensignals/signalconfigs/change/ks_sema.json @@ -27,6 +27,7 @@ "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) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"], "(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"],