diff --git a/cfg/vehicles/ra3-02801-active/aux-converter.xml b/cfg/vehicles/ra3-02801-active/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-02801-active/aux-converter.xml +++ b/cfg/vehicles/ra3-02801-active/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/bat110.xml b/cfg/vehicles/ra3-02801-active/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-02801-active/bat110.xml +++ b/cfg/vehicles/ra3-02801-active/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/bat24.xml b/cfg/vehicles/ra3-02801-active/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-02801-active/bat24.xml +++ b/cfg/vehicles/ra3-02801-active/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/brake-mech.xml b/cfg/vehicles/ra3-02801-active/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-02801-active/brake-mech.xml +++ b/cfg/vehicles/ra3-02801-active/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/bto092.xml b/cfg/vehicles/ra3-02801-active/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-02801-active/bto092.xml +++ b/cfg/vehicles/ra3-02801-active/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-02801-active/disel.xml b/cfg/vehicles/ra3-02801-active/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-02801-active/disel.xml +++ b/cfg/vehicles/ra3-02801-active/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/displays.xml b/cfg/vehicles/ra3-02801-active/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-02801-active/displays.xml +++ b/cfg/vehicles/ra3-02801-active/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/emergency-brake-valve.xml b/cfg/vehicles/ra3-02801-active/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-02801-active/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-02801-active/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/epk.xml b/cfg/vehicles/ra3-02801-active/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-02801-active/epk.xml +++ b/cfg/vehicles/ra3-02801-active/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/ept_valve.xml b/cfg/vehicles/ra3-02801-active/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-02801-active/ept_valve.xml +++ b/cfg/vehicles/ra3-02801-active/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/generator.xml b/cfg/vehicles/ra3-02801-active/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-02801-active/generator.xml +++ b/cfg/vehicles/ra3-02801-active/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/hydro-pump.xml b/cfg/vehicles/ra3-02801-active/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-02801-active/hydro-pump.xml +++ b/cfg/vehicles/ra3-02801-active/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/hydro-transmission.xml b/cfg/vehicles/ra3-02801-active/hydro-transmission.xml index 91d4eb6..69524ea 100644 --- a/cfg/vehicles/ra3-02801-active/hydro-transmission.xml +++ b/cfg/vehicles/ra3-02801-active/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/keb.xml b/cfg/vehicles/ra3-02801-active/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-02801-active/keb.xml +++ b/cfg/vehicles/ra3-02801-active/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/kru091.xml b/cfg/vehicles/ra3-02801-active/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-02801-active/kru091.xml +++ b/cfg/vehicles/ra3-02801-active/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-02801-active/mk.xml b/cfg/vehicles/ra3-02801-active/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-02801-active/mk.xml +++ b/cfg/vehicles/ra3-02801-active/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/motor-compressor.xml b/cfg/vehicles/ra3-02801-active/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-02801-active/motor-compressor.xml +++ b/cfg/vehicles/ra3-02801-active/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-02801-active/mpsu.xml b/cfg/vehicles/ra3-02801-active/mpsu.xml index 1737418..3e114a5 100644 --- a/cfg/vehicles/ra3-02801-active/mpsu.xml +++ b/cfg/vehicles/ra3-02801-active/mpsu.xml @@ -1,21 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - 24.24 - 24.7 + 24.24 + 24.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/pneumo-reducer.xml b/cfg/vehicles/ra3-02801-active/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-02801-active/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-02801-active/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-02801-active/ra3-02801-active.xml b/cfg/vehicles/ra3-02801-active/ra3-02801-active.xml index 198cb8a..24f2ec8 100644 --- a/cfg/vehicles/ra3-02801-active/ra3-02801-active.xml +++ b/cfg/vehicles/ra3-02801-active/ra3-02801-active.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-02801-active/start-program.xml b/cfg/vehicles/ra3-02801-active/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-02801-active/start-program.xml +++ b/cfg/vehicles/ra3-02801-active/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/starter-relay.xml b/cfg/vehicles/ra3-02801-active/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-02801-active/starter-relay.xml +++ b/cfg/vehicles/ra3-02801-active/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/starter.xml b/cfg/vehicles/ra3-02801-active/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-02801-active/starter.xml +++ b/cfg/vehicles/ra3-02801-active/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/trac-controller.xml b/cfg/vehicles/ra3-02801-active/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-02801-active/trac-controller.xml +++ b/cfg/vehicles/ra3-02801-active/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02801-active/tumblers-config.xml b/cfg/vehicles/ra3-02801-active/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-02801-active/tumblers-config.xml +++ b/cfg/vehicles/ra3-02801-active/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/aux-converter.xml b/cfg/vehicles/ra3-02802/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-02802/aux-converter.xml +++ b/cfg/vehicles/ra3-02802/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/bat110.xml b/cfg/vehicles/ra3-02802/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-02802/bat110.xml +++ b/cfg/vehicles/ra3-02802/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/bat24.xml b/cfg/vehicles/ra3-02802/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-02802/bat24.xml +++ b/cfg/vehicles/ra3-02802/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/brake-mech.xml b/cfg/vehicles/ra3-02802/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-02802/brake-mech.xml +++ b/cfg/vehicles/ra3-02802/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/bto092.xml b/cfg/vehicles/ra3-02802/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-02802/bto092.xml +++ b/cfg/vehicles/ra3-02802/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-02802/disel.xml b/cfg/vehicles/ra3-02802/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-02802/disel.xml +++ b/cfg/vehicles/ra3-02802/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/displays.xml b/cfg/vehicles/ra3-02802/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-02802/displays.xml +++ b/cfg/vehicles/ra3-02802/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/emergency-brake-valve.xml b/cfg/vehicles/ra3-02802/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-02802/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-02802/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/epk.xml b/cfg/vehicles/ra3-02802/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-02802/epk.xml +++ b/cfg/vehicles/ra3-02802/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/ept_valve.xml b/cfg/vehicles/ra3-02802/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-02802/ept_valve.xml +++ b/cfg/vehicles/ra3-02802/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/generator.xml b/cfg/vehicles/ra3-02802/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-02802/generator.xml +++ b/cfg/vehicles/ra3-02802/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/hydro-pump.xml b/cfg/vehicles/ra3-02802/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-02802/hydro-pump.xml +++ b/cfg/vehicles/ra3-02802/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/hydro-transmission.xml b/cfg/vehicles/ra3-02802/hydro-transmission.xml index 91d4eb6..69524ea 100644 --- a/cfg/vehicles/ra3-02802/hydro-transmission.xml +++ b/cfg/vehicles/ra3-02802/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/keb.xml b/cfg/vehicles/ra3-02802/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-02802/keb.xml +++ b/cfg/vehicles/ra3-02802/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/kru091.xml b/cfg/vehicles/ra3-02802/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-02802/kru091.xml +++ b/cfg/vehicles/ra3-02802/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-02802/mk.xml b/cfg/vehicles/ra3-02802/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-02802/mk.xml +++ b/cfg/vehicles/ra3-02802/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/motor-compressor.xml b/cfg/vehicles/ra3-02802/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-02802/motor-compressor.xml +++ b/cfg/vehicles/ra3-02802/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-02802/mpsu.xml b/cfg/vehicles/ra3-02802/mpsu.xml index 1737418..3e114a5 100644 --- a/cfg/vehicles/ra3-02802/mpsu.xml +++ b/cfg/vehicles/ra3-02802/mpsu.xml @@ -1,21 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - 24.24 - 24.7 + 24.24 + 24.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/pneumo-reducer.xml b/cfg/vehicles/ra3-02802/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-02802/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-02802/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-02802/ra3-02802.xml b/cfg/vehicles/ra3-02802/ra3-02802.xml index 0d389fb..a9c3d09 100644 --- a/cfg/vehicles/ra3-02802/ra3-02802.xml +++ b/cfg/vehicles/ra3-02802/ra3-02802.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-02802/start-program.xml b/cfg/vehicles/ra3-02802/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-02802/start-program.xml +++ b/cfg/vehicles/ra3-02802/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/starter-relay.xml b/cfg/vehicles/ra3-02802/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-02802/starter-relay.xml +++ b/cfg/vehicles/ra3-02802/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/starter.xml b/cfg/vehicles/ra3-02802/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-02802/starter.xml +++ b/cfg/vehicles/ra3-02802/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/trac-controller.xml b/cfg/vehicles/ra3-02802/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-02802/trac-controller.xml +++ b/cfg/vehicles/ra3-02802/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-02802/tumblers-config.xml b/cfg/vehicles/ra3-02802/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-02802/tumblers-config.xml +++ b/cfg/vehicles/ra3-02802/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/aux-converter.xml b/cfg/vehicles/ra3-03501/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-03501/aux-converter.xml +++ b/cfg/vehicles/ra3-03501/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/bat110.xml b/cfg/vehicles/ra3-03501/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03501/bat110.xml +++ b/cfg/vehicles/ra3-03501/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/bat24.xml b/cfg/vehicles/ra3-03501/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-03501/bat24.xml +++ b/cfg/vehicles/ra3-03501/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/brake-mech.xml b/cfg/vehicles/ra3-03501/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03501/brake-mech.xml +++ b/cfg/vehicles/ra3-03501/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/bto092.xml b/cfg/vehicles/ra3-03501/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03501/bto092.xml +++ b/cfg/vehicles/ra3-03501/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03501/disel.xml b/cfg/vehicles/ra3-03501/disel.xml index dde4a0b..d7696a7 100644 --- a/cfg/vehicles/ra3-03501/disel.xml +++ b/cfg/vehicles/ra3-03501/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d2 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/displays.xml b/cfg/vehicles/ra3-03501/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-03501/displays.xml +++ b/cfg/vehicles/ra3-03501/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/emergency-brake-valve.xml b/cfg/vehicles/ra3-03501/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-03501/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-03501/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/epk.xml b/cfg/vehicles/ra3-03501/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-03501/epk.xml +++ b/cfg/vehicles/ra3-03501/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/ept_valve.xml b/cfg/vehicles/ra3-03501/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03501/ept_valve.xml +++ b/cfg/vehicles/ra3-03501/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/generator.xml b/cfg/vehicles/ra3-03501/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-03501/generator.xml +++ b/cfg/vehicles/ra3-03501/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/hydro-pump.xml b/cfg/vehicles/ra3-03501/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-03501/hydro-pump.xml +++ b/cfg/vehicles/ra3-03501/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/hydro-transmission.xml b/cfg/vehicles/ra3-03501/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-03501/hydro-transmission.xml +++ b/cfg/vehicles/ra3-03501/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/keb.xml b/cfg/vehicles/ra3-03501/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03501/keb.xml +++ b/cfg/vehicles/ra3-03501/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/kru091.xml b/cfg/vehicles/ra3-03501/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-03501/kru091.xml +++ b/cfg/vehicles/ra3-03501/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-03501/mk.xml b/cfg/vehicles/ra3-03501/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03501/mk.xml +++ b/cfg/vehicles/ra3-03501/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/motor-compressor.xml b/cfg/vehicles/ra3-03501/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-03501/motor-compressor.xml +++ b/cfg/vehicles/ra3-03501/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-03501/mpsu.xml b/cfg/vehicles/ra3-03501/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-03501/mpsu.xml +++ b/cfg/vehicles/ra3-03501/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/pneumo-reducer.xml b/cfg/vehicles/ra3-03501/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03501/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03501/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03501/ra3-03501.xml b/cfg/vehicles/ra3-03501/ra3-03501.xml index 9a419e0..23888ac 100644 --- a/cfg/vehicles/ra3-03501/ra3-03501.xml +++ b/cfg/vehicles/ra3-03501/ra3-03501.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03501/start-program.xml b/cfg/vehicles/ra3-03501/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-03501/start-program.xml +++ b/cfg/vehicles/ra3-03501/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/starter-relay.xml b/cfg/vehicles/ra3-03501/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-03501/starter-relay.xml +++ b/cfg/vehicles/ra3-03501/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/starter.xml b/cfg/vehicles/ra3-03501/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-03501/starter.xml +++ b/cfg/vehicles/ra3-03501/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/trac-controller.xml b/cfg/vehicles/ra3-03501/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-03501/trac-controller.xml +++ b/cfg/vehicles/ra3-03501/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03501/tumblers-config.xml b/cfg/vehicles/ra3-03501/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-03501/tumblers-config.xml +++ b/cfg/vehicles/ra3-03501/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/aux-converter.xml b/cfg/vehicles/ra3-03502-active/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-03502-active/aux-converter.xml +++ b/cfg/vehicles/ra3-03502-active/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/bat110.xml b/cfg/vehicles/ra3-03502-active/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03502-active/bat110.xml +++ b/cfg/vehicles/ra3-03502-active/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/bat24.xml b/cfg/vehicles/ra3-03502-active/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-03502-active/bat24.xml +++ b/cfg/vehicles/ra3-03502-active/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/brake-mech.xml b/cfg/vehicles/ra3-03502-active/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03502-active/brake-mech.xml +++ b/cfg/vehicles/ra3-03502-active/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/bto092.xml b/cfg/vehicles/ra3-03502-active/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03502-active/bto092.xml +++ b/cfg/vehicles/ra3-03502-active/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03502-active/disel.xml b/cfg/vehicles/ra3-03502-active/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-03502-active/disel.xml +++ b/cfg/vehicles/ra3-03502-active/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/displays.xml b/cfg/vehicles/ra3-03502-active/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-03502-active/displays.xml +++ b/cfg/vehicles/ra3-03502-active/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/emergency-brake-valve.xml b/cfg/vehicles/ra3-03502-active/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-03502-active/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-03502-active/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/epk.xml b/cfg/vehicles/ra3-03502-active/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-03502-active/epk.xml +++ b/cfg/vehicles/ra3-03502-active/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/ept_valve.xml b/cfg/vehicles/ra3-03502-active/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03502-active/ept_valve.xml +++ b/cfg/vehicles/ra3-03502-active/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/generator.xml b/cfg/vehicles/ra3-03502-active/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-03502-active/generator.xml +++ b/cfg/vehicles/ra3-03502-active/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/hydro-pump.xml b/cfg/vehicles/ra3-03502-active/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-03502-active/hydro-pump.xml +++ b/cfg/vehicles/ra3-03502-active/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/hydro-transmission.xml b/cfg/vehicles/ra3-03502-active/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-03502-active/hydro-transmission.xml +++ b/cfg/vehicles/ra3-03502-active/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/keb.xml b/cfg/vehicles/ra3-03502-active/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03502-active/keb.xml +++ b/cfg/vehicles/ra3-03502-active/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/kru091.xml b/cfg/vehicles/ra3-03502-active/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-03502-active/kru091.xml +++ b/cfg/vehicles/ra3-03502-active/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-03502-active/mk.xml b/cfg/vehicles/ra3-03502-active/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03502-active/mk.xml +++ b/cfg/vehicles/ra3-03502-active/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/motor-compressor.xml b/cfg/vehicles/ra3-03502-active/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-03502-active/motor-compressor.xml +++ b/cfg/vehicles/ra3-03502-active/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-03502-active/mpsu.xml b/cfg/vehicles/ra3-03502-active/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-03502-active/mpsu.xml +++ b/cfg/vehicles/ra3-03502-active/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/pneumo-reducer.xml b/cfg/vehicles/ra3-03502-active/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03502-active/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03502-active/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03502-active/ra3-03502-active.xml b/cfg/vehicles/ra3-03502-active/ra3-03502-active.xml index 6dca1ff..4dd5cf9 100644 --- a/cfg/vehicles/ra3-03502-active/ra3-03502-active.xml +++ b/cfg/vehicles/ra3-03502-active/ra3-03502-active.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03502-active/start-program.xml b/cfg/vehicles/ra3-03502-active/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-03502-active/start-program.xml +++ b/cfg/vehicles/ra3-03502-active/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/starter-relay.xml b/cfg/vehicles/ra3-03502-active/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-03502-active/starter-relay.xml +++ b/cfg/vehicles/ra3-03502-active/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/starter.xml b/cfg/vehicles/ra3-03502-active/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-03502-active/starter.xml +++ b/cfg/vehicles/ra3-03502-active/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/trac-controller.xml b/cfg/vehicles/ra3-03502-active/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-03502-active/trac-controller.xml +++ b/cfg/vehicles/ra3-03502-active/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03502-active/tumblers-config.xml b/cfg/vehicles/ra3-03502-active/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-03502-active/tumblers-config.xml +++ b/cfg/vehicles/ra3-03502-active/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03503/bat110.xml b/cfg/vehicles/ra3-03503/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03503/bat110.xml +++ b/cfg/vehicles/ra3-03503/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03503/brake-mech.xml b/cfg/vehicles/ra3-03503/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03503/brake-mech.xml +++ b/cfg/vehicles/ra3-03503/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03503/bto092.xml b/cfg/vehicles/ra3-03503/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03503/bto092.xml +++ b/cfg/vehicles/ra3-03503/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03503/ept_valve.xml b/cfg/vehicles/ra3-03503/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03503/ept_valve.xml +++ b/cfg/vehicles/ra3-03503/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03503/keb.xml b/cfg/vehicles/ra3-03503/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03503/keb.xml +++ b/cfg/vehicles/ra3-03503/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03503/mk.xml b/cfg/vehicles/ra3-03503/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03503/mk.xml +++ b/cfg/vehicles/ra3-03503/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03503/pneumo-reducer.xml b/cfg/vehicles/ra3-03503/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03503/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03503/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03503/ra3-03503.xml b/cfg/vehicles/ra3-03503/ra3-03503.xml index 84cc483..eb11ac3 100644 --- a/cfg/vehicles/ra3-03503/ra3-03503.xml +++ b/cfg/vehicles/ra3-03503/ra3-03503.xml @@ -6,9 +6,10 @@ 24.7 0.86 loco-resist + default 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03601/aux-converter.xml b/cfg/vehicles/ra3-03601/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-03601/aux-converter.xml +++ b/cfg/vehicles/ra3-03601/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/bat110.xml b/cfg/vehicles/ra3-03601/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03601/bat110.xml +++ b/cfg/vehicles/ra3-03601/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/bat24.xml b/cfg/vehicles/ra3-03601/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-03601/bat24.xml +++ b/cfg/vehicles/ra3-03601/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/brake-mech.xml b/cfg/vehicles/ra3-03601/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03601/brake-mech.xml +++ b/cfg/vehicles/ra3-03601/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/bto092.xml b/cfg/vehicles/ra3-03601/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03601/bto092.xml +++ b/cfg/vehicles/ra3-03601/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03601/disel.xml b/cfg/vehicles/ra3-03601/disel.xml index dde4a0b..d7696a7 100644 --- a/cfg/vehicles/ra3-03601/disel.xml +++ b/cfg/vehicles/ra3-03601/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d2 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/displays.xml b/cfg/vehicles/ra3-03601/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-03601/displays.xml +++ b/cfg/vehicles/ra3-03601/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/emergency-brake-valve.xml b/cfg/vehicles/ra3-03601/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-03601/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-03601/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/epk.xml b/cfg/vehicles/ra3-03601/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-03601/epk.xml +++ b/cfg/vehicles/ra3-03601/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/ept_valve.xml b/cfg/vehicles/ra3-03601/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03601/ept_valve.xml +++ b/cfg/vehicles/ra3-03601/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/generator.xml b/cfg/vehicles/ra3-03601/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-03601/generator.xml +++ b/cfg/vehicles/ra3-03601/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/hydro-pump.xml b/cfg/vehicles/ra3-03601/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-03601/hydro-pump.xml +++ b/cfg/vehicles/ra3-03601/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/hydro-transmission.xml b/cfg/vehicles/ra3-03601/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-03601/hydro-transmission.xml +++ b/cfg/vehicles/ra3-03601/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/keb.xml b/cfg/vehicles/ra3-03601/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03601/keb.xml +++ b/cfg/vehicles/ra3-03601/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/kru091.xml b/cfg/vehicles/ra3-03601/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-03601/kru091.xml +++ b/cfg/vehicles/ra3-03601/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-03601/mk.xml b/cfg/vehicles/ra3-03601/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03601/mk.xml +++ b/cfg/vehicles/ra3-03601/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/motor-compressor.xml b/cfg/vehicles/ra3-03601/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-03601/motor-compressor.xml +++ b/cfg/vehicles/ra3-03601/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-03601/mpsu.xml b/cfg/vehicles/ra3-03601/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-03601/mpsu.xml +++ b/cfg/vehicles/ra3-03601/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/pneumo-reducer.xml b/cfg/vehicles/ra3-03601/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03601/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03601/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03601/ra3-03601.xml b/cfg/vehicles/ra3-03601/ra3-03601.xml index 17103a2..32da150 100644 --- a/cfg/vehicles/ra3-03601/ra3-03601.xml +++ b/cfg/vehicles/ra3-03601/ra3-03601.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03601/start-program.xml b/cfg/vehicles/ra3-03601/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-03601/start-program.xml +++ b/cfg/vehicles/ra3-03601/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/starter-relay.xml b/cfg/vehicles/ra3-03601/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-03601/starter-relay.xml +++ b/cfg/vehicles/ra3-03601/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/starter.xml b/cfg/vehicles/ra3-03601/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-03601/starter.xml +++ b/cfg/vehicles/ra3-03601/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/trac-controller.xml b/cfg/vehicles/ra3-03601/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-03601/trac-controller.xml +++ b/cfg/vehicles/ra3-03601/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03601/tumblers-config.xml b/cfg/vehicles/ra3-03601/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-03601/tumblers-config.xml +++ b/cfg/vehicles/ra3-03601/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/aux-converter.xml b/cfg/vehicles/ra3-03602/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-03602/aux-converter.xml +++ b/cfg/vehicles/ra3-03602/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/bat110.xml b/cfg/vehicles/ra3-03602/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03602/bat110.xml +++ b/cfg/vehicles/ra3-03602/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/bat24.xml b/cfg/vehicles/ra3-03602/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-03602/bat24.xml +++ b/cfg/vehicles/ra3-03602/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/brake-mech.xml b/cfg/vehicles/ra3-03602/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03602/brake-mech.xml +++ b/cfg/vehicles/ra3-03602/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/bto092.xml b/cfg/vehicles/ra3-03602/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03602/bto092.xml +++ b/cfg/vehicles/ra3-03602/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03602/disel.xml b/cfg/vehicles/ra3-03602/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-03602/disel.xml +++ b/cfg/vehicles/ra3-03602/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/displays.xml b/cfg/vehicles/ra3-03602/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-03602/displays.xml +++ b/cfg/vehicles/ra3-03602/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/emergency-brake-valve.xml b/cfg/vehicles/ra3-03602/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-03602/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-03602/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/epk.xml b/cfg/vehicles/ra3-03602/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-03602/epk.xml +++ b/cfg/vehicles/ra3-03602/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/ept_valve.xml b/cfg/vehicles/ra3-03602/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03602/ept_valve.xml +++ b/cfg/vehicles/ra3-03602/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/generator.xml b/cfg/vehicles/ra3-03602/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-03602/generator.xml +++ b/cfg/vehicles/ra3-03602/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/hydro-pump.xml b/cfg/vehicles/ra3-03602/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-03602/hydro-pump.xml +++ b/cfg/vehicles/ra3-03602/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/hydro-transmission.xml b/cfg/vehicles/ra3-03602/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-03602/hydro-transmission.xml +++ b/cfg/vehicles/ra3-03602/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/keb.xml b/cfg/vehicles/ra3-03602/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03602/keb.xml +++ b/cfg/vehicles/ra3-03602/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/kru091.xml b/cfg/vehicles/ra3-03602/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-03602/kru091.xml +++ b/cfg/vehicles/ra3-03602/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-03602/mk.xml b/cfg/vehicles/ra3-03602/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03602/mk.xml +++ b/cfg/vehicles/ra3-03602/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/motor-compressor.xml b/cfg/vehicles/ra3-03602/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-03602/motor-compressor.xml +++ b/cfg/vehicles/ra3-03602/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-03602/mpsu.xml b/cfg/vehicles/ra3-03602/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-03602/mpsu.xml +++ b/cfg/vehicles/ra3-03602/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/pneumo-reducer.xml b/cfg/vehicles/ra3-03602/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03602/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03602/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03602/ra3-03602.xml b/cfg/vehicles/ra3-03602/ra3-03602.xml index 27e7fa1..d7d7360 100644 --- a/cfg/vehicles/ra3-03602/ra3-03602.xml +++ b/cfg/vehicles/ra3-03602/ra3-03602.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03602/start-program.xml b/cfg/vehicles/ra3-03602/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-03602/start-program.xml +++ b/cfg/vehicles/ra3-03602/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/starter-relay.xml b/cfg/vehicles/ra3-03602/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-03602/starter-relay.xml +++ b/cfg/vehicles/ra3-03602/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/starter.xml b/cfg/vehicles/ra3-03602/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-03602/starter.xml +++ b/cfg/vehicles/ra3-03602/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/trac-controller.xml b/cfg/vehicles/ra3-03602/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-03602/trac-controller.xml +++ b/cfg/vehicles/ra3-03602/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03602/tumblers-config.xml b/cfg/vehicles/ra3-03602/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-03602/tumblers-config.xml +++ b/cfg/vehicles/ra3-03602/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03603/bat110.xml b/cfg/vehicles/ra3-03603/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03603/bat110.xml +++ b/cfg/vehicles/ra3-03603/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03603/brake-mech.xml b/cfg/vehicles/ra3-03603/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03603/brake-mech.xml +++ b/cfg/vehicles/ra3-03603/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03603/bto092.xml b/cfg/vehicles/ra3-03603/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03603/bto092.xml +++ b/cfg/vehicles/ra3-03603/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03603/ept_valve.xml b/cfg/vehicles/ra3-03603/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03603/ept_valve.xml +++ b/cfg/vehicles/ra3-03603/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03603/keb.xml b/cfg/vehicles/ra3-03603/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03603/keb.xml +++ b/cfg/vehicles/ra3-03603/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03603/mk.xml b/cfg/vehicles/ra3-03603/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03603/mk.xml +++ b/cfg/vehicles/ra3-03603/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03603/pneumo-reducer.xml b/cfg/vehicles/ra3-03603/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03603/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03603/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03603/ra3-03603.xml b/cfg/vehicles/ra3-03603/ra3-03603.xml index 454dae6..8009f48 100644 --- a/cfg/vehicles/ra3-03603/ra3-03603.xml +++ b/cfg/vehicles/ra3-03603/ra3-03603.xml @@ -6,9 +6,10 @@ 24.7 0.86 loco-resist + default 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03701-active/aux-converter.xml b/cfg/vehicles/ra3-03701-active/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-03701-active/aux-converter.xml +++ b/cfg/vehicles/ra3-03701-active/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/bat110.xml b/cfg/vehicles/ra3-03701-active/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03701-active/bat110.xml +++ b/cfg/vehicles/ra3-03701-active/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/bat24.xml b/cfg/vehicles/ra3-03701-active/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-03701-active/bat24.xml +++ b/cfg/vehicles/ra3-03701-active/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/brake-mech.xml b/cfg/vehicles/ra3-03701-active/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03701-active/brake-mech.xml +++ b/cfg/vehicles/ra3-03701-active/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/bto092.xml b/cfg/vehicles/ra3-03701-active/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03701-active/bto092.xml +++ b/cfg/vehicles/ra3-03701-active/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03701-active/disel.xml b/cfg/vehicles/ra3-03701-active/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-03701-active/disel.xml +++ b/cfg/vehicles/ra3-03701-active/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/displays.xml b/cfg/vehicles/ra3-03701-active/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-03701-active/displays.xml +++ b/cfg/vehicles/ra3-03701-active/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/emergency-brake-valve.xml b/cfg/vehicles/ra3-03701-active/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-03701-active/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-03701-active/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/epk.xml b/cfg/vehicles/ra3-03701-active/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-03701-active/epk.xml +++ b/cfg/vehicles/ra3-03701-active/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/ept_valve.xml b/cfg/vehicles/ra3-03701-active/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03701-active/ept_valve.xml +++ b/cfg/vehicles/ra3-03701-active/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/generator.xml b/cfg/vehicles/ra3-03701-active/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-03701-active/generator.xml +++ b/cfg/vehicles/ra3-03701-active/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/hydro-pump.xml b/cfg/vehicles/ra3-03701-active/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-03701-active/hydro-pump.xml +++ b/cfg/vehicles/ra3-03701-active/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/hydro-transmission.xml b/cfg/vehicles/ra3-03701-active/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-03701-active/hydro-transmission.xml +++ b/cfg/vehicles/ra3-03701-active/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/keb.xml b/cfg/vehicles/ra3-03701-active/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03701-active/keb.xml +++ b/cfg/vehicles/ra3-03701-active/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/kru091.xml b/cfg/vehicles/ra3-03701-active/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-03701-active/kru091.xml +++ b/cfg/vehicles/ra3-03701-active/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-03701-active/mk.xml b/cfg/vehicles/ra3-03701-active/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03701-active/mk.xml +++ b/cfg/vehicles/ra3-03701-active/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/motor-compressor.xml b/cfg/vehicles/ra3-03701-active/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-03701-active/motor-compressor.xml +++ b/cfg/vehicles/ra3-03701-active/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-03701-active/mpsu.xml b/cfg/vehicles/ra3-03701-active/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-03701-active/mpsu.xml +++ b/cfg/vehicles/ra3-03701-active/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/pneumo-reducer.xml b/cfg/vehicles/ra3-03701-active/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03701-active/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03701-active/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03701-active/ra3-03701-active.xml b/cfg/vehicles/ra3-03701-active/ra3-03701-active.xml index 7cdd7a7..8727541 100644 --- a/cfg/vehicles/ra3-03701-active/ra3-03701-active.xml +++ b/cfg/vehicles/ra3-03701-active/ra3-03701-active.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03701-active/start-program.xml b/cfg/vehicles/ra3-03701-active/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-03701-active/start-program.xml +++ b/cfg/vehicles/ra3-03701-active/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/starter-relay.xml b/cfg/vehicles/ra3-03701-active/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-03701-active/starter-relay.xml +++ b/cfg/vehicles/ra3-03701-active/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/starter.xml b/cfg/vehicles/ra3-03701-active/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-03701-active/starter.xml +++ b/cfg/vehicles/ra3-03701-active/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/trac-controller.xml b/cfg/vehicles/ra3-03701-active/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-03701-active/trac-controller.xml +++ b/cfg/vehicles/ra3-03701-active/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03701-active/tumblers-config.xml b/cfg/vehicles/ra3-03701-active/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-03701-active/tumblers-config.xml +++ b/cfg/vehicles/ra3-03701-active/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/aux-converter.xml b/cfg/vehicles/ra3-03702/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-03702/aux-converter.xml +++ b/cfg/vehicles/ra3-03702/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/bat110.xml b/cfg/vehicles/ra3-03702/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03702/bat110.xml +++ b/cfg/vehicles/ra3-03702/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/bat24.xml b/cfg/vehicles/ra3-03702/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-03702/bat24.xml +++ b/cfg/vehicles/ra3-03702/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/brake-mech.xml b/cfg/vehicles/ra3-03702/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03702/brake-mech.xml +++ b/cfg/vehicles/ra3-03702/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/bto092.xml b/cfg/vehicles/ra3-03702/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03702/bto092.xml +++ b/cfg/vehicles/ra3-03702/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03702/disel.xml b/cfg/vehicles/ra3-03702/disel.xml index dde4a0b..d7696a7 100644 --- a/cfg/vehicles/ra3-03702/disel.xml +++ b/cfg/vehicles/ra3-03702/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d2 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/displays.xml b/cfg/vehicles/ra3-03702/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-03702/displays.xml +++ b/cfg/vehicles/ra3-03702/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/emergency-brake-valve.xml b/cfg/vehicles/ra3-03702/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-03702/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-03702/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/epk.xml b/cfg/vehicles/ra3-03702/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-03702/epk.xml +++ b/cfg/vehicles/ra3-03702/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/ept_valve.xml b/cfg/vehicles/ra3-03702/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03702/ept_valve.xml +++ b/cfg/vehicles/ra3-03702/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/generator.xml b/cfg/vehicles/ra3-03702/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-03702/generator.xml +++ b/cfg/vehicles/ra3-03702/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/hydro-pump.xml b/cfg/vehicles/ra3-03702/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-03702/hydro-pump.xml +++ b/cfg/vehicles/ra3-03702/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/hydro-transmission.xml b/cfg/vehicles/ra3-03702/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-03702/hydro-transmission.xml +++ b/cfg/vehicles/ra3-03702/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/keb.xml b/cfg/vehicles/ra3-03702/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03702/keb.xml +++ b/cfg/vehicles/ra3-03702/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/kru091.xml b/cfg/vehicles/ra3-03702/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-03702/kru091.xml +++ b/cfg/vehicles/ra3-03702/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-03702/mk.xml b/cfg/vehicles/ra3-03702/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03702/mk.xml +++ b/cfg/vehicles/ra3-03702/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/motor-compressor.xml b/cfg/vehicles/ra3-03702/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-03702/motor-compressor.xml +++ b/cfg/vehicles/ra3-03702/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-03702/mpsu.xml b/cfg/vehicles/ra3-03702/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-03702/mpsu.xml +++ b/cfg/vehicles/ra3-03702/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/pneumo-reducer.xml b/cfg/vehicles/ra3-03702/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03702/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03702/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03702/ra3-03702.xml b/cfg/vehicles/ra3-03702/ra3-03702.xml index 7612394..8aefb53 100644 --- a/cfg/vehicles/ra3-03702/ra3-03702.xml +++ b/cfg/vehicles/ra3-03702/ra3-03702.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03702/start-program.xml b/cfg/vehicles/ra3-03702/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-03702/start-program.xml +++ b/cfg/vehicles/ra3-03702/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/starter-relay.xml b/cfg/vehicles/ra3-03702/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-03702/starter-relay.xml +++ b/cfg/vehicles/ra3-03702/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/starter.xml b/cfg/vehicles/ra3-03702/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-03702/starter.xml +++ b/cfg/vehicles/ra3-03702/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/trac-controller.xml b/cfg/vehicles/ra3-03702/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-03702/trac-controller.xml +++ b/cfg/vehicles/ra3-03702/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03702/tumblers-config.xml b/cfg/vehicles/ra3-03702/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-03702/tumblers-config.xml +++ b/cfg/vehicles/ra3-03702/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/aux-converter.xml b/cfg/vehicles/ra3-03801/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-03801/aux-converter.xml +++ b/cfg/vehicles/ra3-03801/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/bat110.xml b/cfg/vehicles/ra3-03801/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03801/bat110.xml +++ b/cfg/vehicles/ra3-03801/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/bat24.xml b/cfg/vehicles/ra3-03801/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-03801/bat24.xml +++ b/cfg/vehicles/ra3-03801/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/brake-mech.xml b/cfg/vehicles/ra3-03801/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03801/brake-mech.xml +++ b/cfg/vehicles/ra3-03801/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/bto092.xml b/cfg/vehicles/ra3-03801/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03801/bto092.xml +++ b/cfg/vehicles/ra3-03801/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03801/disel.xml b/cfg/vehicles/ra3-03801/disel.xml index dde4a0b..d7696a7 100644 --- a/cfg/vehicles/ra3-03801/disel.xml +++ b/cfg/vehicles/ra3-03801/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d2 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/displays.xml b/cfg/vehicles/ra3-03801/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-03801/displays.xml +++ b/cfg/vehicles/ra3-03801/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/emergency-brake-valve.xml b/cfg/vehicles/ra3-03801/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-03801/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-03801/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/epk.xml b/cfg/vehicles/ra3-03801/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-03801/epk.xml +++ b/cfg/vehicles/ra3-03801/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/ept_valve.xml b/cfg/vehicles/ra3-03801/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03801/ept_valve.xml +++ b/cfg/vehicles/ra3-03801/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/generator.xml b/cfg/vehicles/ra3-03801/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-03801/generator.xml +++ b/cfg/vehicles/ra3-03801/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/hydro-pump.xml b/cfg/vehicles/ra3-03801/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-03801/hydro-pump.xml +++ b/cfg/vehicles/ra3-03801/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/hydro-transmission.xml b/cfg/vehicles/ra3-03801/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-03801/hydro-transmission.xml +++ b/cfg/vehicles/ra3-03801/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/keb.xml b/cfg/vehicles/ra3-03801/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03801/keb.xml +++ b/cfg/vehicles/ra3-03801/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/kru091.xml b/cfg/vehicles/ra3-03801/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-03801/kru091.xml +++ b/cfg/vehicles/ra3-03801/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-03801/mk.xml b/cfg/vehicles/ra3-03801/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03801/mk.xml +++ b/cfg/vehicles/ra3-03801/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/motor-compressor.xml b/cfg/vehicles/ra3-03801/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-03801/motor-compressor.xml +++ b/cfg/vehicles/ra3-03801/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-03801/mpsu.xml b/cfg/vehicles/ra3-03801/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-03801/mpsu.xml +++ b/cfg/vehicles/ra3-03801/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/pneumo-reducer.xml b/cfg/vehicles/ra3-03801/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03801/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03801/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03801/ra3-03801.xml b/cfg/vehicles/ra3-03801/ra3-03801.xml index 7a6869c..6290c47 100644 --- a/cfg/vehicles/ra3-03801/ra3-03801.xml +++ b/cfg/vehicles/ra3-03801/ra3-03801.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03801/start-program.xml b/cfg/vehicles/ra3-03801/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-03801/start-program.xml +++ b/cfg/vehicles/ra3-03801/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/starter-relay.xml b/cfg/vehicles/ra3-03801/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-03801/starter-relay.xml +++ b/cfg/vehicles/ra3-03801/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/starter.xml b/cfg/vehicles/ra3-03801/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-03801/starter.xml +++ b/cfg/vehicles/ra3-03801/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/trac-controller.xml b/cfg/vehicles/ra3-03801/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-03801/trac-controller.xml +++ b/cfg/vehicles/ra3-03801/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03801/tumblers-config.xml b/cfg/vehicles/ra3-03801/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-03801/tumblers-config.xml +++ b/cfg/vehicles/ra3-03801/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/aux-converter.xml b/cfg/vehicles/ra3-03802/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-03802/aux-converter.xml +++ b/cfg/vehicles/ra3-03802/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/bat110.xml b/cfg/vehicles/ra3-03802/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03802/bat110.xml +++ b/cfg/vehicles/ra3-03802/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/bat24.xml b/cfg/vehicles/ra3-03802/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-03802/bat24.xml +++ b/cfg/vehicles/ra3-03802/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/brake-mech.xml b/cfg/vehicles/ra3-03802/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03802/brake-mech.xml +++ b/cfg/vehicles/ra3-03802/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/bto092.xml b/cfg/vehicles/ra3-03802/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03802/bto092.xml +++ b/cfg/vehicles/ra3-03802/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03802/disel.xml b/cfg/vehicles/ra3-03802/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-03802/disel.xml +++ b/cfg/vehicles/ra3-03802/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/displays.xml b/cfg/vehicles/ra3-03802/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-03802/displays.xml +++ b/cfg/vehicles/ra3-03802/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/emergency-brake-valve.xml b/cfg/vehicles/ra3-03802/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-03802/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-03802/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/epk.xml b/cfg/vehicles/ra3-03802/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-03802/epk.xml +++ b/cfg/vehicles/ra3-03802/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/ept_valve.xml b/cfg/vehicles/ra3-03802/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03802/ept_valve.xml +++ b/cfg/vehicles/ra3-03802/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/generator.xml b/cfg/vehicles/ra3-03802/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-03802/generator.xml +++ b/cfg/vehicles/ra3-03802/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/hydro-pump.xml b/cfg/vehicles/ra3-03802/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-03802/hydro-pump.xml +++ b/cfg/vehicles/ra3-03802/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/hydro-transmission.xml b/cfg/vehicles/ra3-03802/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-03802/hydro-transmission.xml +++ b/cfg/vehicles/ra3-03802/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/keb.xml b/cfg/vehicles/ra3-03802/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03802/keb.xml +++ b/cfg/vehicles/ra3-03802/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/kru091.xml b/cfg/vehicles/ra3-03802/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-03802/kru091.xml +++ b/cfg/vehicles/ra3-03802/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-03802/mk.xml b/cfg/vehicles/ra3-03802/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03802/mk.xml +++ b/cfg/vehicles/ra3-03802/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/motor-compressor.xml b/cfg/vehicles/ra3-03802/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-03802/motor-compressor.xml +++ b/cfg/vehicles/ra3-03802/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-03802/mpsu.xml b/cfg/vehicles/ra3-03802/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-03802/mpsu.xml +++ b/cfg/vehicles/ra3-03802/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/pneumo-reducer.xml b/cfg/vehicles/ra3-03802/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03802/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03802/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03802/ra3-03802.xml b/cfg/vehicles/ra3-03802/ra3-03802.xml index 1b901c2..dd27d16 100644 --- a/cfg/vehicles/ra3-03802/ra3-03802.xml +++ b/cfg/vehicles/ra3-03802/ra3-03802.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03802/start-program.xml b/cfg/vehicles/ra3-03802/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-03802/start-program.xml +++ b/cfg/vehicles/ra3-03802/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/starter-relay.xml b/cfg/vehicles/ra3-03802/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-03802/starter-relay.xml +++ b/cfg/vehicles/ra3-03802/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/starter.xml b/cfg/vehicles/ra3-03802/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-03802/starter.xml +++ b/cfg/vehicles/ra3-03802/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/trac-controller.xml b/cfg/vehicles/ra3-03802/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-03802/trac-controller.xml +++ b/cfg/vehicles/ra3-03802/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03802/tumblers-config.xml b/cfg/vehicles/ra3-03802/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-03802/tumblers-config.xml +++ b/cfg/vehicles/ra3-03802/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/aux-converter.xml b/cfg/vehicles/ra3-03901/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-03901/aux-converter.xml +++ b/cfg/vehicles/ra3-03901/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/bat110.xml b/cfg/vehicles/ra3-03901/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03901/bat110.xml +++ b/cfg/vehicles/ra3-03901/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/bat24.xml b/cfg/vehicles/ra3-03901/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-03901/bat24.xml +++ b/cfg/vehicles/ra3-03901/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/brake-mech.xml b/cfg/vehicles/ra3-03901/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03901/brake-mech.xml +++ b/cfg/vehicles/ra3-03901/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/bto092.xml b/cfg/vehicles/ra3-03901/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03901/bto092.xml +++ b/cfg/vehicles/ra3-03901/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03901/disel.xml b/cfg/vehicles/ra3-03901/disel.xml index dde4a0b..d7696a7 100644 --- a/cfg/vehicles/ra3-03901/disel.xml +++ b/cfg/vehicles/ra3-03901/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d2 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/displays.xml b/cfg/vehicles/ra3-03901/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-03901/displays.xml +++ b/cfg/vehicles/ra3-03901/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/emergency-brake-valve.xml b/cfg/vehicles/ra3-03901/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-03901/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-03901/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/epk.xml b/cfg/vehicles/ra3-03901/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-03901/epk.xml +++ b/cfg/vehicles/ra3-03901/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/ept_valve.xml b/cfg/vehicles/ra3-03901/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03901/ept_valve.xml +++ b/cfg/vehicles/ra3-03901/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/generator.xml b/cfg/vehicles/ra3-03901/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-03901/generator.xml +++ b/cfg/vehicles/ra3-03901/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/hydro-pump.xml b/cfg/vehicles/ra3-03901/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-03901/hydro-pump.xml +++ b/cfg/vehicles/ra3-03901/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/hydro-transmission.xml b/cfg/vehicles/ra3-03901/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-03901/hydro-transmission.xml +++ b/cfg/vehicles/ra3-03901/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/keb.xml b/cfg/vehicles/ra3-03901/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03901/keb.xml +++ b/cfg/vehicles/ra3-03901/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/kru091.xml b/cfg/vehicles/ra3-03901/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-03901/kru091.xml +++ b/cfg/vehicles/ra3-03901/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-03901/mk.xml b/cfg/vehicles/ra3-03901/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03901/mk.xml +++ b/cfg/vehicles/ra3-03901/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/motor-compressor.xml b/cfg/vehicles/ra3-03901/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-03901/motor-compressor.xml +++ b/cfg/vehicles/ra3-03901/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-03901/mpsu.xml b/cfg/vehicles/ra3-03901/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-03901/mpsu.xml +++ b/cfg/vehicles/ra3-03901/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/pneumo-reducer.xml b/cfg/vehicles/ra3-03901/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03901/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03901/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03901/ra3-03901.xml b/cfg/vehicles/ra3-03901/ra3-03901.xml index 9e6cd09..07a5176 100644 --- a/cfg/vehicles/ra3-03901/ra3-03901.xml +++ b/cfg/vehicles/ra3-03901/ra3-03901.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03901/start-program.xml b/cfg/vehicles/ra3-03901/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-03901/start-program.xml +++ b/cfg/vehicles/ra3-03901/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/starter-relay.xml b/cfg/vehicles/ra3-03901/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-03901/starter-relay.xml +++ b/cfg/vehicles/ra3-03901/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/starter.xml b/cfg/vehicles/ra3-03901/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-03901/starter.xml +++ b/cfg/vehicles/ra3-03901/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/trac-controller.xml b/cfg/vehicles/ra3-03901/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-03901/trac-controller.xml +++ b/cfg/vehicles/ra3-03901/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03901/tumblers-config.xml b/cfg/vehicles/ra3-03901/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-03901/tumblers-config.xml +++ b/cfg/vehicles/ra3-03901/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/aux-converter.xml b/cfg/vehicles/ra3-03902/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-03902/aux-converter.xml +++ b/cfg/vehicles/ra3-03902/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/bat110.xml b/cfg/vehicles/ra3-03902/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-03902/bat110.xml +++ b/cfg/vehicles/ra3-03902/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/bat24.xml b/cfg/vehicles/ra3-03902/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-03902/bat24.xml +++ b/cfg/vehicles/ra3-03902/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/brake-mech.xml b/cfg/vehicles/ra3-03902/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-03902/brake-mech.xml +++ b/cfg/vehicles/ra3-03902/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/bto092.xml b/cfg/vehicles/ra3-03902/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-03902/bto092.xml +++ b/cfg/vehicles/ra3-03902/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-03902/disel.xml b/cfg/vehicles/ra3-03902/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-03902/disel.xml +++ b/cfg/vehicles/ra3-03902/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/displays.xml b/cfg/vehicles/ra3-03902/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-03902/displays.xml +++ b/cfg/vehicles/ra3-03902/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/emergency-brake-valve.xml b/cfg/vehicles/ra3-03902/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-03902/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-03902/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/epk.xml b/cfg/vehicles/ra3-03902/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-03902/epk.xml +++ b/cfg/vehicles/ra3-03902/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/ept_valve.xml b/cfg/vehicles/ra3-03902/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-03902/ept_valve.xml +++ b/cfg/vehicles/ra3-03902/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/generator.xml b/cfg/vehicles/ra3-03902/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-03902/generator.xml +++ b/cfg/vehicles/ra3-03902/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/hydro-pump.xml b/cfg/vehicles/ra3-03902/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-03902/hydro-pump.xml +++ b/cfg/vehicles/ra3-03902/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/hydro-transmission.xml b/cfg/vehicles/ra3-03902/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-03902/hydro-transmission.xml +++ b/cfg/vehicles/ra3-03902/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/keb.xml b/cfg/vehicles/ra3-03902/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-03902/keb.xml +++ b/cfg/vehicles/ra3-03902/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/kru091.xml b/cfg/vehicles/ra3-03902/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-03902/kru091.xml +++ b/cfg/vehicles/ra3-03902/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-03902/mk.xml b/cfg/vehicles/ra3-03902/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-03902/mk.xml +++ b/cfg/vehicles/ra3-03902/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/motor-compressor.xml b/cfg/vehicles/ra3-03902/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-03902/motor-compressor.xml +++ b/cfg/vehicles/ra3-03902/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-03902/mpsu.xml b/cfg/vehicles/ra3-03902/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-03902/mpsu.xml +++ b/cfg/vehicles/ra3-03902/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/pneumo-reducer.xml b/cfg/vehicles/ra3-03902/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-03902/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-03902/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-03902/ra3-03902.xml b/cfg/vehicles/ra3-03902/ra3-03902.xml index 8b150c6..442ec41 100644 --- a/cfg/vehicles/ra3-03902/ra3-03902.xml +++ b/cfg/vehicles/ra3-03902/ra3-03902.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-03902/start-program.xml b/cfg/vehicles/ra3-03902/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-03902/start-program.xml +++ b/cfg/vehicles/ra3-03902/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/starter-relay.xml b/cfg/vehicles/ra3-03902/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-03902/starter-relay.xml +++ b/cfg/vehicles/ra3-03902/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/starter.xml b/cfg/vehicles/ra3-03902/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-03902/starter.xml +++ b/cfg/vehicles/ra3-03902/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/trac-controller.xml b/cfg/vehicles/ra3-03902/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-03902/trac-controller.xml +++ b/cfg/vehicles/ra3-03902/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-03902/tumblers-config.xml b/cfg/vehicles/ra3-03902/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-03902/tumblers-config.xml +++ b/cfg/vehicles/ra3-03902/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/aux-converter.xml b/cfg/vehicles/ra3-04001-active/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-04001-active/aux-converter.xml +++ b/cfg/vehicles/ra3-04001-active/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/bat110.xml b/cfg/vehicles/ra3-04001-active/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-04001-active/bat110.xml +++ b/cfg/vehicles/ra3-04001-active/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/bat24.xml b/cfg/vehicles/ra3-04001-active/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-04001-active/bat24.xml +++ b/cfg/vehicles/ra3-04001-active/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/brake-mech.xml b/cfg/vehicles/ra3-04001-active/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-04001-active/brake-mech.xml +++ b/cfg/vehicles/ra3-04001-active/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/bto092.xml b/cfg/vehicles/ra3-04001-active/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-04001-active/bto092.xml +++ b/cfg/vehicles/ra3-04001-active/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-04001-active/disel.xml b/cfg/vehicles/ra3-04001-active/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-04001-active/disel.xml +++ b/cfg/vehicles/ra3-04001-active/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/displays.xml b/cfg/vehicles/ra3-04001-active/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-04001-active/displays.xml +++ b/cfg/vehicles/ra3-04001-active/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/emergency-brake-valve.xml b/cfg/vehicles/ra3-04001-active/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-04001-active/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-04001-active/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/epk.xml b/cfg/vehicles/ra3-04001-active/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-04001-active/epk.xml +++ b/cfg/vehicles/ra3-04001-active/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/ept_valve.xml b/cfg/vehicles/ra3-04001-active/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-04001-active/ept_valve.xml +++ b/cfg/vehicles/ra3-04001-active/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/generator.xml b/cfg/vehicles/ra3-04001-active/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-04001-active/generator.xml +++ b/cfg/vehicles/ra3-04001-active/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/hydro-pump.xml b/cfg/vehicles/ra3-04001-active/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-04001-active/hydro-pump.xml +++ b/cfg/vehicles/ra3-04001-active/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/hydro-transmission.xml b/cfg/vehicles/ra3-04001-active/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-04001-active/hydro-transmission.xml +++ b/cfg/vehicles/ra3-04001-active/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/keb.xml b/cfg/vehicles/ra3-04001-active/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-04001-active/keb.xml +++ b/cfg/vehicles/ra3-04001-active/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/kru091.xml b/cfg/vehicles/ra3-04001-active/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-04001-active/kru091.xml +++ b/cfg/vehicles/ra3-04001-active/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-04001-active/mk.xml b/cfg/vehicles/ra3-04001-active/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-04001-active/mk.xml +++ b/cfg/vehicles/ra3-04001-active/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/motor-compressor.xml b/cfg/vehicles/ra3-04001-active/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-04001-active/motor-compressor.xml +++ b/cfg/vehicles/ra3-04001-active/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-04001-active/mpsu.xml b/cfg/vehicles/ra3-04001-active/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-04001-active/mpsu.xml +++ b/cfg/vehicles/ra3-04001-active/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/pneumo-reducer.xml b/cfg/vehicles/ra3-04001-active/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-04001-active/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-04001-active/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-04001-active/ra3-04001-active.xml b/cfg/vehicles/ra3-04001-active/ra3-04001-active.xml index 27b54cf..2211f96 100644 --- a/cfg/vehicles/ra3-04001-active/ra3-04001-active.xml +++ b/cfg/vehicles/ra3-04001-active/ra3-04001-active.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-04001-active/start-program.xml b/cfg/vehicles/ra3-04001-active/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-04001-active/start-program.xml +++ b/cfg/vehicles/ra3-04001-active/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/starter-relay.xml b/cfg/vehicles/ra3-04001-active/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-04001-active/starter-relay.xml +++ b/cfg/vehicles/ra3-04001-active/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/starter.xml b/cfg/vehicles/ra3-04001-active/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-04001-active/starter.xml +++ b/cfg/vehicles/ra3-04001-active/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/trac-controller.xml b/cfg/vehicles/ra3-04001-active/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-04001-active/trac-controller.xml +++ b/cfg/vehicles/ra3-04001-active/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04001-active/tumblers-config.xml b/cfg/vehicles/ra3-04001-active/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-04001-active/tumblers-config.xml +++ b/cfg/vehicles/ra3-04001-active/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/aux-converter.xml b/cfg/vehicles/ra3-04002/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-04002/aux-converter.xml +++ b/cfg/vehicles/ra3-04002/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/bat110.xml b/cfg/vehicles/ra3-04002/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-04002/bat110.xml +++ b/cfg/vehicles/ra3-04002/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/bat24.xml b/cfg/vehicles/ra3-04002/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-04002/bat24.xml +++ b/cfg/vehicles/ra3-04002/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/brake-mech.xml b/cfg/vehicles/ra3-04002/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-04002/brake-mech.xml +++ b/cfg/vehicles/ra3-04002/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/bto092.xml b/cfg/vehicles/ra3-04002/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-04002/bto092.xml +++ b/cfg/vehicles/ra3-04002/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-04002/disel.xml b/cfg/vehicles/ra3-04002/disel.xml index dde4a0b..d7696a7 100644 --- a/cfg/vehicles/ra3-04002/disel.xml +++ b/cfg/vehicles/ra3-04002/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d2 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/displays.xml b/cfg/vehicles/ra3-04002/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-04002/displays.xml +++ b/cfg/vehicles/ra3-04002/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/emergency-brake-valve.xml b/cfg/vehicles/ra3-04002/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-04002/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-04002/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/epk.xml b/cfg/vehicles/ra3-04002/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-04002/epk.xml +++ b/cfg/vehicles/ra3-04002/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/ept_valve.xml b/cfg/vehicles/ra3-04002/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-04002/ept_valve.xml +++ b/cfg/vehicles/ra3-04002/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/generator.xml b/cfg/vehicles/ra3-04002/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-04002/generator.xml +++ b/cfg/vehicles/ra3-04002/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/hydro-pump.xml b/cfg/vehicles/ra3-04002/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-04002/hydro-pump.xml +++ b/cfg/vehicles/ra3-04002/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/hydro-transmission.xml b/cfg/vehicles/ra3-04002/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-04002/hydro-transmission.xml +++ b/cfg/vehicles/ra3-04002/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/keb.xml b/cfg/vehicles/ra3-04002/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-04002/keb.xml +++ b/cfg/vehicles/ra3-04002/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/kru091.xml b/cfg/vehicles/ra3-04002/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-04002/kru091.xml +++ b/cfg/vehicles/ra3-04002/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-04002/mk.xml b/cfg/vehicles/ra3-04002/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-04002/mk.xml +++ b/cfg/vehicles/ra3-04002/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/motor-compressor.xml b/cfg/vehicles/ra3-04002/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-04002/motor-compressor.xml +++ b/cfg/vehicles/ra3-04002/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-04002/mpsu.xml b/cfg/vehicles/ra3-04002/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-04002/mpsu.xml +++ b/cfg/vehicles/ra3-04002/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/pneumo-reducer.xml b/cfg/vehicles/ra3-04002/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-04002/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-04002/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-04002/ra3-04002.xml b/cfg/vehicles/ra3-04002/ra3-04002.xml index 5ccdfcc..02ac17f 100644 --- a/cfg/vehicles/ra3-04002/ra3-04002.xml +++ b/cfg/vehicles/ra3-04002/ra3-04002.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-04002/start-program.xml b/cfg/vehicles/ra3-04002/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-04002/start-program.xml +++ b/cfg/vehicles/ra3-04002/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/starter-relay.xml b/cfg/vehicles/ra3-04002/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-04002/starter-relay.xml +++ b/cfg/vehicles/ra3-04002/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/starter.xml b/cfg/vehicles/ra3-04002/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-04002/starter.xml +++ b/cfg/vehicles/ra3-04002/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/trac-controller.xml b/cfg/vehicles/ra3-04002/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-04002/trac-controller.xml +++ b/cfg/vehicles/ra3-04002/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04002/tumblers-config.xml b/cfg/vehicles/ra3-04002/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-04002/tumblers-config.xml +++ b/cfg/vehicles/ra3-04002/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/aux-converter.xml b/cfg/vehicles/ra3-04101/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-04101/aux-converter.xml +++ b/cfg/vehicles/ra3-04101/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/bat110.xml b/cfg/vehicles/ra3-04101/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-04101/bat110.xml +++ b/cfg/vehicles/ra3-04101/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/bat24.xml b/cfg/vehicles/ra3-04101/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-04101/bat24.xml +++ b/cfg/vehicles/ra3-04101/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/brake-mech.xml b/cfg/vehicles/ra3-04101/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-04101/brake-mech.xml +++ b/cfg/vehicles/ra3-04101/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/bto092.xml b/cfg/vehicles/ra3-04101/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-04101/bto092.xml +++ b/cfg/vehicles/ra3-04101/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-04101/disel.xml b/cfg/vehicles/ra3-04101/disel.xml index dde4a0b..d7696a7 100644 --- a/cfg/vehicles/ra3-04101/disel.xml +++ b/cfg/vehicles/ra3-04101/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d2 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/displays.xml b/cfg/vehicles/ra3-04101/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-04101/displays.xml +++ b/cfg/vehicles/ra3-04101/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/emergency-brake-valve.xml b/cfg/vehicles/ra3-04101/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-04101/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-04101/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/epk.xml b/cfg/vehicles/ra3-04101/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-04101/epk.xml +++ b/cfg/vehicles/ra3-04101/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/ept_valve.xml b/cfg/vehicles/ra3-04101/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-04101/ept_valve.xml +++ b/cfg/vehicles/ra3-04101/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/generator.xml b/cfg/vehicles/ra3-04101/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-04101/generator.xml +++ b/cfg/vehicles/ra3-04101/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/hydro-pump.xml b/cfg/vehicles/ra3-04101/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-04101/hydro-pump.xml +++ b/cfg/vehicles/ra3-04101/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/hydro-transmission.xml b/cfg/vehicles/ra3-04101/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-04101/hydro-transmission.xml +++ b/cfg/vehicles/ra3-04101/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/keb.xml b/cfg/vehicles/ra3-04101/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-04101/keb.xml +++ b/cfg/vehicles/ra3-04101/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/kru091.xml b/cfg/vehicles/ra3-04101/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-04101/kru091.xml +++ b/cfg/vehicles/ra3-04101/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-04101/mk.xml b/cfg/vehicles/ra3-04101/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-04101/mk.xml +++ b/cfg/vehicles/ra3-04101/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/motor-compressor.xml b/cfg/vehicles/ra3-04101/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-04101/motor-compressor.xml +++ b/cfg/vehicles/ra3-04101/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-04101/mpsu.xml b/cfg/vehicles/ra3-04101/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-04101/mpsu.xml +++ b/cfg/vehicles/ra3-04101/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/pneumo-reducer.xml b/cfg/vehicles/ra3-04101/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-04101/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-04101/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-04101/ra3-04101.xml b/cfg/vehicles/ra3-04101/ra3-04101.xml index 227e910..8e184e3 100644 --- a/cfg/vehicles/ra3-04101/ra3-04101.xml +++ b/cfg/vehicles/ra3-04101/ra3-04101.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-04101/start-program.xml b/cfg/vehicles/ra3-04101/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-04101/start-program.xml +++ b/cfg/vehicles/ra3-04101/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/starter-relay.xml b/cfg/vehicles/ra3-04101/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-04101/starter-relay.xml +++ b/cfg/vehicles/ra3-04101/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/starter.xml b/cfg/vehicles/ra3-04101/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-04101/starter.xml +++ b/cfg/vehicles/ra3-04101/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/trac-controller.xml b/cfg/vehicles/ra3-04101/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-04101/trac-controller.xml +++ b/cfg/vehicles/ra3-04101/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04101/tumblers-config.xml b/cfg/vehicles/ra3-04101/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-04101/tumblers-config.xml +++ b/cfg/vehicles/ra3-04101/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/aux-converter.xml b/cfg/vehicles/ra3-04102-active/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-04102-active/aux-converter.xml +++ b/cfg/vehicles/ra3-04102-active/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/bat110.xml b/cfg/vehicles/ra3-04102-active/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-04102-active/bat110.xml +++ b/cfg/vehicles/ra3-04102-active/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/bat24.xml b/cfg/vehicles/ra3-04102-active/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-04102-active/bat24.xml +++ b/cfg/vehicles/ra3-04102-active/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/brake-mech.xml b/cfg/vehicles/ra3-04102-active/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-04102-active/brake-mech.xml +++ b/cfg/vehicles/ra3-04102-active/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/bto092.xml b/cfg/vehicles/ra3-04102-active/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-04102-active/bto092.xml +++ b/cfg/vehicles/ra3-04102-active/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-04102-active/disel.xml b/cfg/vehicles/ra3-04102-active/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-04102-active/disel.xml +++ b/cfg/vehicles/ra3-04102-active/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/displays.xml b/cfg/vehicles/ra3-04102-active/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-04102-active/displays.xml +++ b/cfg/vehicles/ra3-04102-active/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/emergency-brake-valve.xml b/cfg/vehicles/ra3-04102-active/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-04102-active/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-04102-active/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/epk.xml b/cfg/vehicles/ra3-04102-active/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-04102-active/epk.xml +++ b/cfg/vehicles/ra3-04102-active/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/ept_valve.xml b/cfg/vehicles/ra3-04102-active/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-04102-active/ept_valve.xml +++ b/cfg/vehicles/ra3-04102-active/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/generator.xml b/cfg/vehicles/ra3-04102-active/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-04102-active/generator.xml +++ b/cfg/vehicles/ra3-04102-active/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/hydro-pump.xml b/cfg/vehicles/ra3-04102-active/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-04102-active/hydro-pump.xml +++ b/cfg/vehicles/ra3-04102-active/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/hydro-transmission.xml b/cfg/vehicles/ra3-04102-active/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-04102-active/hydro-transmission.xml +++ b/cfg/vehicles/ra3-04102-active/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/keb.xml b/cfg/vehicles/ra3-04102-active/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-04102-active/keb.xml +++ b/cfg/vehicles/ra3-04102-active/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/kru091.xml b/cfg/vehicles/ra3-04102-active/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-04102-active/kru091.xml +++ b/cfg/vehicles/ra3-04102-active/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-04102-active/mk.xml b/cfg/vehicles/ra3-04102-active/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-04102-active/mk.xml +++ b/cfg/vehicles/ra3-04102-active/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/motor-compressor.xml b/cfg/vehicles/ra3-04102-active/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-04102-active/motor-compressor.xml +++ b/cfg/vehicles/ra3-04102-active/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-04102-active/mpsu.xml b/cfg/vehicles/ra3-04102-active/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-04102-active/mpsu.xml +++ b/cfg/vehicles/ra3-04102-active/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/pneumo-reducer.xml b/cfg/vehicles/ra3-04102-active/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-04102-active/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-04102-active/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-04102-active/ra3-04102-active.xml b/cfg/vehicles/ra3-04102-active/ra3-04102-active.xml index 7bd7922..6fad639 100644 --- a/cfg/vehicles/ra3-04102-active/ra3-04102-active.xml +++ b/cfg/vehicles/ra3-04102-active/ra3-04102-active.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-04102-active/start-program.xml b/cfg/vehicles/ra3-04102-active/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-04102-active/start-program.xml +++ b/cfg/vehicles/ra3-04102-active/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/starter-relay.xml b/cfg/vehicles/ra3-04102-active/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-04102-active/starter-relay.xml +++ b/cfg/vehicles/ra3-04102-active/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/starter.xml b/cfg/vehicles/ra3-04102-active/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-04102-active/starter.xml +++ b/cfg/vehicles/ra3-04102-active/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/trac-controller.xml b/cfg/vehicles/ra3-04102-active/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-04102-active/trac-controller.xml +++ b/cfg/vehicles/ra3-04102-active/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04102-active/tumblers-config.xml b/cfg/vehicles/ra3-04102-active/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-04102-active/tumblers-config.xml +++ b/cfg/vehicles/ra3-04102-active/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/aux-converter.xml b/cfg/vehicles/ra3-04201-active/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-04201-active/aux-converter.xml +++ b/cfg/vehicles/ra3-04201-active/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/bat110.xml b/cfg/vehicles/ra3-04201-active/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-04201-active/bat110.xml +++ b/cfg/vehicles/ra3-04201-active/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/bat24.xml b/cfg/vehicles/ra3-04201-active/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-04201-active/bat24.xml +++ b/cfg/vehicles/ra3-04201-active/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/brake-mech.xml b/cfg/vehicles/ra3-04201-active/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-04201-active/brake-mech.xml +++ b/cfg/vehicles/ra3-04201-active/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/bto092.xml b/cfg/vehicles/ra3-04201-active/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-04201-active/bto092.xml +++ b/cfg/vehicles/ra3-04201-active/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-04201-active/disel.xml b/cfg/vehicles/ra3-04201-active/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-04201-active/disel.xml +++ b/cfg/vehicles/ra3-04201-active/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/displays.xml b/cfg/vehicles/ra3-04201-active/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-04201-active/displays.xml +++ b/cfg/vehicles/ra3-04201-active/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/emergency-brake-valve.xml b/cfg/vehicles/ra3-04201-active/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-04201-active/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-04201-active/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/epk.xml b/cfg/vehicles/ra3-04201-active/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-04201-active/epk.xml +++ b/cfg/vehicles/ra3-04201-active/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/ept_valve.xml b/cfg/vehicles/ra3-04201-active/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-04201-active/ept_valve.xml +++ b/cfg/vehicles/ra3-04201-active/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/generator.xml b/cfg/vehicles/ra3-04201-active/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-04201-active/generator.xml +++ b/cfg/vehicles/ra3-04201-active/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/hydro-pump.xml b/cfg/vehicles/ra3-04201-active/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-04201-active/hydro-pump.xml +++ b/cfg/vehicles/ra3-04201-active/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/hydro-transmission.xml b/cfg/vehicles/ra3-04201-active/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-04201-active/hydro-transmission.xml +++ b/cfg/vehicles/ra3-04201-active/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/keb.xml b/cfg/vehicles/ra3-04201-active/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-04201-active/keb.xml +++ b/cfg/vehicles/ra3-04201-active/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/kru091.xml b/cfg/vehicles/ra3-04201-active/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-04201-active/kru091.xml +++ b/cfg/vehicles/ra3-04201-active/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-04201-active/mk.xml b/cfg/vehicles/ra3-04201-active/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-04201-active/mk.xml +++ b/cfg/vehicles/ra3-04201-active/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/motor-compressor.xml b/cfg/vehicles/ra3-04201-active/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-04201-active/motor-compressor.xml +++ b/cfg/vehicles/ra3-04201-active/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-04201-active/mpsu.xml b/cfg/vehicles/ra3-04201-active/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-04201-active/mpsu.xml +++ b/cfg/vehicles/ra3-04201-active/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/pneumo-reducer.xml b/cfg/vehicles/ra3-04201-active/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-04201-active/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-04201-active/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-04201-active/ra3-04201-active.xml b/cfg/vehicles/ra3-04201-active/ra3-04201-active.xml index a222b87..3072547 100644 --- a/cfg/vehicles/ra3-04201-active/ra3-04201-active.xml +++ b/cfg/vehicles/ra3-04201-active/ra3-04201-active.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-04201-active/start-program.xml b/cfg/vehicles/ra3-04201-active/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-04201-active/start-program.xml +++ b/cfg/vehicles/ra3-04201-active/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/starter-relay.xml b/cfg/vehicles/ra3-04201-active/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-04201-active/starter-relay.xml +++ b/cfg/vehicles/ra3-04201-active/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/starter.xml b/cfg/vehicles/ra3-04201-active/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-04201-active/starter.xml +++ b/cfg/vehicles/ra3-04201-active/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/trac-controller.xml b/cfg/vehicles/ra3-04201-active/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-04201-active/trac-controller.xml +++ b/cfg/vehicles/ra3-04201-active/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04201-active/tumblers-config.xml b/cfg/vehicles/ra3-04201-active/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-04201-active/tumblers-config.xml +++ b/cfg/vehicles/ra3-04201-active/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/aux-converter.xml b/cfg/vehicles/ra3-04202/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-04202/aux-converter.xml +++ b/cfg/vehicles/ra3-04202/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/bat110.xml b/cfg/vehicles/ra3-04202/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-04202/bat110.xml +++ b/cfg/vehicles/ra3-04202/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/bat24.xml b/cfg/vehicles/ra3-04202/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-04202/bat24.xml +++ b/cfg/vehicles/ra3-04202/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/brake-mech.xml b/cfg/vehicles/ra3-04202/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-04202/brake-mech.xml +++ b/cfg/vehicles/ra3-04202/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/bto092.xml b/cfg/vehicles/ra3-04202/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-04202/bto092.xml +++ b/cfg/vehicles/ra3-04202/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-04202/disel.xml b/cfg/vehicles/ra3-04202/disel.xml index dde4a0b..d7696a7 100644 --- a/cfg/vehicles/ra3-04202/disel.xml +++ b/cfg/vehicles/ra3-04202/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d2 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/displays.xml b/cfg/vehicles/ra3-04202/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-04202/displays.xml +++ b/cfg/vehicles/ra3-04202/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/emergency-brake-valve.xml b/cfg/vehicles/ra3-04202/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-04202/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-04202/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/epk.xml b/cfg/vehicles/ra3-04202/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-04202/epk.xml +++ b/cfg/vehicles/ra3-04202/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/ept_valve.xml b/cfg/vehicles/ra3-04202/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-04202/ept_valve.xml +++ b/cfg/vehicles/ra3-04202/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/generator.xml b/cfg/vehicles/ra3-04202/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-04202/generator.xml +++ b/cfg/vehicles/ra3-04202/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/hydro-pump.xml b/cfg/vehicles/ra3-04202/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-04202/hydro-pump.xml +++ b/cfg/vehicles/ra3-04202/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/hydro-transmission.xml b/cfg/vehicles/ra3-04202/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-04202/hydro-transmission.xml +++ b/cfg/vehicles/ra3-04202/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/keb.xml b/cfg/vehicles/ra3-04202/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-04202/keb.xml +++ b/cfg/vehicles/ra3-04202/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/kru091.xml b/cfg/vehicles/ra3-04202/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-04202/kru091.xml +++ b/cfg/vehicles/ra3-04202/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-04202/mk.xml b/cfg/vehicles/ra3-04202/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-04202/mk.xml +++ b/cfg/vehicles/ra3-04202/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/motor-compressor.xml b/cfg/vehicles/ra3-04202/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-04202/motor-compressor.xml +++ b/cfg/vehicles/ra3-04202/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-04202/mpsu.xml b/cfg/vehicles/ra3-04202/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-04202/mpsu.xml +++ b/cfg/vehicles/ra3-04202/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/pneumo-reducer.xml b/cfg/vehicles/ra3-04202/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-04202/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-04202/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-04202/ra3-04202.xml b/cfg/vehicles/ra3-04202/ra3-04202.xml index 286c12e..4b868f0 100644 --- a/cfg/vehicles/ra3-04202/ra3-04202.xml +++ b/cfg/vehicles/ra3-04202/ra3-04202.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-04202/start-program.xml b/cfg/vehicles/ra3-04202/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-04202/start-program.xml +++ b/cfg/vehicles/ra3-04202/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/starter-relay.xml b/cfg/vehicles/ra3-04202/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-04202/starter-relay.xml +++ b/cfg/vehicles/ra3-04202/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/starter.xml b/cfg/vehicles/ra3-04202/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-04202/starter.xml +++ b/cfg/vehicles/ra3-04202/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/trac-controller.xml b/cfg/vehicles/ra3-04202/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-04202/trac-controller.xml +++ b/cfg/vehicles/ra3-04202/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04202/tumblers-config.xml b/cfg/vehicles/ra3-04202/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-04202/tumblers-config.xml +++ b/cfg/vehicles/ra3-04202/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/aux-converter.xml b/cfg/vehicles/ra3-04301/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-04301/aux-converter.xml +++ b/cfg/vehicles/ra3-04301/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/bat110.xml b/cfg/vehicles/ra3-04301/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-04301/bat110.xml +++ b/cfg/vehicles/ra3-04301/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/bat24.xml b/cfg/vehicles/ra3-04301/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-04301/bat24.xml +++ b/cfg/vehicles/ra3-04301/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/brake-mech.xml b/cfg/vehicles/ra3-04301/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-04301/brake-mech.xml +++ b/cfg/vehicles/ra3-04301/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/bto092.xml b/cfg/vehicles/ra3-04301/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-04301/bto092.xml +++ b/cfg/vehicles/ra3-04301/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-04301/disel.xml b/cfg/vehicles/ra3-04301/disel.xml index dde4a0b..d7696a7 100644 --- a/cfg/vehicles/ra3-04301/disel.xml +++ b/cfg/vehicles/ra3-04301/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d2 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/displays.xml b/cfg/vehicles/ra3-04301/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-04301/displays.xml +++ b/cfg/vehicles/ra3-04301/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/emergency-brake-valve.xml b/cfg/vehicles/ra3-04301/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-04301/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-04301/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/epk.xml b/cfg/vehicles/ra3-04301/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-04301/epk.xml +++ b/cfg/vehicles/ra3-04301/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/ept_valve.xml b/cfg/vehicles/ra3-04301/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-04301/ept_valve.xml +++ b/cfg/vehicles/ra3-04301/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/generator.xml b/cfg/vehicles/ra3-04301/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-04301/generator.xml +++ b/cfg/vehicles/ra3-04301/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/hydro-pump.xml b/cfg/vehicles/ra3-04301/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-04301/hydro-pump.xml +++ b/cfg/vehicles/ra3-04301/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/hydro-transmission.xml b/cfg/vehicles/ra3-04301/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-04301/hydro-transmission.xml +++ b/cfg/vehicles/ra3-04301/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/keb.xml b/cfg/vehicles/ra3-04301/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-04301/keb.xml +++ b/cfg/vehicles/ra3-04301/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/kru091.xml b/cfg/vehicles/ra3-04301/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-04301/kru091.xml +++ b/cfg/vehicles/ra3-04301/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-04301/mk.xml b/cfg/vehicles/ra3-04301/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-04301/mk.xml +++ b/cfg/vehicles/ra3-04301/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/motor-compressor.xml b/cfg/vehicles/ra3-04301/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-04301/motor-compressor.xml +++ b/cfg/vehicles/ra3-04301/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-04301/mpsu.xml b/cfg/vehicles/ra3-04301/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-04301/mpsu.xml +++ b/cfg/vehicles/ra3-04301/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/pneumo-reducer.xml b/cfg/vehicles/ra3-04301/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-04301/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-04301/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-04301/ra3-04301.xml b/cfg/vehicles/ra3-04301/ra3-04301.xml index 475d611..d202b81 100644 --- a/cfg/vehicles/ra3-04301/ra3-04301.xml +++ b/cfg/vehicles/ra3-04301/ra3-04301.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-04301/start-program.xml b/cfg/vehicles/ra3-04301/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-04301/start-program.xml +++ b/cfg/vehicles/ra3-04301/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/starter-relay.xml b/cfg/vehicles/ra3-04301/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-04301/starter-relay.xml +++ b/cfg/vehicles/ra3-04301/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/starter.xml b/cfg/vehicles/ra3-04301/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-04301/starter.xml +++ b/cfg/vehicles/ra3-04301/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/trac-controller.xml b/cfg/vehicles/ra3-04301/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-04301/trac-controller.xml +++ b/cfg/vehicles/ra3-04301/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04301/tumblers-config.xml b/cfg/vehicles/ra3-04301/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-04301/tumblers-config.xml +++ b/cfg/vehicles/ra3-04301/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/aux-converter.xml b/cfg/vehicles/ra3-04302/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-04302/aux-converter.xml +++ b/cfg/vehicles/ra3-04302/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/bat110.xml b/cfg/vehicles/ra3-04302/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-04302/bat110.xml +++ b/cfg/vehicles/ra3-04302/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/bat24.xml b/cfg/vehicles/ra3-04302/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-04302/bat24.xml +++ b/cfg/vehicles/ra3-04302/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/brake-mech.xml b/cfg/vehicles/ra3-04302/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-04302/brake-mech.xml +++ b/cfg/vehicles/ra3-04302/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/bto092.xml b/cfg/vehicles/ra3-04302/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-04302/bto092.xml +++ b/cfg/vehicles/ra3-04302/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-04302/disel.xml b/cfg/vehicles/ra3-04302/disel.xml index dde4a0b..d7696a7 100644 --- a/cfg/vehicles/ra3-04302/disel.xml +++ b/cfg/vehicles/ra3-04302/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d2 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/displays.xml b/cfg/vehicles/ra3-04302/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-04302/displays.xml +++ b/cfg/vehicles/ra3-04302/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/emergency-brake-valve.xml b/cfg/vehicles/ra3-04302/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-04302/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-04302/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/epk.xml b/cfg/vehicles/ra3-04302/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-04302/epk.xml +++ b/cfg/vehicles/ra3-04302/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/ept_valve.xml b/cfg/vehicles/ra3-04302/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-04302/ept_valve.xml +++ b/cfg/vehicles/ra3-04302/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/generator.xml b/cfg/vehicles/ra3-04302/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-04302/generator.xml +++ b/cfg/vehicles/ra3-04302/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/hydro-pump.xml b/cfg/vehicles/ra3-04302/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-04302/hydro-pump.xml +++ b/cfg/vehicles/ra3-04302/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/hydro-transmission.xml b/cfg/vehicles/ra3-04302/hydro-transmission.xml index e5e0317..69524ea 100644 --- a/cfg/vehicles/ra3-04302/hydro-transmission.xml +++ b/cfg/vehicles/ra3-04302/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/keb.xml b/cfg/vehicles/ra3-04302/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-04302/keb.xml +++ b/cfg/vehicles/ra3-04302/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/kru091.xml b/cfg/vehicles/ra3-04302/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-04302/kru091.xml +++ b/cfg/vehicles/ra3-04302/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-04302/mk.xml b/cfg/vehicles/ra3-04302/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-04302/mk.xml +++ b/cfg/vehicles/ra3-04302/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/motor-compressor.xml b/cfg/vehicles/ra3-04302/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-04302/motor-compressor.xml +++ b/cfg/vehicles/ra3-04302/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-04302/mpsu.xml b/cfg/vehicles/ra3-04302/mpsu.xml index 34f8807..3e114a5 100644 --- a/cfg/vehicles/ra3-04302/mpsu.xml +++ b/cfg/vehicles/ra3-04302/mpsu.xml @@ -1,18 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - + 24.24 + 24.7 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/pneumo-reducer.xml b/cfg/vehicles/ra3-04302/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-04302/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-04302/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-04302/ra3-04302.xml b/cfg/vehicles/ra3-04302/ra3-04302.xml index 56abdd3..b3b0aa0 100644 --- a/cfg/vehicles/ra3-04302/ra3-04302.xml +++ b/cfg/vehicles/ra3-04302/ra3-04302.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-04302/start-program.xml b/cfg/vehicles/ra3-04302/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-04302/start-program.xml +++ b/cfg/vehicles/ra3-04302/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/starter-relay.xml b/cfg/vehicles/ra3-04302/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-04302/starter-relay.xml +++ b/cfg/vehicles/ra3-04302/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/starter.xml b/cfg/vehicles/ra3-04302/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-04302/starter.xml +++ b/cfg/vehicles/ra3-04302/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/trac-controller.xml b/cfg/vehicles/ra3-04302/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-04302/trac-controller.xml +++ b/cfg/vehicles/ra3-04302/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-04302/tumblers-config.xml b/cfg/vehicles/ra3-04302/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-04302/tumblers-config.xml +++ b/cfg/vehicles/ra3-04302/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/aux-converter.xml b/cfg/vehicles/ra3-06001/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-06001/aux-converter.xml +++ b/cfg/vehicles/ra3-06001/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/bat110.xml b/cfg/vehicles/ra3-06001/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-06001/bat110.xml +++ b/cfg/vehicles/ra3-06001/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/bat24.xml b/cfg/vehicles/ra3-06001/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-06001/bat24.xml +++ b/cfg/vehicles/ra3-06001/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/brake-mech.xml b/cfg/vehicles/ra3-06001/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-06001/brake-mech.xml +++ b/cfg/vehicles/ra3-06001/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/bto092.xml b/cfg/vehicles/ra3-06001/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-06001/bto092.xml +++ b/cfg/vehicles/ra3-06001/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-06001/disel.xml b/cfg/vehicles/ra3-06001/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-06001/disel.xml +++ b/cfg/vehicles/ra3-06001/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/displays.xml b/cfg/vehicles/ra3-06001/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-06001/displays.xml +++ b/cfg/vehicles/ra3-06001/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/emergency-brake-valve.xml b/cfg/vehicles/ra3-06001/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-06001/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-06001/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/epk.xml b/cfg/vehicles/ra3-06001/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-06001/epk.xml +++ b/cfg/vehicles/ra3-06001/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/ept_valve.xml b/cfg/vehicles/ra3-06001/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-06001/ept_valve.xml +++ b/cfg/vehicles/ra3-06001/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/generator.xml b/cfg/vehicles/ra3-06001/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-06001/generator.xml +++ b/cfg/vehicles/ra3-06001/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/hydro-pump.xml b/cfg/vehicles/ra3-06001/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-06001/hydro-pump.xml +++ b/cfg/vehicles/ra3-06001/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/hydro-transmission.xml b/cfg/vehicles/ra3-06001/hydro-transmission.xml index 91d4eb6..69524ea 100644 --- a/cfg/vehicles/ra3-06001/hydro-transmission.xml +++ b/cfg/vehicles/ra3-06001/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/keb.xml b/cfg/vehicles/ra3-06001/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-06001/keb.xml +++ b/cfg/vehicles/ra3-06001/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/kru091.xml b/cfg/vehicles/ra3-06001/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-06001/kru091.xml +++ b/cfg/vehicles/ra3-06001/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-06001/mk.xml b/cfg/vehicles/ra3-06001/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-06001/mk.xml +++ b/cfg/vehicles/ra3-06001/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/motor-compressor.xml b/cfg/vehicles/ra3-06001/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-06001/motor-compressor.xml +++ b/cfg/vehicles/ra3-06001/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-06001/mpsu.xml b/cfg/vehicles/ra3-06001/mpsu.xml index 1737418..3e114a5 100644 --- a/cfg/vehicles/ra3-06001/mpsu.xml +++ b/cfg/vehicles/ra3-06001/mpsu.xml @@ -1,21 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - 24.24 - 24.7 + 24.24 + 24.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/pneumo-reducer.xml b/cfg/vehicles/ra3-06001/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-06001/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-06001/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-06001/ra3-06001.xml b/cfg/vehicles/ra3-06001/ra3-06001.xml index a4cb2cc..4d93125 100644 --- a/cfg/vehicles/ra3-06001/ra3-06001.xml +++ b/cfg/vehicles/ra3-06001/ra3-06001.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-06001/start-program.xml b/cfg/vehicles/ra3-06001/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-06001/start-program.xml +++ b/cfg/vehicles/ra3-06001/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/starter-relay.xml b/cfg/vehicles/ra3-06001/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-06001/starter-relay.xml +++ b/cfg/vehicles/ra3-06001/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/starter.xml b/cfg/vehicles/ra3-06001/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-06001/starter.xml +++ b/cfg/vehicles/ra3-06001/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/trac-controller.xml b/cfg/vehicles/ra3-06001/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-06001/trac-controller.xml +++ b/cfg/vehicles/ra3-06001/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06001/tumblers-config.xml b/cfg/vehicles/ra3-06001/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-06001/tumblers-config.xml +++ b/cfg/vehicles/ra3-06001/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/aux-converter.xml b/cfg/vehicles/ra3-06002-active/aux-converter.xml index f489a7a..21cc84d 100644 --- a/cfg/vehicles/ra3-06002-active/aux-converter.xml +++ b/cfg/vehicles/ra3-06002-active/aux-converter.xml @@ -1,12 +1,12 @@ - - - 0.95 - 0.275 - 0.0675 + - 380.0 - - + 0.95 + 0.275 + 0.0675 + + 380.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/bat110.xml b/cfg/vehicles/ra3-06002-active/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-06002-active/bat110.xml +++ b/cfg/vehicles/ra3-06002-active/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/bat24.xml b/cfg/vehicles/ra3-06002-active/bat24.xml index 95e4584..f9afe13 100644 --- a/cfg/vehicles/ra3-06002-active/bat24.xml +++ b/cfg/vehicles/ra3-06002-active/bat24.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 21.0 - 0.003 - 0.4 - 200 + 24.0 + 21.0 + 0.003 + 0.4 + 200 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/brake-mech.xml b/cfg/vehicles/ra3-06002-active/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-06002-active/brake-mech.xml +++ b/cfg/vehicles/ra3-06002-active/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/bto092.xml b/cfg/vehicles/ra3-06002-active/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-06002-active/bto092.xml +++ b/cfg/vehicles/ra3-06002-active/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-06002-active/disel.xml b/cfg/vehicles/ra3-06002-active/disel.xml index ed63823..d7696a7 100644 --- a/cfg/vehicles/ra3-06002-active/disel.xml +++ b/cfg/vehicles/ra3-06002-active/disel.xml @@ -1,31 +1,32 @@ - + + 4 + 1 + euler - d1 - - 4 + d1 - 1.5 - 300.0 - 3.3 - 10.0 + 1.5 + 300.0 + 3.3 + 10.0 - 0.166 + 0.166 - 19.9 - 8.0 + 19.9 + 8.0 - 0.125 - 3e-4 + 0.125 + 3e-4 - 5.1e5 - 5.1e5 + 5.1e5 + 5.1e5 - 0.01 - 0.15 + 0.01 + 0.15 - 2.8 + 2.8 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/displays.xml b/cfg/vehicles/ra3-06002-active/displays.xml index f49e426..6e13362 100644 --- a/cfg/vehicles/ra3-06002-active/displays.xml +++ b/cfg/vehicles/ra3-06002-active/displays.xml @@ -1,26 +1,26 @@ - - - mfdu-display - BI-3 - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - - - - blok-display - BLOK_display - - 1.0 1.0 - 0.0 1.0 - 0.0 0.0 - 1.0 0.0 - + + + mfdu-display + BI-3 + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + + + + blok-display + BLOK_display + + 1.0 1.0 + 0.0 1.0 + 0.0 0.0 + 1.0 0.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/emergency-brake-valve.xml b/cfg/vehicles/ra3-06002-active/emergency-brake-valve.xml index 2c03ea5..2a73707 100644 --- a/cfg/vehicles/ra3-06002-active/emergency-brake-valve.xml +++ b/cfg/vehicles/ra3-06002-active/emergency-brake-valve.xml @@ -1,9 +1,9 @@ - - - 50.0 - 10.0 + - + 50.0 + 10.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/epk.xml b/cfg/vehicles/ra3-06002-active/epk.xml index ea8e8ba..1824987 100644 --- a/cfg/vehicles/ra3-06002-active/epk.xml +++ b/cfg/vehicles/ra3-06002-active/epk.xml @@ -1,31 +1,33 @@ - - 3 + + 3 + 1 + euler - 1e-4 - 1e-3 + 1e-4 + 1e-3 - 0.1 - 0.2 - 0.4 - 10.0 + 0.1 + 0.2 + 0.4 + 10.0 - 10.0 - 10.0 - 10.0 - 10.0 + 10.0 + 10.0 + 10.0 + 10.0 - 2.7e-4 - 2.3e-4 + 2.7e-4 + 2.3e-4 - 1e-3 - 5e-2 + 1e-3 + 5e-2 - 50.0 + 50.0 - 0.05 - 0.15 + 0.05 + 0.15 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/ept_valve.xml b/cfg/vehicles/ra3-06002-active/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-06002-active/ept_valve.xml +++ b/cfg/vehicles/ra3-06002-active/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/generator.xml b/cfg/vehicles/ra3-06002-active/generator.xml index f76188e..ab246fe 100644 --- a/cfg/vehicles/ra3-06002-active/generator.xml +++ b/cfg/vehicles/ra3-06002-active/generator.xml @@ -1,23 +1,25 @@ - - 2 - - 70000.0 - 314.2 - 101 - 400 - 0.1 - - 110.0 - 27.0 - - 30.0 + + 2 + 1 + euler - 0.06 - 100.0 - - 0.1 - 0.01 - + 70000.0 + 314.2 + 101 + 400 + 0.1 + + 110.0 + 27.0 + + 30.0 + + 0.06 + 100.0 + + 0.1 + 0.01 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/hydro-pump.xml b/cfg/vehicles/ra3-06002-active/hydro-pump.xml index 71d9c27..82713fb 100644 --- a/cfg/vehicles/ra3-06002-active/hydro-pump.xml +++ b/cfg/vehicles/ra3-06002-active/hydro-pump.xml @@ -1,9 +1,9 @@ - - - 0.06 - 0.5 - - + + + 0.06 + 0.5 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/hydro-transmission.xml b/cfg/vehicles/ra3-06002-active/hydro-transmission.xml index 91d4eb6..69524ea 100644 --- a/cfg/vehicles/ra3-06002-active/hydro-transmission.xml +++ b/cfg/vehicles/ra3-06002-active/hydro-transmission.xml @@ -1,27 +1,29 @@ - - 5 + + 5 + 1 + euler - 0.033 + 0.033 - 0.5 + 0.5 - 0.5 + 0.5 - 0.5 + 0.5 - 0.87 + 0.87 - 0.93 + 0.93 - 1.0 + 1.0 - 300 - 162 + 300 + 162 - 2.0 - 0.0 + 2.0 + 0.0 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/keb.xml b/cfg/vehicles/ra3-06002-active/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-06002-active/keb.xml +++ b/cfg/vehicles/ra3-06002-active/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/kru091.xml b/cfg/vehicles/ra3-06002-active/kru091.xml index 946863a..b4bb039 100644 --- a/cfg/vehicles/ra3-06002-active/kru091.xml +++ b/cfg/vehicles/ra3-06002-active/kru091.xml @@ -1,8 +1,9 @@ - - - 2 + + 2 + 1 + euler 300 @@ -10,13 +11,13 @@ 0.9e-4 0.0 - - 0.002 - - 1e-2 - 1e-2 - - 10.0 + + 0.002 + + 1e-2 + 1e-2 + + 10.0 diff --git a/cfg/vehicles/ra3-06002-active/mk.xml b/cfg/vehicles/ra3-06002-active/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-06002-active/mk.xml +++ b/cfg/vehicles/ra3-06002-active/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/motor-compressor.xml b/cfg/vehicles/ra3-06002-active/motor-compressor.xml index 6a2c7a1..e068ceb 100644 --- a/cfg/vehicles/ra3-06002-active/motor-compressor.xml +++ b/cfg/vehicles/ra3-06002-active/motor-compressor.xml @@ -1,17 +1,18 @@ - 2 - - 6000.0 - 151.3 - 400.0 - 2 - 50 - 2.5 - 30.0 - 0.3 + 1 + euler + + 6000.0 + 151.3 + 400.0 + 2 + 50 + 2.5 + 30.0 + 0.3 1e-4 diff --git a/cfg/vehicles/ra3-06002-active/mpsu.xml b/cfg/vehicles/ra3-06002-active/mpsu.xml index 1737418..3e114a5 100644 --- a/cfg/vehicles/ra3-06002-active/mpsu.xml +++ b/cfg/vehicles/ra3-06002-active/mpsu.xml @@ -1,21 +1,23 @@ - - 2 + + 2 + 1 + euler - 800 - 2500 - 1700 + 800 + 2500 + 1700 - 0.15 - 1.0 + 0.15 + 1.0 - 0.01 - 0.001 - 1.0 + 0.01 + 0.001 + 1.0 - 24.24 - 24.7 + 24.24 + 24.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/pneumo-reducer.xml b/cfg/vehicles/ra3-06002-active/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-06002-active/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-06002-active/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-06002-active/ra3-06002-active.xml b/cfg/vehicles/ra3-06002-active/ra3-06002-active.xml index d7ca040..15d75fc 100644 --- a/cfg/vehicles/ra3-06002-active/ra3-06002-active.xml +++ b/cfg/vehicles/ra3-06002-active/ra3-06002-active.xml @@ -6,9 +6,10 @@ 24.24 0.86 loco-resist + loco-diesel 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/cfg/vehicles/ra3-06002-active/start-program.xml b/cfg/vehicles/ra3-06002-active/start-program.xml index f736fc6..28cfb76 100644 --- a/cfg/vehicles/ra3-06002-active/start-program.xml +++ b/cfg/vehicles/ra3-06002-active/start-program.xml @@ -1,60 +1,60 @@ - - - 0 - 1 - 2.0 - 1 - - - - 11 - 1 - 1.0 - 0 - - - - 5 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 99 - 1 - 1.0 - 1 - - - - 2 - 1 - 2.0 - 1 - - - - 12 - 1 - 1.0 - 1 - - - - 4 - 0 - 1.0 - 1 - + + + 0 + 1 + 2.0 + 1 + + + + 11 + 1 + 1.0 + 0 + + + + 5 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 99 + 1 + 1.0 + 1 + + + + 2 + 1 + 2.0 + 1 + + + + 12 + 1 + 1.0 + 1 + + + + 4 + 0 + 1.0 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/starter-relay.xml b/cfg/vehicles/ra3-06002-active/starter-relay.xml index d190574..954c50f 100644 --- a/cfg/vehicles/ra3-06002-active/starter-relay.xml +++ b/cfg/vehicles/ra3-06002-active/starter-relay.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 24.0 - 157.0 - 0.1 - 0.6 - 0.7 + 24.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/starter.xml b/cfg/vehicles/ra3-06002-active/starter.xml index 4a7be99..bc0e7b7 100644 --- a/cfg/vehicles/ra3-06002-active/starter.xml +++ b/cfg/vehicles/ra3-06002-active/starter.xml @@ -1,9 +1,9 @@ - - 14000.0 - 104.7 - 625 - 24.0 - + + 14000.0 + 104.7 + 625 + 24.0 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/trac-controller.xml b/cfg/vehicles/ra3-06002-active/trac-controller.xml index 0ddb412..79e2c35 100644 --- a/cfg/vehicles/ra3-06002-active/trac-controller.xml +++ b/cfg/vehicles/ra3-06002-active/trac-controller.xml @@ -1,13 +1,13 @@ - - - 5 + - 10 - 10 + 5 - 50.0 + 10 + 10 - + 50.0 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06002-active/tumblers-config.xml b/cfg/vehicles/ra3-06002-active/tumblers-config.xml index 7fa3608..be5eb4e 100644 --- a/cfg/vehicles/ra3-06002-active/tumblers-config.xml +++ b/cfg/vehicles/ra3-06002-active/tumblers-config.xml @@ -1,15 +1,15 @@ - - - - 4 - 1 - - - 1 - 1 - + + + 4 + 1 + + + + 1 + 1 + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06003/bat110.xml b/cfg/vehicles/ra3-06003/bat110.xml index 58b37d3..2c2fc5f 100644 --- a/cfg/vehicles/ra3-06003/bat110.xml +++ b/cfg/vehicles/ra3-06003/bat110.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 108.0 - 94.5 - 0.03 - 0.4 - 170 + 108.0 + 94.5 + 0.03 + 0.4 + 170 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06003/brake-mech.xml b/cfg/vehicles/ra3-06003/brake-mech.xml index 404b037..45a5024 100644 --- a/cfg/vehicles/ra3-06003/brake-mech.xml +++ b/cfg/vehicles/ra3-06003/brake-mech.xml @@ -1,22 +1,25 @@ - - 2 - composite - 1 - 2 - 4 - 0.0 - 0.19 - 0.132 - 0.0 - - 1.45 - 0.4 - - 0.8 - 2 - 0.005 + + 2 + 1 + euler - + composite + 1 + 2 + 4 + 0.0 + 0.19 + 0.132 + 0.0 + + 1.45 + 0.4 + + 0.8 + 2 + 0.005 + + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06003/bto092.xml b/cfg/vehicles/ra3-06003/bto092.xml index 6b3ec82..76c6d35 100644 --- a/cfg/vehicles/ra3-06003/bto092.xml +++ b/cfg/vehicles/ra3-06003/bto092.xml @@ -1,7 +1,7 @@ - + 0.4 0.38 0.47 diff --git a/cfg/vehicles/ra3-06003/ept_valve.xml b/cfg/vehicles/ra3-06003/ept_valve.xml index 8c42405..ba0320c 100644 --- a/cfg/vehicles/ra3-06003/ept_valve.xml +++ b/cfg/vehicles/ra3-06003/ept_valve.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.01 - 0.7 - 0.7 + 110.0 + 157.0 + 0.01 + 0.7 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06003/keb.xml b/cfg/vehicles/ra3-06003/keb.xml index d2489a0..fcca0d5 100644 --- a/cfg/vehicles/ra3-06003/keb.xml +++ b/cfg/vehicles/ra3-06003/keb.xml @@ -1,9 +1,11 @@ - - 1 + + 1 + 1 + euler - 0.01 + 0.01 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06003/mk.xml b/cfg/vehicles/ra3-06003/mk.xml index d4200e4..d8cf2bb 100644 --- a/cfg/vehicles/ra3-06003/mk.xml +++ b/cfg/vehicles/ra3-06003/mk.xml @@ -1,13 +1,15 @@ - - 1 + + 1 + 1 + euler - 110.0 - 157.0 - 0.1 - 0.6 - 0.7 + 110.0 + 157.0 + 0.1 + 0.6 + 0.7 - + \ No newline at end of file diff --git a/cfg/vehicles/ra3-06003/pneumo-reducer.xml b/cfg/vehicles/ra3-06003/pneumo-reducer.xml index 533f4b2..bfdce9d 100644 --- a/cfg/vehicles/ra3-06003/pneumo-reducer.xml +++ b/cfg/vehicles/ra3-06003/pneumo-reducer.xml @@ -1,8 +1,8 @@ - - - 0.1 + + + 0.1 0.1 diff --git a/cfg/vehicles/ra3-06003/ra3-06003.xml b/cfg/vehicles/ra3-06003/ra3-06003.xml index 9889308..e4d529c 100644 --- a/cfg/vehicles/ra3-06003/ra3-06003.xml +++ b/cfg/vehicles/ra3-06003/ra3-06003.xml @@ -6,9 +6,10 @@ 24.7 0.86 loco-resist + default 4 ra3 - 2.0 + 100.0 350 1.0 diff --git a/mfdu-display/src/vertical-scale-bar.cpp b/mfdu-display/src/vertical-scale-bar.cpp index 2d0c186..6f99b42 100644 --- a/mfdu-display/src/vertical-scale-bar.cpp +++ b/mfdu-display/src/vertical-scale-bar.cpp @@ -55,7 +55,7 @@ void VerticalScaleBar::setVal(int val) else labTraction_->setStyleSheet("border: none; color: limegreen;"); } - else + if (val <= 0) { labBrakingForce_->setText(QString::number(std::abs(val)) + "%"); diff --git a/ra3-equipment/include/ra3-sme-signals.h b/ra3-equipment/include/ra3-sme-signals.h index 5ed4f89..357fdea 100644 --- a/ra3-equipment/include/ra3-sme-signals.h +++ b/ra3-equipment/include/ra3-sme-signals.h @@ -18,10 +18,8 @@ enum SME_HEAD_BWD = 2, /// промежуточный вагон любой ориентации SME_MIDDLE = 3, - /// активная кабина, сигнал вперёд - SME_ACTIVE_FWD = -1, - /// активная кабина, сигнал назад - SME_ACTIVE_BWD = -2, + /// активная кабина + SME_ACTIVE = -1, /// начало массива сигналов СМЕ от активной кабины SME_ACTIVE_BEGIN = 10, /// размер массива сигналов СМЕ от активной кабины diff --git a/ra3-equipment/src/mpsu.cpp b/ra3-equipment/src/mpsu.cpp index a8fb480..4723c91 100644 --- a/ra3-equipment/src/mpsu.cpp +++ b/ra3-equipment/src/mpsu.cpp @@ -459,16 +459,16 @@ void MPSU::calc_brake_level_PB() mpsu_output.pBC_min = mpsu_input.pBC_max; mpsu_output.brake_level_PB = 0.0; - for (double pBC : mpsu_input.unit_pBC) + for (size_t i = 0; i < static_cast(mpsu_output.train_size) * 2; ++i) { - if (pBC > mpsu_output.pBC_max) + if (mpsu_input.unit_pBC[i] > mpsu_output.pBC_max) { - mpsu_output.pBC_max = pBC; + mpsu_output.pBC_max = mpsu_input.unit_pBC[i]; } - if (pBC < mpsu_output.pBC_min) + if (mpsu_input.unit_pBC[i] < mpsu_output.pBC_min) { - mpsu_output.pBC_min = pBC; + mpsu_output.pBC_min = mpsu_input.unit_pBC[i]; } } @@ -542,18 +542,20 @@ void MPSU::unit_brakes_sheck() } if ((mpsu_input.unit_pBC[2 * i] > 0.04) || (mpsu_input.unit_pBC[2 * i + 1] > 0.04)) { - // Только пневматика - - if (mpsu_input.unit_level_GDB[i] == 0.0) + // Совмещённое ГДТ + пневматика - белый + if (mpsu_input.unit_level_GDB[i] > 0.01) { - mpsu_output.unit_brakes[i] = 3; + mpsu_output.unit_brakes[i] = 2; continue; } + // Только пневматика - жёлтый else { - mpsu_output.unit_brakes[i] = 2; + mpsu_output.unit_brakes[i] = 3; continue; } } + // Только ГДТ - синий if (mpsu_input.unit_level_GDB[i] > 0.01) mpsu_output.unit_brakes[i] = 1; } diff --git a/ra3-equipment/src/ra3-brake-mech.cpp b/ra3-equipment/src/ra3-brake-mech.cpp index 8ab5455..a3c6eee 100644 --- a/ra3-equipment/src/ra3-brake-mech.cpp +++ b/ra3-equipment/src/ra3-brake-mech.cpp @@ -31,7 +31,9 @@ void RA3BrakeMech::preStep(state_vector_t &Y, double t) double K_st = Kmax * (1 - Y[1] / p_max); // Нажатие от блок-тормоза без энергоаккумулятора - double K_b1 = Kmax * Y[0] / p_max; + double K_b1 = 0.0; + if (Y[0] - p_end > Physics::ZERO) + K_b1 = Kmax * (Y[0] - p_end) / (p_max - p_end); // Ограничение тормозного нажатия, учитывающее зазор в механизмах // блок тормоза с пружинным энергоаккумулятором diff --git a/ra3-head/include/ra3-head.h b/ra3-head/include/ra3-head.h index 398871d..0014338 100644 --- a/ra3-head/include/ra3-head.h +++ b/ra3-head/include/ra3-head.h @@ -68,9 +68,6 @@ class RA3HeadMotor : public Vehicle /// Признак активной кабины в конфигурации bool is_active_ref; - /// Ориентация относительно активной кабины - bool is_orient_same; - /// Состояние дверей справа int door_R_state; diff --git a/ra3-head/src/ra3-head-init-brake-mech.cpp b/ra3-head/src/ra3-head-init-brake-mech.cpp index cfdc014..35c531b 100644 --- a/ra3-head/src/ra3-head-init-brake-mech.cpp +++ b/ra3-head/src/ra3-head-init-brake-mech.cpp @@ -13,6 +13,6 @@ void RA3HeadMotor::initBrakeMech() brake_mech[i]->read_custom_config(config_dir + QDir::separator() + "brake-mech"); - brake_mech[i]->setEffFricRadius(wheel_diameter / 2.0); + brake_mech[i]->setEffFricRadius(wheel_diameter[0] / 2.0); } } diff --git a/ra3-head/src/ra3-head-step-mpsu.cpp b/ra3-head/src/ra3-head-step-mpsu.cpp index 0ff20aa..820baf1 100644 --- a/ra3-head/src/ra3-head-step-mpsu.cpp +++ b/ra3-head/src/ra3-head-step-mpsu.cpp @@ -30,7 +30,7 @@ void RA3HeadMotor::stepMPSU(double t, double dt) mpsu_input.revers_state = hydro_trans->getReversState(); - mpsu_input.v_kmh = qAbs(wheel_omega[0] * wheel_diameter * Physics::kmh / 2.0); + mpsu_input.v_kmh = qAbs(wheel_omega[0] * wheel_diameter[0] * Physics::kmh / 2.0); if (is_active) { @@ -45,14 +45,10 @@ void RA3HeadMotor::stepMPSU(double t, double dt) } else { - if (is_orient_same) - mpsu_input.revers_handle = - static_cast(backward_inputs[SME_REVERS_HANDLE]) + + // Сигнал позиции реверсора принимаем спереди наоборот, сзади правильно + mpsu_input.revers_handle = + static_cast(backward_inputs[SME_REVERS_HANDLE]) - static_cast(forward_inputs[SME_REVERS_HANDLE]); - else - mpsu_input.revers_handle = -1 * ( - static_cast(backward_inputs[SME_REVERS_HANDLE]) + - static_cast(forward_inputs[SME_REVERS_HANDLE])); mpsu_input.is_KM_zero = static_cast((backward_inputs[SME_KM_STATE] + forward_inputs[SME_KM_STATE]) == 0.0f); mpsu_input.is_KM_traction = @@ -110,7 +106,7 @@ void RA3HeadMotor::stepMPSU(double t, double dt) } mpsu_input.Kmax = brake_mech[FWD_TROLLEY]->getMaxShoeForce(); - mpsu_input.wheel_diam = wheel_diameter; + mpsu_input.wheel_diam = wheel_diameter[0]; mpsu_input.M_gb = hydro_trans->getBrakeTorque(); mpsu_input.M_gb_max = hydro_trans->getMaxBrakeTorque(); diff --git a/ra3-head/src/ra3-head-step-safety-devices.cpp b/ra3-head/src/ra3-head-step-safety-devices.cpp index 11f991d..1268f78 100644 --- a/ra3-head/src/ra3-head-step-safety-devices.cpp +++ b/ra3-head/src/ra3-head-step-safety-devices.cpp @@ -14,7 +14,7 @@ void RA3HeadMotor::stepSafetyDevices(double t, double dt) blok->setRBstate(tumbler[BUTTON_RB].getState()); blok->setRBSstate(tumbler[BUTTON_RBS].getState()); blok->setRailCoord(railway_coord + dir * getLength() / 2.0); - blok->setVelocity(wheel_omega[0] * wheel_diameter / 2.0); + blok->setVelocity(wheel_omega[0] * wheel_diameter[0] / 2.0); blok->setTrainLength(mpsu->getOutputData().train_length); blok->setKeyEPK(epk->getStateKey()); blok->step(t, dt); diff --git a/ra3-head/src/ra3-head-step-signals-output-animation.cpp b/ra3-head/src/ra3-head-step-signals-output-animation.cpp index f527a37..e3c980a 100644 --- a/ra3-head/src/ra3-head-step-signals-output-animation.cpp +++ b/ra3-head/src/ra3-head-step-signals-output-animation.cpp @@ -58,12 +58,12 @@ void RA3HeadMotor::animationSignalsOutput(double t, double dt) // Карданы - analogSignal[SHAFT_1] = static_cast( ip1 * dir * wheel_rotation_angle[0] / 2.0 / Physics::PI); - analogSignal[SHAFT_2] = static_cast(-ip1 * ip2 * dir * wheel_rotation_angle[0] / 2.0 / Physics::PI); + analogSignal[SHAFT_1] = static_cast( ip1 * wheel_rotation_angle[0] / 2.0 / Physics::PI); + analogSignal[SHAFT_2] = static_cast(-ip1 * ip2 * wheel_rotation_angle[0] / 2.0 / Physics::PI); // Колесные пары - analogSignal[WHEEL_1] = static_cast(dir * wheel_rotation_angle[0] / 2.0 / Physics::PI); - analogSignal[WHEEL_2] = static_cast(dir * wheel_rotation_angle[1] / 2.0 / Physics::PI); - analogSignal[WHEEL_3] = static_cast(dir * wheel_rotation_angle[2] / 2.0 / Physics::PI); - analogSignal[WHEEL_4] = static_cast(dir * wheel_rotation_angle[3] / 2.0 / Physics::PI); + analogSignal[WHEEL_1] = static_cast(wheel_rotation_angle[0] / 2.0 / Physics::PI); + analogSignal[WHEEL_2] = static_cast(wheel_rotation_angle[1] / 2.0 / Physics::PI); + analogSignal[WHEEL_3] = static_cast(wheel_rotation_angle[2] / 2.0 / Physics::PI); + analogSignal[WHEEL_4] = static_cast(wheel_rotation_angle[3] / 2.0 / Physics::PI); } diff --git a/ra3-head/src/ra3-head-step-signals-output-mfdu.cpp b/ra3-head/src/ra3-head-step-signals-output-mfdu.cpp index f312df2..4391a8d 100644 --- a/ra3-head/src/ra3-head-step-signals-output-mfdu.cpp +++ b/ra3-head/src/ra3-head-step-signals-output-mfdu.cpp @@ -81,7 +81,7 @@ void RA3HeadMotor::mdfuSignalsOutput(double t, double dt) analogSignal[MFDU_PRESSURE_TM] = static_cast(pTM); analogSignal[MFDU_S_SPEED_LIMIT] = static_cast(min(120.0, blok->getCurrentSpeedLimit())); - analogSignal[MFDU_S_SPEED] = static_cast(Physics::kmh * wheel_omega[0] * wheel_diameter / 2.0); + analogSignal[MFDU_S_SPEED] = static_cast(Physics::kmh * wheel_omega[0] * wheel_diameter[0] / 2.0); analogSignal[MFDU_TRACTION_BRAKING] = static_cast(100.0 * (mpsu->getOutputData().trac_level) * hydro_trans->getTractionLevel() - 100 * mpsu->getOutputData().brake_level); diff --git a/ra3-head/src/ra3-head-step-signals-output-sme.cpp b/ra3-head/src/ra3-head-step-signals-output-sme.cpp index 27ae9d1..1bfe126 100644 --- a/ra3-head/src/ra3-head-step-signals-output-sme.cpp +++ b/ra3-head/src/ra3-head-step-signals-output-sme.cpp @@ -48,11 +48,8 @@ void RA3HeadMotor::stepSMESignalsOutput(double t, double dt) forward_outputs[SME_POWER_ON] = static_cast(KM_power->getContactState(2)); // Сигнал запрета включать другие кабины - // Отправляем вперёд и назад разные занчения, - // чтобы остальные вагоны могли определить - // свою ориентацию относительно активной кабины - backward_outputs[SME_NO_ACTIVE] = static_cast(SME_ACTIVE_BWD); - forward_outputs[SME_NO_ACTIVE] = static_cast(SME_ACTIVE_FWD); + backward_outputs[SME_NO_ACTIVE] = static_cast(SME_ACTIVE); + forward_outputs[SME_NO_ACTIVE] = static_cast(SME_ACTIVE); // Сигнал запуска дизеля на ведомые секции backward_outputs[SME_DISEL_START] = static_cast(mpsu->getOutputData().start_press_count == 1); @@ -67,7 +64,8 @@ void RA3HeadMotor::stepSMESignalsOutput(double t, double dt) forward_outputs[SME_IS_AUTOSTOP_ON] = epk->getStateKey(); // Сигнал позиции реверсора на ведомые секции - backward_outputs[SME_REVERS_HANDLE] = km->getReversHandlePos(); + // Назад отправляем наоборот, вперёд правильно + backward_outputs[SME_REVERS_HANDLE] = -1 * km->getReversHandlePos(); forward_outputs[SME_REVERS_HANDLE] = km->getReversHandlePos(); // Сигналы блок-контактов КМ на ведомые секции @@ -105,20 +103,7 @@ void RA3HeadMotor::stepSMESignalsOutput(double t, double dt) // Обработка сигналов неактивной кабиной else { - // Определяем ориентацию относительно активной кабины - if (forward_inputs[SME_NO_ACTIVE] < 0) - { - // Если спереди получен сигнал от активной кабины, - // отправляемый назад, то ориентация совпадает - is_orient_same = (static_cast(forward_inputs[SME_NO_ACTIVE]) == SME_ACTIVE_BWD); - } - if (backward_inputs[SME_NO_ACTIVE] < 0) - { - // Если сзади получен сигнал от активной кабины, - // отправляемый вперёд, то ориентация совпадает - is_orient_same = (static_cast(backward_inputs[SME_NO_ACTIVE]) == SME_ACTIVE_FWD); - } - // Отправляем сигнал дальше + // Пропускаем дальше сигнал запрета включать другие кабины backward_outputs[SME_NO_ACTIVE] = forward_inputs[SME_NO_ACTIVE]; forward_outputs[SME_NO_ACTIVE] = backward_inputs[SME_NO_ACTIVE]; diff --git a/ra3-head/src/ra3-head-step-traction.cpp b/ra3-head/src/ra3-head-step-traction.cpp index b283374..ec5108a 100644 --- a/ra3-head/src/ra3-head-step-traction.cpp +++ b/ra3-head/src/ra3-head-step-traction.cpp @@ -19,14 +19,10 @@ void RA3HeadMotor::stepTraction(double t, double dt) } else { - if (is_orient_same) - hydro_trans->setRefReversState( - static_cast(backward_inputs[SME_REVERS_HANDLE]) + + // Сигнал позиции реверсора принимаем спереди наоборот, сзади правильно + hydro_trans->setRefReversState( + static_cast(backward_inputs[SME_REVERS_HANDLE]) - static_cast(forward_inputs[SME_REVERS_HANDLE])); - else - hydro_trans->setRefReversState(-1 * ( - static_cast(backward_inputs[SME_REVERS_HANDLE]) + - static_cast(forward_inputs[SME_REVERS_HANDLE]))); hydro_trans->setTractionMode( static_cast((backward_inputs[SME_KM_STATE] + forward_inputs[SME_KM_STATE]) == 1.0f) || is_auto_traction); diff --git a/ra3-head/src/ra3-head.cpp b/ra3-head/src/ra3-head.cpp index 9aea655..cf3b1c7 100644 --- a/ra3-head/src/ra3-head.cpp +++ b/ra3-head/src/ra3-head.cpp @@ -14,7 +14,6 @@ RA3HeadMotor::RA3HeadMotor(QObject *parent) : Vehicle(parent) , main_res_leak(0.0) , is_active(false) , is_active_ref(false) - , is_orient_same(true) , door_R_state(1) , door_L_state(1) , bat110(Q_NULLPTR) diff --git a/ra3-middle/include/ra3-middle.h b/ra3-middle/include/ra3-middle.h index f561e30..ef452a6 100644 --- a/ra3-middle/include/ra3-middle.h +++ b/ra3-middle/include/ra3-middle.h @@ -32,9 +32,6 @@ class RA3Middle : public Vehicle /// Серийный номер вагона int num; - /// Ориентация относительно активной кабины - bool is_orient_same; - /// Состояние дверей справа int door_R_state; diff --git a/ra3-middle/src/ra3-middle-init-brake-mech.cpp b/ra3-middle/src/ra3-middle-init-brake-mech.cpp index 018226f..3718dce 100644 --- a/ra3-middle/src/ra3-middle-init-brake-mech.cpp +++ b/ra3-middle/src/ra3-middle-init-brake-mech.cpp @@ -14,6 +14,6 @@ void RA3Middle::initBrakeMech() brake_mech[i]->read_custom_config(config_dir + QDir::separator() + "brake-mech"); - brake_mech[i]->setEffFricRadius(wheel_diameter / 2.0); + brake_mech[i]->setEffFricRadius(wheel_diameter[0] / 2.0); } } diff --git a/ra3-middle/src/ra3-middle-step-signals-output-sme.cpp b/ra3-middle/src/ra3-middle-step-signals-output-sme.cpp index 0c836b8..7974da9 100644 --- a/ra3-middle/src/ra3-middle-step-signals-output-sme.cpp +++ b/ra3-middle/src/ra3-middle-step-signals-output-sme.cpp @@ -26,20 +26,7 @@ void RA3Middle::stepSMESignalsOutput(double t, double dt) forward_outputs[SME_TRAIN_CONFIG] = static_cast( SME_MULTIPLIER * (static_cast(backward_inputs[SME_TRAIN_CONFIG]) % SME_LIMIT) + SME_MIDDLE); - // Определяем ориентацию относительно активной кабины - if (forward_inputs[SME_NO_ACTIVE] < 0) - { - // Если спереди получен сигнал от активной кабины, - // отправляемый назад, то ориентация совпадает - is_orient_same = (static_cast(forward_inputs[SME_NO_ACTIVE]) == SME_ACTIVE_BWD); - } - if (backward_inputs[SME_NO_ACTIVE] < 0) - { - // Если сзади получен сигнал от активной кабины, - // отправляемый вперёд, то ориентация совпадает - is_orient_same = (static_cast(backward_inputs[SME_NO_ACTIVE]) == SME_ACTIVE_FWD); - } - // Отправляем сигнал дальше + // Пропускаем дальше сигнал запрета включать другие кабины backward_outputs[SME_NO_ACTIVE] = forward_inputs[SME_NO_ACTIVE]; forward_outputs[SME_NO_ACTIVE] = backward_inputs[SME_NO_ACTIVE]; diff --git a/ra3-middle/src/ra3-middle-step-signals-output.cpp b/ra3-middle/src/ra3-middle-step-signals-output.cpp index 652d731..bc4d886 100644 --- a/ra3-middle/src/ra3-middle-step-signals-output.cpp +++ b/ra3-middle/src/ra3-middle-step-signals-output.cpp @@ -9,8 +9,8 @@ void RA3Middle::stepSignalsOutput(double t, double dt) Q_UNUSED(dt); // Колесные пары - analogSignal[WHEEL_1] = static_cast(dir * wheel_rotation_angle[0] / 2.0 / Physics::PI); - analogSignal[WHEEL_2] = static_cast(dir * wheel_rotation_angle[1] / 2.0 / Physics::PI); - analogSignal[WHEEL_3] = static_cast(dir * wheel_rotation_angle[2] / 2.0 / Physics::PI); - analogSignal[WHEEL_4] = static_cast(dir * wheel_rotation_angle[3] / 2.0 / Physics::PI); + analogSignal[WHEEL_1] = static_cast(wheel_rotation_angle[0] / 2.0 / Physics::PI); + analogSignal[WHEEL_2] = static_cast(wheel_rotation_angle[1] / 2.0 / Physics::PI); + analogSignal[WHEEL_3] = static_cast(wheel_rotation_angle[2] / 2.0 / Physics::PI); + analogSignal[WHEEL_4] = static_cast(wheel_rotation_angle[3] / 2.0 / Physics::PI); } diff --git a/ra3-middle/src/ra3-middle.cpp b/ra3-middle/src/ra3-middle.cpp index 7a8cf68..30ad66e 100644 --- a/ra3-middle/src/ra3-middle.cpp +++ b/ra3-middle/src/ra3-middle.cpp @@ -5,7 +5,6 @@ //------------------------------------------------------------------------------ RA3Middle::RA3Middle(QObject *parent) : Vehicle(parent) , num(4003) - , is_orient_same(true) , door_R_state(1) , door_L_state(1) , U_bat_110(0.0)