Skip to content

Commit

Permalink
fix: wrong subsidiarty configs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Uhutown
Uhutown committed Oct 20, 2024
1 parent de547fd commit f531842
Show file tree
Hide file tree
Showing 8 changed files with 208 additions and 32 deletions.
20 changes: 16 additions & 4 deletions src/main/resources/assets/opensignals/signalconfigs/subsidiary/hl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,37 @@
"mainlightsignal.HL_ZS1",
"exitsignal.HL_ZS1",
"blocksignal.HL_ZS1",
"blockexitsignal.HL_ZS1"
"blockexitsignal.HL_ZS1",
"mainlightsignallightbar.OFF",
"zs2.OFF",
"zs2v.OFF"
],
"ZS8": [
"zs2.ZS8"
"zs2.ZS8",
"mainlightsignallightbar.OFF",
"zs2.OFF",
"zs2v.OFF"
],
"ZP9": [
"zs2.ZP9"
],
"SH1": [
"mainlightsignal.HL_SHUNTING",
"exitsignal.HL_SHUNTING",
"blockexitsignal.HL_SHUNTING"
"blockexitsignal.HL_SHUNTING",
"mainlightsignallightbar.OFF",
"zs2.OFF",
"zs2v.OFF"
],
"STATUSLIGHT": [
"mainlightsignal.HL_STATUS_LIGHT",
"mainlightsignal_distant.HL_STATUS_LIGHT",
"exitsignal.HL_STATUS_LIGHT",
"blocksignal.HL_STATUS_LIGHT",
"blockexitsignal.HL_STATUS_LIGHT"
"blockexitsignal.HL_STATUS_LIGHT",
"mainlightsignallightbar.OFF",
"zs2.OFF",
"zs2v.OFF"
]
}
}
20 changes: 16 additions & 4 deletions src/main/resources/assets/opensignals/signalconfigs/subsidiary/hlbridge.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,37 @@
"mainlightsignal.HL_ZS1",
"exitsignal.HL_ZS1",
"blocksignal.HL_ZS1",
"blockexitsignal.HL_ZS1"
"blockexitsignal.HL_ZS1",
"mainlightsignallightbar.OFF",
"zs2.OFF",
"zs2v.OFF"
],
"ZS8": [
"zs2.ZS8"
"zs2.ZS8",
"mainlightsignallightbar.OFF",
"zs2.OFF",
"zs2v.OFF"
],
"ZP9": [
"zs2.ZP9"
],
"SH1": [
"mainlightsignal.HL_SHUNTING",
"exitsignal.HL_SHUNTING",
"blockexitsignal.HL_SHUNTING"
"blockexitsignal.HL_SHUNTING",
"mainlightsignallightbar.OFF",
"zs2.OFF",
"zs2v.OFF"
],
"STATUSLIGHT": [
"mainlightsignal.HL_STATUS_LIGHT",
"mainlightsignal_distant.HL_STATUS_LIGHT",
"exitsignal.HL_STATUS_LIGHT",
"blocksignal.HL_STATUS_LIGHT",
"blockexitsignal.HL_STATUS_LIGHT"
"blockexitsignal.HL_STATUS_LIGHT",
"mainlightsignallightbar.OFF",
"zs2.OFF",
"zs2v.OFF"
]
}
}
42 changes: 38 additions & 4 deletions src/main/resources/assets/opensignals/signalconfigs/subsidiary/hv.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,55 @@
"currentSignal": "hvsignal",
"allStates": {
"ZS1": [
"zs1.TRUE"
"stopsignal.HP0",
"hphome.HP0",
"hpblock.HP0",
"zs1.TRUE",
"zs7.FALSE",
"identifier.FALSE",
"zs3.OFF",
"zs3v.OFF",
"distantsignal.VR0"
],
"ZS7": [
"zs7.TRUE"
"stopsignal.HP0",
"hphome.HP0",
"hpblock.HP0",
"zs1.FALSE",
"zs7.TRUE",
"identifier.FALSE",
"zs3.OFF",
"zs3v.OFF",
"distantsignal.OFF"
],
"ZS8": [
"zs3.ZS8"
"stopsignal.HP0",
"hphome.HP0",
"hpblock.HP0",
"zs1.FALSE",
"zs7.FALSE",
"identifier.FALSE",
"zs3.ZS8",
"zs3v.OFF",
"distantsignal.VR0"
],
"ZP9": [
"zs3.ZP9"
],
"SH1": [
"stopsignal.SHUNTING"
"stopsignal.SHUNTING",
"zs1.FALSE",
"zs7.FALSE",
"identifier.FALSE",
"zs3.OFF",
"zs3v.OFF",
"distantsignal.OFF"
],
"STATUSLIGHT": [
"zs1.FALSE",
"zs7.FALSE",
"zs3.OFF",
"zs3v.OFF",
"stopsignal.OFF",
"hphome.OFF",
"hpblock.OFF",
Expand Down
42 changes: 38 additions & 4 deletions src/main/resources/assets/opensignals/signalconfigs/subsidiary/hvbridge.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,55 @@
"currentSignal": "hvsignalbridge",
"allStates": {
"ZS1": [
"zs1.TRUE"
"stopsignal.HP0",
"hphome.HP0",
"hpblock.HP0",
"zs1.TRUE",
"zs7.FALSE",
"identifier.FALSE",
"zs3.OFF",
"zs3v.OFF",
"distantsignal.VR0"
],
"ZS7": [
"zs7.TRUE"
"stopsignal.HP0",
"hphome.HP0",
"hpblock.HP0",
"zs1.FALSE",
"zs7.TRUE",
"identifier.FALSE",
"zs3.OFF",
"zs3v.OFF",
"distantsignal.OFF"
],
"ZS8": [
"zs3.ZS8"
"stopsignal.HP0",
"hphome.HP0",
"hpblock.HP0",
"zs1.FALSE",
"zs7.FALSE",
"identifier.FALSE",
"zs3.ZS8",
"zs3v.OFF",
"distantsignal.VR0"
],
"ZP9": [
"zs3.ZP9"
],
"SH1": [
"stopsignal.SHUNTING"
"stopsignal.SHUNTING",
"zs1.FALSE",
"zs7.FALSE",
"identifier.FALSE",
"zs3.OFF",
"zs3v.OFF",
"distantsignal.OFF"
],
"STATUSLIGHT": [
"zs1.FALSE",
"zs7.FALSE",
"zs3.OFF",
"zs3v.OFF",
"stopsignal.OFF",
"hphome.OFF",
"hpblock.OFF",
Expand Down
32 changes: 27 additions & 5 deletions src/main/resources/assets/opensignals/signalconfigs/subsidiary/ks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,48 @@
"allStates": {
"ZS1": [
"kombisignal.KS_ZS1",
"kombisignal_main.KS_ZS1"
"kombisignal_main.KS_ZS1",
"zs3.OFF",
"zs2.OFF",
"zs3v.OFF",
"zs2v.OFF"
],
"ZS7": [
"kombisignal.KS_ZS7",
"kombisignal_main.KS_ZS7"
"kombisignal_main.KS_ZS7",
"zs3.OFF",
"zs2.OFF",
"zs3v.OFF",
"zs2v.OFF"
],
"ZS8": [
"zs2.ZS8"
"kombisignal.HP0",
"kombisignal_main.HP0",
"zs2.ZS8",
"zs3.OFF",
"zs2.OFF",
"zs3v.OFF",
"zs2v.OFF"
],
"ZP9": [
"zs2.ZP9"
],
"SH1": [
"kombisignal.KS_SHUNTING",
"kombisignal_main.KS_SHUNTING"
"kombisignal_main.KS_SHUNTING",
"zs3.OFF",
"zs2.OFF",
"zs3v.OFF",
"zs2v.OFF"
],
"STATUSLIGHT": [
"kombisignal.KS_STATUS_LIGHT",
"kombisignal_main.KS_STATUS_LIGHT",
"kombisignal_distant.KS_STATUS_LIGHT"
"kombisignal_distant.KS_STATUS_LIGHT",
"zs3.OFF",
"zs2.OFF",
"zs3v.OFF",
"zs2v.OFF"
]
}
}
32 changes: 27 additions & 5 deletions src/main/resources/assets/opensignals/signalconfigs/subsidiary/ksbridge.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,48 @@
"allStates": {
"ZS1": [
"kombisignal.KS_ZS1",
"kombisignal_main.KS_ZS1"
"kombisignal_main.KS_ZS1",
"zs3.OFF",
"zs2.OFF",
"zs3v.OFF",
"zs2v.OFF"
],
"ZS7": [
"kombisignal.KS_ZS7",
"kombisignal_main.KS_ZS7"
"kombisignal_main.KS_ZS7",
"zs3.OFF",
"zs2.OFF",
"zs3v.OFF",
"zs2v.OFF"
],
"ZS8": [
"zs2.ZS8"
"kombisignal.HP0",
"kombisignal_main.HP0",
"zs2.ZS8",
"zs3.OFF",
"zs2.OFF",
"zs3v.OFF",
"zs2v.OFF"
],
"ZP9": [
"zs2.ZP9"
],
"SH1": [
"kombisignal.KS_SHUNTING",
"kombisignal_main.KS_SHUNTING"
"kombisignal_main.KS_SHUNTING",
"zs3.OFF",
"zs2.OFF",
"zs3v.OFF",
"zs2v.OFF"
],
"STATUSLIGHT": [
"kombisignal.KS_STATUS_LIGHT",
"kombisignal_main.KS_STATUS_LIGHT",
"kombisignal_distant.KS_STATUS_LIGHT"
"kombisignal_distant.KS_STATUS_LIGHT",
"zs3.OFF",
"zs2.OFF",
"zs3v.OFF",
"zs2v.OFF"
]
}
}
26 changes: 23 additions & 3 deletions src/main/resources/assets/opensignals/signalconfigs/subsidiary/semaphore.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,39 @@
"currentSignal": "semaphoresignal",
"allStates": {
"ZS1": [
"wing1.FALSE",
"wing2.FALSE",
"zs3.OFF",
"ra12.FALSE",
"zs7.FALSE",
"zs1.TRUE"
],
"ZS7": [
"zs7.TRUE"
"wing1.FALSE",
"wing2.FALSE",
"zs3.OFF",
"ra12.FALSE",
"zs7.TRUE",
"zs1.FALSE"
],
"ZS8": [
"zs3.ZS8"
"wing1.FALSE",
"wing2.FALSE",
"zs3.ZS8",
"ra12.FALSE",
"zs7.FALSE",
"zs1.FALSE"
],
"ZP9": [
"zs3.ZP9"
],
"SH1": [
"ra12.TRUE"
"wing1.FALSE",
"wing2.FALSE",
"zs3.OFF",
"ra12.TRUE",
"zs7.FALSE",
"zs1.FALSE"
]
}
}
Loading

0 comments on commit f531842

Please sign in to comment.