diff --git a/DMI/sound/LZB_Freno_Emergencia.wav b/DMI/sound/LZB_Freno_Emergencia.wav index 65f91050..5724dc41 100644 Binary files a/DMI/sound/LZB_Freno_Emergencia.wav and b/DMI/sound/LZB_Freno_Emergencia.wav differ diff --git a/DMI/stm_bombardier.json b/DMI/stm_bombardier.json index 9b7e35ca..7f176841 100644 --- a/DMI/stm_bombardier.json +++ b/DMI/stm_bombardier.json @@ -126,7 +126,7 @@ }, { "id": 7, - "file": "LZB/E.bmp", + "file": "LZB/EB.bmp", "text": false }, { diff --git a/DMI/symbols/STM/ATB/ATB8G.bmp b/DMI/symbols/STM/ATB/ATB8G.bmp new file mode 100644 index 00000000..3c2a7891 Binary files /dev/null and b/DMI/symbols/STM/ATB/ATB8G.bmp differ diff --git a/DMI/symbols/STM/ATB/LE02_01.bmp b/DMI/symbols/STM/ATB/LE02_01.bmp new file mode 100644 index 00000000..d6a6eef2 Binary files /dev/null and b/DMI/symbols/STM/ATB/LE02_01.bmp differ diff --git a/DMI/symbols/STM/ATC/LE02_26.bmp b/DMI/symbols/STM/ATC/LE02_26.bmp new file mode 100644 index 00000000..49604dab Binary files /dev/null and b/DMI/symbols/STM/ATC/LE02_26.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_10.bmp b/DMI/symbols/STM/ATC/atc2_10.bmp new file mode 100644 index 00000000..fccb136a Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_10.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_11.bmp b/DMI/symbols/STM/ATC/atc2_11.bmp new file mode 100644 index 00000000..83d28170 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_11.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_12.bmp b/DMI/symbols/STM/ATC/atc2_12.bmp new file mode 100644 index 00000000..c4095b51 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_12.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_13.bmp b/DMI/symbols/STM/ATC/atc2_13.bmp new file mode 100644 index 00000000..9ca91392 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_13.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_14.bmp b/DMI/symbols/STM/ATC/atc2_14.bmp new file mode 100644 index 00000000..0b8a54f8 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_14.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_15.bmp b/DMI/symbols/STM/ATC/atc2_15.bmp new file mode 100644 index 00000000..5f7ed11d Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_15.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_16.bmp b/DMI/symbols/STM/ATC/atc2_16.bmp new file mode 100644 index 00000000..b8a29fd5 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_16.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_17.bmp b/DMI/symbols/STM/ATC/atc2_17.bmp new file mode 100644 index 00000000..f9a0f627 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_17.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_19p.bmp b/DMI/symbols/STM/ATC/atc2_19p.bmp new file mode 100644 index 00000000..2fa8399b Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_19p.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_1_4.bmp b/DMI/symbols/STM/ATC/atc2_1_4.bmp new file mode 100644 index 00000000..3a78c2b3 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_1_4.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_21.bmp b/DMI/symbols/STM/ATC/atc2_21.bmp new file mode 100644 index 00000000..a7310142 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_21.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_22.bmp b/DMI/symbols/STM/ATC/atc2_22.bmp new file mode 100644 index 00000000..3722a0b2 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_22.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_23.bmp b/DMI/symbols/STM/ATC/atc2_23.bmp new file mode 100644 index 00000000..784141cb Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_23.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_24.bmp b/DMI/symbols/STM/ATC/atc2_24.bmp new file mode 100644 index 00000000..7d9954f1 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_24.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_25.bmp b/DMI/symbols/STM/ATC/atc2_25.bmp new file mode 100644 index 00000000..26837d38 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_25.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_26.bmp b/DMI/symbols/STM/ATC/atc2_26.bmp new file mode 100644 index 00000000..4df8e47e Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_26.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_27.bmp b/DMI/symbols/STM/ATC/atc2_27.bmp new file mode 100644 index 00000000..0b2e786c Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_27.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_28.bmp b/DMI/symbols/STM/ATC/atc2_28.bmp new file mode 100644 index 00000000..f9f264fe Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_28.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_29.bmp b/DMI/symbols/STM/ATC/atc2_29.bmp new file mode 100644 index 00000000..eb548a93 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_29.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_30.bmp b/DMI/symbols/STM/ATC/atc2_30.bmp new file mode 100644 index 00000000..f8b854b4 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_30.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_31.bmp b/DMI/symbols/STM/ATC/atc2_31.bmp new file mode 100644 index 00000000..e148a36e Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_31.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_32.bmp b/DMI/symbols/STM/ATC/atc2_32.bmp new file mode 100644 index 00000000..923499fc Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_32.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_33.bmp b/DMI/symbols/STM/ATC/atc2_33.bmp new file mode 100644 index 00000000..97958d78 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_33.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_7.bmp b/DMI/symbols/STM/ATC/atc2_7.bmp new file mode 100644 index 00000000..3091f047 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_7.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_8.bmp b/DMI/symbols/STM/ATC/atc2_8.bmp new file mode 100644 index 00000000..f73f06cd Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_8.bmp differ diff --git a/DMI/symbols/STM/ATC/atc2_9.bmp b/DMI/symbols/STM/ATC/atc2_9.bmp new file mode 100644 index 00000000..1264b951 Binary files /dev/null and b/DMI/symbols/STM/ATC/atc2_9.bmp differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/LE02_19.bmp b/DMI/symbols/STM/EBICAB_ASFA/LE02_19.bmp new file mode 100644 index 00000000..038e5032 Binary files /dev/null and b/DMI/symbols/STM/EBICAB_ASFA/LE02_19.bmp differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/asfap.bmp b/DMI/symbols/STM/EBICAB_ASFA/asfap.bmp deleted file mode 100644 index 14c26328..00000000 Binary files a/DMI/symbols/STM/EBICAB_ASFA/asfap.bmp and /dev/null differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/atp_MV.bmp b/DMI/symbols/STM/EBICAB_ASFA/atp_MV.bmp deleted file mode 100644 index acae0087..00000000 Binary files a/DMI/symbols/STM/EBICAB_ASFA/atp_MV.bmp and /dev/null differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/atp_asfa.bmp b/DMI/symbols/STM/EBICAB_ASFA/atp_asfa.bmp deleted file mode 100644 index 034b234a..00000000 Binary files a/DMI/symbols/STM/EBICAB_ASFA/atp_asfa.bmp and /dev/null differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/atp_atp.bmp b/DMI/symbols/STM/EBICAB_ASFA/atp_atp.bmp deleted file mode 100644 index b8ba872f..00000000 Binary files a/DMI/symbols/STM/EBICAB_ASFA/atp_atp.bmp and /dev/null differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/atp_icono.bmp b/DMI/symbols/STM/EBICAB_ASFA/atp_icono.bmp deleted file mode 100644 index 034b234a..00000000 Binary files a/DMI/symbols/STM/EBICAB_ASFA/atp_icono.bmp and /dev/null differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/atp_vl.bmp b/DMI/symbols/STM/EBICAB_ASFA/atp_vl.bmp deleted file mode 100644 index 13a8c7b4..00000000 Binary files a/DMI/symbols/STM/EBICAB_ASFA/atp_vl.bmp and /dev/null differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/bts.bmp b/DMI/symbols/STM/EBICAB_ASFA/bts.bmp deleted file mode 100644 index 73529a43..00000000 Binary files a/DMI/symbols/STM/EBICAB_ASFA/bts.bmp and /dev/null differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/ebi15.bmp b/DMI/symbols/STM/EBICAB_ASFA/ebi15.bmp new file mode 100644 index 00000000..ccfdf81b Binary files /dev/null and b/DMI/symbols/STM/EBICAB_ASFA/ebi15.bmp differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/ebi16.bmp b/DMI/symbols/STM/EBICAB_ASFA/ebi16.bmp new file mode 100644 index 00000000..4e30734d Binary files /dev/null and b/DMI/symbols/STM/EBICAB_ASFA/ebi16.bmp differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/ebi17.bmp b/DMI/symbols/STM/EBICAB_ASFA/ebi17.bmp new file mode 100644 index 00000000..95b28363 Binary files /dev/null and b/DMI/symbols/STM/EBICAB_ASFA/ebi17.bmp differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/ebi18.bmp b/DMI/symbols/STM/EBICAB_ASFA/ebi18.bmp new file mode 100644 index 00000000..d6e34a13 Binary files /dev/null and b/DMI/symbols/STM/EBICAB_ASFA/ebi18.bmp differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/ebi20.bmp b/DMI/symbols/STM/EBICAB_ASFA/ebi20.bmp new file mode 100644 index 00000000..6e63a56f Binary files /dev/null and b/DMI/symbols/STM/EBICAB_ASFA/ebi20.bmp differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/ebi21.bmp b/DMI/symbols/STM/EBICAB_ASFA/ebi21.bmp new file mode 100644 index 00000000..e9d2d419 Binary files /dev/null and b/DMI/symbols/STM/EBICAB_ASFA/ebi21.bmp differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/ebi22.bmp b/DMI/symbols/STM/EBICAB_ASFA/ebi22.bmp new file mode 100644 index 00000000..aabd142c Binary files /dev/null and b/DMI/symbols/STM/EBICAB_ASFA/ebi22.bmp differ diff --git a/DMI/symbols/STM/EBICAB_ASFA/man.bmp b/DMI/symbols/STM/EBICAB_ASFA/man.bmp deleted file mode 100644 index 1c322015..00000000 Binary files a/DMI/symbols/STM/EBICAB_ASFA/man.bmp and /dev/null differ diff --git a/DMI/symbols/STM/LZB/60B.bmp b/DMI/symbols/STM/LZB/60B.bmp index deca5564..909661cf 100644 Binary files a/DMI/symbols/STM/LZB/60B.bmp and b/DMI/symbols/STM/LZB/60B.bmp differ diff --git a/DMI/symbols/STM/LZB/80B.bmp b/DMI/symbols/STM/LZB/80B.bmp index 4b4ff516..f0e3cbcc 100644 Binary files a/DMI/symbols/STM/LZB/80B.bmp and b/DMI/symbols/STM/LZB/80B.bmp differ diff --git a/DMI/symbols/STM/LZB/A.bmp b/DMI/symbols/STM/LZB/A.bmp index e89e331f..d0f1cb58 100644 Binary files a/DMI/symbols/STM/LZB/A.bmp and b/DMI/symbols/STM/LZB/A.bmp differ diff --git a/DMI/symbols/STM/LZB/E.bmp b/DMI/symbols/STM/LZB/E.bmp index 970b9638..e1a1aba2 100644 Binary files a/DMI/symbols/STM/LZB/E.bmp and b/DMI/symbols/STM/LZB/E.bmp differ diff --git a/DMI/symbols/STM/LZB/EB.bmp b/DMI/symbols/STM/LZB/EB.bmp index a0cec79c..fcba0ae8 100644 Binary files a/DMI/symbols/STM/LZB/EB.bmp and b/DMI/symbols/STM/LZB/EB.bmp differ diff --git a/DMI/symbols/STM/LZB/EL.bmp b/DMI/symbols/STM/LZB/EL.bmp index 0ac591d7..5f6d1792 100644 Binary files a/DMI/symbols/STM/LZB/EL.bmp and b/DMI/symbols/STM/LZB/EL.bmp differ diff --git a/DMI/symbols/STM/LZB/FIN.bmp b/DMI/symbols/STM/LZB/FIN.bmp index 63332a19..68dbccf7 100644 Binary files a/DMI/symbols/STM/LZB/FIN.bmp and b/DMI/symbols/STM/LZB/FIN.bmp differ diff --git a/DMI/symbols/STM/LZB/HS_STM10.bmp b/DMI/symbols/STM/LZB/HS_STM10.bmp new file mode 100644 index 00000000..c84b05ce Binary files /dev/null and b/DMI/symbols/STM/LZB/HS_STM10.bmp differ diff --git a/DMI/symbols/STM/LZB/LZB_magnitudes.bmp b/DMI/symbols/STM/LZB/LZB_magnitudes.bmp new file mode 100644 index 00000000..649f1b30 Binary files /dev/null and b/DMI/symbols/STM/LZB/LZB_magnitudes.bmp differ diff --git a/DMI/symbols/STM/LZB/LZB_no_magnitudes.bmp b/DMI/symbols/STM/LZB/LZB_no_magnitudes.bmp new file mode 100644 index 00000000..75ad1f47 Binary files /dev/null and b/DMI/symbols/STM/LZB/LZB_no_magnitudes.bmp differ diff --git a/DMI/symbols/STM/LZB/OE.bmp b/DMI/symbols/STM/LZB/OE.bmp index cc654b69..ea3a61ef 100644 Binary files a/DMI/symbols/STM/LZB/OE.bmp and b/DMI/symbols/STM/LZB/OE.bmp differ diff --git a/DMI/symbols/STM/LZB/OEB.bmp b/DMI/symbols/STM/LZB/OEB.bmp index 7c8725b1..e07c57c3 100644 Binary files a/DMI/symbols/STM/LZB/OEB.bmp and b/DMI/symbols/STM/LZB/OEB.bmp differ diff --git a/DMI/symbols/STM/LZB/OP40.bmp b/DMI/symbols/STM/LZB/OP40.bmp index f599f8f9..386ab4f3 100644 Binary files a/DMI/symbols/STM/LZB/OP40.bmp and b/DMI/symbols/STM/LZB/OP40.bmp differ diff --git a/DMI/symbols/STM/LZB/P.bmp b/DMI/symbols/STM/LZB/P.bmp index 43a48c79..02e62169 100644 Binary files a/DMI/symbols/STM/LZB/P.bmp and b/DMI/symbols/STM/LZB/P.bmp differ diff --git a/DMI/symbols/STM/LZB/R.bmp b/DMI/symbols/STM/LZB/R.bmp index 2796a3f1..4add3c66 100644 Binary files a/DMI/symbols/STM/LZB/R.bmp and b/DMI/symbols/STM/LZB/R.bmp differ diff --git a/DMI/symbols/STM/LZB/S.bmp b/DMI/symbols/STM/LZB/S.bmp index 438dee66..2a01fd08 100644 Binary files a/DMI/symbols/STM/LZB/S.bmp and b/DMI/symbols/STM/LZB/S.bmp differ diff --git a/DMI/symbols/STM/LZB/V.bmp b/DMI/symbols/STM/LZB/V.bmp index aef8eb19..e0072d1b 100644 Binary files a/DMI/symbols/STM/LZB/V.bmp and b/DMI/symbols/STM/LZB/V.bmp differ diff --git a/DMI/symbols/STM/LZB/VB.bmp b/DMI/symbols/STM/LZB/VB.bmp index 6a20a1bb..73615576 100644 Binary files a/DMI/symbols/STM/LZB/VB.bmp and b/DMI/symbols/STM/LZB/VB.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/30.bmp b/DMI/symbols/STM/LZB_PZB/30.bmp index bb07c4b5..a25dede3 100644 Binary files a/DMI/symbols/STM/LZB_PZB/30.bmp and b/DMI/symbols/STM/LZB_PZB/30.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/55.bmp b/DMI/symbols/STM/LZB_PZB/55.bmp index f16f051e..0ef36294 100644 Binary files a/DMI/symbols/STM/LZB_PZB/55.bmp and b/DMI/symbols/STM/LZB_PZB/55.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/60.bmp b/DMI/symbols/STM/LZB_PZB/60.bmp index 74b9a254..909661cf 100644 Binary files a/DMI/symbols/STM/LZB_PZB/60.bmp and b/DMI/symbols/STM/LZB_PZB/60.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/70.bmp b/DMI/symbols/STM/LZB_PZB/70.bmp index 517cabd3..d06cb091 100644 Binary files a/DMI/symbols/STM/LZB_PZB/70.bmp and b/DMI/symbols/STM/LZB_PZB/70.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/80.bmp b/DMI/symbols/STM/LZB_PZB/80.bmp index 0eda49b4..f0e3cbcc 100644 Binary files a/DMI/symbols/STM/LZB_PZB/80.bmp and b/DMI/symbols/STM/LZB_PZB/80.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/85.bmp b/DMI/symbols/STM/LZB_PZB/85.bmp index cb030b41..c854ddd3 100644 Binary files a/DMI/symbols/STM/LZB_PZB/85.bmp and b/DMI/symbols/STM/LZB_PZB/85.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/B.bmp b/DMI/symbols/STM/LZB_PZB/B.bmp index e582f320..83d08f8f 100644 Binary files a/DMI/symbols/STM/LZB_PZB/B.bmp and b/DMI/symbols/STM/LZB_PZB/B.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/Befehl40.bmp b/DMI/symbols/STM/LZB_PZB/Befehl40.bmp index c700c2d8..a48a1ab3 100644 Binary files a/DMI/symbols/STM/LZB_PZB/Befehl40.bmp and b/DMI/symbols/STM/LZB_PZB/Befehl40.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/E40.bmp b/DMI/symbols/STM/LZB_PZB/E40.bmp index 1665bc00..490fc26c 100644 Binary files a/DMI/symbols/STM/LZB_PZB/E40.bmp and b/DMI/symbols/STM/LZB_PZB/E40.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/EL.bmp b/DMI/symbols/STM/LZB_PZB/EL.bmp index 0ac591d7..5f6d1792 100644 Binary files a/DMI/symbols/STM/LZB_PZB/EL.bmp and b/DMI/symbols/STM/LZB_PZB/EL.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/ENDE.bmp b/DMI/symbols/STM/LZB_PZB/ENDE.bmp index ed81f5d6..e18d860b 100644 Binary files a/DMI/symbols/STM/LZB_PZB/ENDE.bmp and b/DMI/symbols/STM/LZB_PZB/ENDE.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/G.bmp b/DMI/symbols/STM/LZB_PZB/G.bmp index d150bae1..14b502d4 100644 Binary files a/DMI/symbols/STM/LZB_PZB/G.bmp and b/DMI/symbols/STM/LZB_PZB/G.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/H.bmp b/DMI/symbols/STM/LZB_PZB/H.bmp index 350e1954..1c312aa4 100644 Binary files a/DMI/symbols/STM/LZB_PZB/H.bmp and b/DMI/symbols/STM/LZB_PZB/H.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/Hz1000.bmp b/DMI/symbols/STM/LZB_PZB/Hz1000.bmp index 1e76aced..49e37a6f 100644 Binary files a/DMI/symbols/STM/LZB_PZB/Hz1000.bmp and b/DMI/symbols/STM/LZB_PZB/Hz1000.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/Hz500.bmp b/DMI/symbols/STM/LZB_PZB/Hz500.bmp index 6926c226..874ce77b 100644 Binary files a/DMI/symbols/STM/LZB_PZB/Hz500.bmp and b/DMI/symbols/STM/LZB_PZB/Hz500.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/LZB.bmp b/DMI/symbols/STM/LZB_PZB/LZB.bmp new file mode 100644 index 00000000..6149d01a Binary files /dev/null and b/DMI/symbols/STM/LZB_PZB/LZB.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/PZB.bmp b/DMI/symbols/STM/LZB_PZB/PZB.bmp index 112c1e6c..b356f55f 100644 Binary files a/DMI/symbols/STM/LZB_PZB/PZB.bmp and b/DMI/symbols/STM/LZB_PZB/PZB.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/S.bmp b/DMI/symbols/STM/LZB_PZB/S.bmp index e16906b9..1e629b19 100644 Binary files a/DMI/symbols/STM/LZB_PZB/S.bmp and b/DMI/symbols/STM/LZB_PZB/S.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/U.bmp b/DMI/symbols/STM/LZB_PZB/U.bmp index 7959bf85..a9ab6d3b 100644 Binary files a/DMI/symbols/STM/LZB_PZB/U.bmp and b/DMI/symbols/STM/LZB_PZB/U.bmp differ diff --git a/DMI/symbols/STM/LZB_PZB/V40.bmp b/DMI/symbols/STM/LZB_PZB/V40.bmp index fc3e3b8c..a76f938d 100644 Binary files a/DMI/symbols/STM/LZB_PZB/V40.bmp and b/DMI/symbols/STM/LZB_PZB/V40.bmp differ diff --git a/EVC/TrainData/France/traindata_tgv.json b/EVC/TrainData/France/traindata_tgv.json index 83200ca4..6d1d8fa4 100644 --- a/EVC/TrainData/France/traindata_tgv.json +++ b/EVC/TrainData/France/traindata_tgv.json @@ -1,6 +1,6 @@ { - "Simple" : { - "length": 200, + "US_ZBGIS_0" : { + "length": 201, "speed": 320, "cant_deficiency": 100, "t_traction_cutoff": 0.3, @@ -88,8 +88,8 @@ } }, - "Doble" : { - "length": 400, + "UM_ZBGIS_0" : { + "length": 402, "speed": 320, "cant_deficiency": 100, "t_traction_cutoff": 0.3, diff --git a/EVC/TrainData/Italy/traindata_ETR1000.json b/EVC/TrainData/Italy/traindata_ETR1000.json index 4d867685..d024d54e 100644 --- a/EVC/TrainData/Italy/traindata_ETR1000.json +++ b/EVC/TrainData/Italy/traindata_ETR1000.json @@ -1,8 +1,8 @@ { - "1" : { - "length": 202, + "Normal" : { + "length": 205, "speed": 360, - "cant_deficiency": 115, + "cant_deficiency": 100, "t_traction_cutoff": 0.3, "airtight": 1, "axle_load_category": "C2", @@ -28,9 +28,9 @@ "emergency": { "normal": { "curves": [ - {"speed": 0, "value": 1.0, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, - {"speed": 38.8889, "value": 0.9, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, - {"speed": 55.5556, "value": 0.8, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9} + {"speed": 0, "value": 1.1, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 38.8889, "value": 1.0, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 55.5556, "value": 0.97, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9} ], "build_up_time": 5, "validity": "...." @@ -40,8 +40,8 @@ "normal": { "curves": [ {"speed": 0, "value": 1.0}, - {"speed": 38.8889, "value": 0.96}, - {"speed": 55.5556, "value": 0.86} + {"speed": 38.8889, "value": 0.97}, + {"speed": 55.5556, "value": 0.93} ], "build_up_time": 0.5, "validity": "1..." @@ -84,10 +84,10 @@ } }, - "2" : { - "length": 404, - "speed": 360, - "cant_deficiency": 115, + "1 Isol Bogie" : { + "length": 205, + "speed": 320, + "cant_deficiency": 100, "t_traction_cutoff": 0.3, "airtight": 1, "axle_load_category": "C2", @@ -113,9 +113,9 @@ "emergency": { "normal": { "curves": [ - {"speed": 0, "value": 1.0, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, - {"speed": 38.8889, "value": 0.9, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, - {"speed": 55.5556, "value": 0.8, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9} + {"speed": 0, "value": 1.02, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 38.8889, "value": 0.93, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 55.5556, "value": 0.9, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9} ], "build_up_time": 5, "validity": "...." @@ -124,9 +124,94 @@ "service": { "normal": { "curves": [ - {"speed": 0, "value": 1.0}, - {"speed": 38.8889, "value": 0.96}, - {"speed": 55.5556, "value": 0.86} + {"speed": 0, "value": 0.93}, + {"speed": 38.8889, "value": 0.9}, + {"speed": 55.5556, "value": 0.87} + ], + "build_up_time": 0.5, + "validity": "1..." + }, + "no_dynamic": { + "curves": [ + {"speed": 0, "value": 0.98}, + {"speed": 38.8889, "value": 0.94}, + {"speed": 55.5556, "value": 0.84} + ], + "build_up_time": 5, + "validity": "0..." + } + }, + "normal_service": { + "passenger": { + "0": { + "curves": [ + {"speed": 0, "value": 0.4} + ] + }, + "0.5": { + "curves": [ + {"speed": 0, "value": 0.6} + ] + }, + "0.7": { + "curves": [ + {"speed": 0, "value": 0.7} + ] + } + }, + "kn+": [ + {"speed": 0, "value": 0} + ], + "kn-": [ + {"speed": 0, "value": 0} + ] + } + + } + }, + "2 Isol Bogie" : { + "length": 205, + "speed": 300, + "cant_deficiency": 100, + "t_traction_cutoff": 0.3, + "airtight": 1, + "axle_load_category": "C2", + "loading_gauge": "G1", + "traction_systems": [ + {"name": "DC3kV", "nid_ctraction": 10}, + {"name": "DC3kV", "nid_ctraction": 15}, + {"name": "DC3kV", "nid_ctraction": 16}, + {"name": "DC1.5kV", "nid_ctraction": 14}, + {"name": "AC25kV", "nid_ctraction": 11}, + {"name": "AC25kV", "nid_ctraction": 17}, + {"name": "AC25kV", "nid_ctraction": 18}, + {"name": "AC25kV", "nid_ctraction": 12}, + {"name": "AC25kV", "nid_ctraction": 13}, + {"name": "AC15kV", "nid_ctraction": 4}, + {"name": "AC15kV", "nid_ctraction": 5}, + {"name": "AC15kV", "nid_ctraction": 6}, + {"name": "AC15kV", "nid_ctraction": 7}, + {"name": "AC15kV", "nid_ctraction": 8}, + {"name": "AC15kV", "nid_ctraction": 9} + ], + "brakes": { + "emergency": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.95, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 38.8889, "value": 0.86, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 55.5556, "value": 0.84, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9} + ], + "build_up_time": 5, + "validity": "...." + } + }, + "service": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.86}, + {"speed": 38.8889, "value": 0.84}, + {"speed": 55.5556, "value": 0.8} ], "build_up_time": 0.5, "validity": "1..." @@ -168,5 +253,260 @@ } } - } + }, + "3 Isol Bogie" : { + "length": 205, + "speed": 300, + "cant_deficiency": 100, + "t_traction_cutoff": 0.3, + "airtight": 1, + "axle_load_category": "C2", + "loading_gauge": "G1", + "traction_systems": [ + {"name": "DC3kV", "nid_ctraction": 10}, + {"name": "DC3kV", "nid_ctraction": 15}, + {"name": "DC3kV", "nid_ctraction": 16}, + {"name": "DC1.5kV", "nid_ctraction": 14}, + {"name": "AC25kV", "nid_ctraction": 11}, + {"name": "AC25kV", "nid_ctraction": 17}, + {"name": "AC25kV", "nid_ctraction": 18}, + {"name": "AC25kV", "nid_ctraction": 12}, + {"name": "AC25kV", "nid_ctraction": 13}, + {"name": "AC15kV", "nid_ctraction": 4}, + {"name": "AC15kV", "nid_ctraction": 5}, + {"name": "AC15kV", "nid_ctraction": 6}, + {"name": "AC15kV", "nid_ctraction": 7}, + {"name": "AC15kV", "nid_ctraction": 8}, + {"name": "AC15kV", "nid_ctraction": 9} + ], + "brakes": { + "emergency": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.87, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 38.8889, "value": 0.79, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 55.5556, "value": 0.77, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9} + ], + "build_up_time": 5, + "validity": "...." + } + }, + "service": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.79}, + {"speed": 38.8889, "value": 0.77}, + {"speed": 55.5556, "value": 0.74} + ], + "build_up_time": 0.5, + "validity": "1..." + }, + "no_dynamic": { + "curves": [ + {"speed": 0, "value": 0.98}, + {"speed": 38.8889, "value": 0.94}, + {"speed": 55.5556, "value": 0.84} + ], + "build_up_time": 5, + "validity": "0..." + } + }, + "normal_service": { + "passenger": { + "0": { + "curves": [ + {"speed": 0, "value": 0.4} + ] + }, + "0.5": { + "curves": [ + {"speed": 0, "value": 0.6} + ] + }, + "0.7": { + "curves": [ + {"speed": 0, "value": 0.7} + ] + } + }, + "kn+": [ + {"speed": 0, "value": 0} + ], + "kn-": [ + {"speed": 0, "value": 0} + ] + } + + } + }, + "4 Isol Bogie" : { + "length": 205, + "speed": 250, + "cant_deficiency": 100, + "t_traction_cutoff": 0.3, + "airtight": 1, + "axle_load_category": "C2", + "loading_gauge": "G1", + "traction_systems": [ + {"name": "DC3kV", "nid_ctraction": 10}, + {"name": "DC3kV", "nid_ctraction": 15}, + {"name": "DC3kV", "nid_ctraction": 16}, + {"name": "DC1.5kV", "nid_ctraction": 14}, + {"name": "AC25kV", "nid_ctraction": 11}, + {"name": "AC25kV", "nid_ctraction": 17}, + {"name": "AC25kV", "nid_ctraction": 18}, + {"name": "AC25kV", "nid_ctraction": 12}, + {"name": "AC25kV", "nid_ctraction": 13}, + {"name": "AC15kV", "nid_ctraction": 4}, + {"name": "AC15kV", "nid_ctraction": 5}, + {"name": "AC15kV", "nid_ctraction": 6}, + {"name": "AC15kV", "nid_ctraction": 7}, + {"name": "AC15kV", "nid_ctraction": 8}, + {"name": "AC15kV", "nid_ctraction": 9} + ], + "brakes": { + "emergency": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.8, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 38.8889, "value": 0.72, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 55.5556, "value": 0.7, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9} + ], + "build_up_time": 5, + "validity": "...." + } + }, + "service": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.72}, + {"speed": 38.8889, "value": 0.7}, + {"speed": 55.5556, "value": 0.67} + ], + "build_up_time": 0.5, + "validity": "1..." + }, + "no_dynamic": { + "curves": [ + {"speed": 0, "value": 0.98}, + {"speed": 38.8889, "value": 0.94}, + {"speed": 55.5556, "value": 0.84} + ], + "build_up_time": 5, + "validity": "0..." + } + }, + "normal_service": { + "passenger": { + "0": { + "curves": [ + {"speed": 0, "value": 0.4} + ] + }, + "0.5": { + "curves": [ + {"speed": 0, "value": 0.6} + ] + }, + "0.7": { + "curves": [ + {"speed": 0, "value": 0.7} + ] + } + }, + "kn+": [ + {"speed": 0, "value": 0} + ], + "kn-": [ + {"speed": 0, "value": 0} + ] + } + + } + }, + "Multiple" : { + "length": 410, + "speed": 360, + "cant_deficiency": 100, + "t_traction_cutoff": 0.3, + "airtight": 1, + "axle_load_category": "C2", + "loading_gauge": "G1", + "traction_systems": [ + {"name": "DC3kV", "nid_ctraction": 10}, + {"name": "DC3kV", "nid_ctraction": 15}, + {"name": "DC3kV", "nid_ctraction": 16}, + {"name": "DC1.5kV", "nid_ctraction": 14}, + {"name": "AC25kV", "nid_ctraction": 11}, + {"name": "AC25kV", "nid_ctraction": 17}, + {"name": "AC25kV", "nid_ctraction": 18}, + {"name": "AC25kV", "nid_ctraction": 12}, + {"name": "AC25kV", "nid_ctraction": 13}, + {"name": "AC15kV", "nid_ctraction": 4}, + {"name": "AC15kV", "nid_ctraction": 5}, + {"name": "AC15kV", "nid_ctraction": 6}, + {"name": "AC15kV", "nid_ctraction": 7}, + {"name": "AC15kV", "nid_ctraction": 8}, + {"name": "AC15kV", "nid_ctraction": 9} + ], + "brakes": { + "emergency": { + "normal": { + "curves": [ + {"speed": 0, "value": 1.1, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 38.8889, "value": 1.0, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9}, + {"speed": 55.5556, "value": 0.97, "kdry": [{"confidence": 50, "value": 0.8}], "kwet": 0.9} + ], + "build_up_time": 5, + "validity": "...." + } + }, + "service": { + "normal": { + "curves": [ + {"speed": 0, "value": 1.0}, + {"speed": 38.8889, "value": 0.97}, + {"speed": 55.5556, "value": 0.93} + ], + "build_up_time": 0.5, + "validity": "1..." + }, + "no_dynamic": { + "curves": [ + {"speed": 0, "value": 0.98}, + {"speed": 38.8889, "value": 0.94}, + {"speed": 55.5556, "value": 0.84} + ], + "build_up_time": 5, + "validity": "0..." + } + }, + "normal_service": { + "passenger": { + "0": { + "curves": [ + {"speed": 0, "value": 0.4} + ] + }, + "0.5": { + "curves": [ + {"speed": 0, "value": 0.6} + ] + }, + "0.7": { + "curves": [ + {"speed": 0, "value": 0.7} + ] + } + }, + "kn+": [ + {"speed": 0, "value": 0} + ], + "kn-": [ + {"speed": 0, "value": 0} + ] + } + + } + } } \ No newline at end of file diff --git a/EVC/TrainData/Spain/traindata_108.json b/EVC/TrainData/Spain/traindata_108.json index e865e459..cfd46ae9 100644 --- a/EVC/TrainData/Spain/traindata_108.json +++ b/EVC/TrainData/Spain/traindata_108.json @@ -1,6 +1,6 @@ { - "Simple" : { - "length": 200, + "US_ZBGIS_0" : { + "length": 201, "speed": 300, "cant_deficiency": 100, "t_traction_cutoff": 0.3, @@ -8,8 +8,6 @@ "axle_load_category": "C2", "loading_gauge": "GA", "traction_systems": [ - {"name": "DC3kV", "nid_ctraction": 15}, - {"name": "DC3kV", "nid_ctraction": 16}, {"name": "AC25kV", "nid_ctraction": 17}, {"name": "AC25kV", "nid_ctraction": 18} ], @@ -79,8 +77,8 @@ } }, - "Doble" : { - "length": 400, + "UM_ZBGIS_0" : { + "length": 402, "speed": 300, "cant_deficiency": 100, "t_traction_cutoff": 0.3, @@ -88,8 +86,6 @@ "axle_load_category": "C2", "loading_gauge": "GA", "traction_systems": [ - {"name": "DC3kV", "nid_ctraction": 15}, - {"name": "DC3kV", "nid_ctraction": 16}, {"name": "AC25kV", "nid_ctraction": 17}, {"name": "AC25kV", "nid_ctraction": 18} ], diff --git a/EVC/TrainData/Spain/traindata_130.json b/EVC/TrainData/Spain/traindata_130.json index 3f604ad9..f1ee2afe 100644 --- a/EVC/TrainData/Spain/traindata_130.json +++ b/EVC/TrainData/Spain/traindata_130.json @@ -1,6 +1,6 @@ { "130 Simple" : { - "length": 185, + "length": 190, "speed": 250, "cant_deficiency": 180, "t_traction_cutoff": 0.3, @@ -77,7 +77,7 @@ } }, "130 Doble" : { - "length": 370, + "length": 380, "speed": 250, "cant_deficiency": 180, "t_traction_cutoff": 0.3, @@ -154,7 +154,7 @@ } }, "130+730" : { - "length": 371, + "length": 380, "speed": 250, "cant_deficiency": 180, "t_traction_cutoff": 0.3, diff --git a/EVC/TrainData/Spain/traindata_730.json b/EVC/TrainData/Spain/traindata_730.json index ef9cd5fd..2acf2937 100644 --- a/EVC/TrainData/Spain/traindata_730.json +++ b/EVC/TrainData/Spain/traindata_730.json @@ -1,6 +1,6 @@ { "730 Simple" : { - "length": 186, + "length": 190, "speed": 250, "cant_deficiency": 180, "t_traction_cutoff": 0.3, @@ -78,7 +78,7 @@ } }, "730 Doble" : { - "length": 372, + "length": 380, "speed": 250, "cant_deficiency": 180, "t_traction_cutoff": 0.3, @@ -156,7 +156,7 @@ } }, "730+130" : { - "length": 371, + "length": 380, "speed": 250, "cant_deficiency": 180, "t_traction_cutoff": 0.3, diff --git a/EVC/config.json b/EVC/config.json index 93849cc0..3a3953f8 100644 --- a/EVC/config.json +++ b/EVC/config.json @@ -617,7 +617,7 @@ } ] }, - "1621":{ + "106162":{ "TrainData":"TrainData/Spain/traindata_162.json", "SpeedDial":400, "STMLayout":"stm_siemens.json", @@ -1313,7 +1313,6 @@ "6":{ "SpeedDial":180, "STMLayout":"stm_siemens.json", - "OpenMainPowerSwitchDistance":500, "SoftKeys":true, "CustomTrainDataInputs":[ { @@ -1512,7 +1511,7 @@ "108":{ "TrainData":"TrainData/Spain/traindata_108.json", "SpeedDial":400, - "STMLayout":"stm_alstom.json", + "STMLayout":"stm_hitachi.json", "OpenMainPowerSwitchTime":10, "ConstTrainDataValues":[ { @@ -1536,7 +1535,7 @@ "1081":{ "TrainData":"TrainData/Spain/traindata_108.json", "SpeedDial":400, - "STMLayout":"stm_alstom.json", + "STMLayout":"stm_hitachi.json", "OpenMainPowerSwitchTime":10, "UnsupportedLevels":[ 2 @@ -1563,7 +1562,7 @@ "108tgv": { "TrainData": "TrainData/France/traindata_tgv.json", "SpeedDial": 400, - "STMLayout": "stm_alstom.json", + "STMLayout": "stm_hitachi.json", "OpenMainPowerSwitchTime":10, "ConstTrainDataValues":[ { diff --git a/locales/evc/es.po b/locales/evc/es.po index 2cb66138..a6b293a5 100644 --- a/locales/evc/es.po +++ b/locales/evc/es.po @@ -61,7 +61,8 @@ msgstr "Identificador RBC" #: ../EVC/DMI/windows.cpp:184 ../EVC/DMI/windows.cpp:387 #: ../EVC/DMI/windows.cpp:1303 msgid "RBC phone number" -msgstr "Número de teléfono RBC" +msgstr "Número de teléfono\n" +"RBC" #: ../EVC/DMI/windows.cpp:188 ../EVC/DMI/windows.cpp:1301 #: ../EVC/DMI/windows.cpp:1464 @@ -191,7 +192,7 @@ msgstr "Porcentaje de freno [%]" #: ../EVC/DMI/windows.cpp:243 ../EVC/DMI/windows.cpp:1179 #: ../EVC/DMI/windows.cpp:1458 msgid "Max speed (km/h)" -msgstr "Velocidad máxima [km/h]" +msgstr "Vel. máxima [km/h]" #: ../EVC/DMI/windows.cpp:246 ../EVC/DMI/windows.cpp:372 #: ../EVC/DMI/windows.cpp:1149 @@ -326,7 +327,7 @@ msgstr "Via no deslizante" #: ../EVC/DMI/windows.cpp:317 ../EVC/DMI/windows.cpp:1343 #: ../EVC/DMI/windows.cpp:1473 msgid "SR speed (km/h)" -msgstr "Max. velocidad SR [km/h]" +msgstr "Vel. máxima SR [km/h]" #: ../EVC/DMI/windows.cpp:318 ../EVC/DMI/windows.cpp:1345 #: ../EVC/DMI/windows.cpp:1470 @@ -360,7 +361,8 @@ msgstr "Suprimir VBC" #: ../EVC/DMI/windows.cpp:370 msgid "Maximum speed (km/h)" -msgstr "Velocidad máxima [km/h]" +msgstr "Vel. máxima [km/h]" + #: ../EVC/DMI/windows.cpp:396 msgid "Data view"