diff --git a/EVC/TrainData/traindata_106.json b/EVC/TrainData/traindata_106.json new file mode 100644 index 00000000..0e09aa4d --- /dev/null +++ b/EVC/TrainData/traindata_106.json @@ -0,0 +1,155 @@ +{ + "Simple" : { + "length": 200, + "speed": 330, + "cant_deficiency": 206, + "t_traction_cutoff": 0.3, + "airtight": 1, + "traction_systems": [ + {"name": "AC25kV", "nid_ctraction": 0}, + {"name": "DC3kV", "nid_ctraction": 0} + ], + "brakes": { + "emergency": { + "normal": { + "curves": [ + {"speed": 0, "value": 1.0, "kdry": [{"confidence": 50, "value": 1}], "kwet": 0.8} + ], + "build_up_time": 5, + "validity": "...." + } + }, + "service": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.73}, + {"speed": 13.8889, "value": 0.8}, + {"speed": 27.7778, "value": 0.8}, + {"speed": 41.6667, "value": 0.7}, + {"speed": 55.5556, "value": 0.6}, + {"speed": 69.4444, "value": 0.54}, + {"speed": 83.3333, "value": 0.6} + ], + "build_up_time": 0.5, + "validity": "1..." + }, + "no_dynamic": { + "curves": [ + {"speed": 0, "value": 0.75}, + {"speed": 13.8889, "value": 0.82}, + {"speed": 27.7778, "value": 0.82}, + {"speed": 41.6667, "value": 0.72}, + {"speed": 55.5556, "value": 0.62}, + {"speed": 69.4444, "value": 0.56}, + {"speed": 83.3333, "value": 0.62} + ], + "build_up_time": 5, + "validity": "0..." + } + }, + "normal_service": { + "passenger": { + "0": { + "curves": [ + {"speed": 0, "value": 0.4} + ] + }, + "0.5": { + "curves": [ + {"speed": 0, "value": 0.6} + ] + }, + "0.7": { + "curves": [ + {"speed": 0, "value": 0.7} + ] + } + }, + "kn+": [ + {"speed": 0, "value": 1} + ], + "kn-": [ + {"speed": 0, "value": 1} + ] + } + + } + }, + "Doble" : { + "length": 400, + "speed": 330, + "cant_deficiency": 206, + "t_traction_cutoff": 0.3, + "airtight": 1, + "traction_systems": [ + {"name": "AC25kV", "nid_ctraction": 0}, + {"name": "DC3kV", "nid_ctraction": 0} + ], + "brakes": { + "emergency": { + "normal": { + "curves": [ + {"speed": 0, "value": 1.00, "kdry": [{"confidence": 50, "value": 1}], "kwet": 0.8} + ], + "build_up_time": 5, + "validity": "...." + } + }, + "service": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.73}, + {"speed": 13.8889, "value": 0.8}, + {"speed": 27.7778, "value": 0.8}, + {"speed": 41.6667, "value": 0.7}, + {"speed": 55.5556, "value": 0.6}, + {"speed": 69.4444, "value": 0.54}, + {"speed": 83.3333, "value": 0.6} + ], + "build_up_time": 0.5, + "validity": "1..." + }, + "no_dynamic": { + "curves": [ + {"speed": 0, "value": 0.75}, + {"speed": 13.8889, "value": 0.82}, + {"speed": 27.7778, "value": 0.82}, + {"speed": 41.6667, "value": 0.72}, + {"speed": 55.5556, "value": 0.62}, + {"speed": 69.4444, "value": 0.56}, + {"speed": 83.3333, "value": 0.62} + ], + "build_up_time": 5, + "validity": "0..." + } + }, + "normal_service": { + "passenger": { + "0": { + "curves": [ + {"speed": 0, "value": 0.4} + ] + }, + "0.5": { + "curves": [ + {"speed": 0, "value": 0.6} + ] + }, + "0.7": { + "curves": [ + {"speed": 0, "value": 0.7} + ] + } + }, + "kn+": [ + {"speed": 0, "value": 1} + ], + "kn-": [ + {"speed": 0, "value": 1} + ] + } + + } + + } +} \ No newline at end of file diff --git a/EVC/TrainData/traindata_107.json b/EVC/TrainData/traindata_107.json new file mode 100644 index 00000000..0e09aa4d --- /dev/null +++ b/EVC/TrainData/traindata_107.json @@ -0,0 +1,155 @@ +{ + "Simple" : { + "length": 200, + "speed": 330, + "cant_deficiency": 206, + "t_traction_cutoff": 0.3, + "airtight": 1, + "traction_systems": [ + {"name": "AC25kV", "nid_ctraction": 0}, + {"name": "DC3kV", "nid_ctraction": 0} + ], + "brakes": { + "emergency": { + "normal": { + "curves": [ + {"speed": 0, "value": 1.0, "kdry": [{"confidence": 50, "value": 1}], "kwet": 0.8} + ], + "build_up_time": 5, + "validity": "...." + } + }, + "service": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.73}, + {"speed": 13.8889, "value": 0.8}, + {"speed": 27.7778, "value": 0.8}, + {"speed": 41.6667, "value": 0.7}, + {"speed": 55.5556, "value": 0.6}, + {"speed": 69.4444, "value": 0.54}, + {"speed": 83.3333, "value": 0.6} + ], + "build_up_time": 0.5, + "validity": "1..." + }, + "no_dynamic": { + "curves": [ + {"speed": 0, "value": 0.75}, + {"speed": 13.8889, "value": 0.82}, + {"speed": 27.7778, "value": 0.82}, + {"speed": 41.6667, "value": 0.72}, + {"speed": 55.5556, "value": 0.62}, + {"speed": 69.4444, "value": 0.56}, + {"speed": 83.3333, "value": 0.62} + ], + "build_up_time": 5, + "validity": "0..." + } + }, + "normal_service": { + "passenger": { + "0": { + "curves": [ + {"speed": 0, "value": 0.4} + ] + }, + "0.5": { + "curves": [ + {"speed": 0, "value": 0.6} + ] + }, + "0.7": { + "curves": [ + {"speed": 0, "value": 0.7} + ] + } + }, + "kn+": [ + {"speed": 0, "value": 1} + ], + "kn-": [ + {"speed": 0, "value": 1} + ] + } + + } + }, + "Doble" : { + "length": 400, + "speed": 330, + "cant_deficiency": 206, + "t_traction_cutoff": 0.3, + "airtight": 1, + "traction_systems": [ + {"name": "AC25kV", "nid_ctraction": 0}, + {"name": "DC3kV", "nid_ctraction": 0} + ], + "brakes": { + "emergency": { + "normal": { + "curves": [ + {"speed": 0, "value": 1.00, "kdry": [{"confidence": 50, "value": 1}], "kwet": 0.8} + ], + "build_up_time": 5, + "validity": "...." + } + }, + "service": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.73}, + {"speed": 13.8889, "value": 0.8}, + {"speed": 27.7778, "value": 0.8}, + {"speed": 41.6667, "value": 0.7}, + {"speed": 55.5556, "value": 0.6}, + {"speed": 69.4444, "value": 0.54}, + {"speed": 83.3333, "value": 0.6} + ], + "build_up_time": 0.5, + "validity": "1..." + }, + "no_dynamic": { + "curves": [ + {"speed": 0, "value": 0.75}, + {"speed": 13.8889, "value": 0.82}, + {"speed": 27.7778, "value": 0.82}, + {"speed": 41.6667, "value": 0.72}, + {"speed": 55.5556, "value": 0.62}, + {"speed": 69.4444, "value": 0.56}, + {"speed": 83.3333, "value": 0.62} + ], + "build_up_time": 5, + "validity": "0..." + } + }, + "normal_service": { + "passenger": { + "0": { + "curves": [ + {"speed": 0, "value": 0.4} + ] + }, + "0.5": { + "curves": [ + {"speed": 0, "value": 0.6} + ] + }, + "0.7": { + "curves": [ + {"speed": 0, "value": 0.7} + ] + } + }, + "kn+": [ + {"speed": 0, "value": 1} + ], + "kn-": [ + {"speed": 0, "value": 1} + ] + } + + } + + } +} \ No newline at end of file diff --git a/EVC/TrainData/traindata_162.json b/EVC/TrainData/traindata_162.json new file mode 100644 index 00000000..2b8ea057 --- /dev/null +++ b/EVC/TrainData/traindata_162.json @@ -0,0 +1,155 @@ +{ + "162.1" : { + "length": 125, + "speed": 330, + "cant_deficiency": 206, + "t_traction_cutoff": 0.3, + "airtight": 1, + "traction_systems": [ + {"name": "AC25kV", "nid_ctraction": 0}, + {"name": "DC3kV", "nid_ctraction": 0} + ], + "brakes": { + "emergency": { + "normal": { + "curves": [ + {"speed": 0, "value": 1.0, "kdry": [{"confidence": 50, "value": 1}], "kwet": 0.8} + ], + "build_up_time": 5, + "validity": "...." + } + }, + "service": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.93}, + {"speed": 13.8889, "value": 0.92}, + {"speed": 27.7778, "value": 0.91}, + {"speed": 41.6667, "value": 0.83}, + {"speed": 55.5556, "value": 0.76}, + {"speed": 69.4444, "value": 0.64}, + {"speed": 83.3333, "value": 0.7} + ], + "build_up_time": 0.5, + "validity": "1..." + }, + "no_dynamic": { + "curves": [ + {"speed": 0, "value": 0.93}, + {"speed": 13.8889, "value": 0.92}, + {"speed": 27.7778, "value": 0.91}, + {"speed": 41.6667, "value": 0.83}, + {"speed": 55.5556, "value": 0.76}, + {"speed": 69.4444, "value": 0.64}, + {"speed": 83.3333, "value": 0.7} + ], + "build_up_time": 5, + "validity": "0..." + } + }, + "normal_service": { + "passenger": { + "0": { + "curves": [ + {"speed": 0, "value": 0.4} + ] + }, + "0.5": { + "curves": [ + {"speed": 0, "value": 0.6} + ] + }, + "0.7": { + "curves": [ + {"speed": 0, "value": 0.7} + ] + } + }, + "kn+": [ + {"speed": 0, "value": 1} + ], + "kn-": [ + {"speed": 0, "value": 1} + ] + } + + } + }, + "162.1_106" : { + "length": 327, + "speed": 330, + "cant_deficiency": 206, + "t_traction_cutoff": 0.3, + "airtight": 1, + "traction_systems": [ + {"name": "AC25kV", "nid_ctraction": 0}, + {"name": "DC3kV", "nid_ctraction": 0} + ], + "brakes": { + "emergency": { + "normal": { + "curves": [ + {"speed": 0, "value": 1.00, "kdry": [{"confidence": 50, "value": 1}], "kwet": 0.8} + ], + "build_up_time": 5, + "validity": "...." + } + }, + "service": { + "normal": { + "curves": [ + {"speed": 0, "value": 0.73}, + {"speed": 13.8889, "value": 0.8}, + {"speed": 27.7778, "value": 0.8}, + {"speed": 41.6667, "value": 0.7}, + {"speed": 55.5556, "value": 0.6}, + {"speed": 69.4444, "value": 0.54}, + {"speed": 83.3333, "value": 0.6} + ], + "build_up_time": 0.5, + "validity": "1..." + }, + "no_dynamic": { + "curves": [ + {"speed": 0, "value": 0.75}, + {"speed": 13.8889, "value": 0.82}, + {"speed": 27.7778, "value": 0.82}, + {"speed": 41.6667, "value": 0.72}, + {"speed": 55.5556, "value": 0.62}, + {"speed": 69.4444, "value": 0.56}, + {"speed": 83.3333, "value": 0.62} + ], + "build_up_time": 5, + "validity": "0..." + } + }, + "normal_service": { + "passenger": { + "0": { + "curves": [ + {"speed": 0, "value": 0.4} + ] + }, + "0.5": { + "curves": [ + {"speed": 0, "value": 0.6} + ] + }, + "0.7": { + "curves": [ + {"speed": 0, "value": 0.7} + ] + } + }, + "kn+": [ + {"speed": 0, "value": 1} + ], + "kn-": [ + {"speed": 0, "value": 1} + ] + } + + } + + } +} \ No newline at end of file diff --git a/EVC/config.json b/EVC/config.json index 60bc1540..08bbf3de 100644 --- a/EVC/config.json +++ b/EVC/config.json @@ -50,6 +50,21 @@ "SpeedDial": 400, "STMLayout": "stm_siemens.json" }, + "106": { + "TrainData": "TrainData/traindata_106.json", + "SpeedDial": 400, + "STMLayout": "stm_siemens.json" + }, + "107": { + "TrainData": "TrainData/traindata_107.json", + "SpeedDial": 400, + "STMLayout": "stm_siemens.json" + }, + "162": { + "TrainData": "TrainData/traindata_162.json", + "SpeedDial": 400, + "STMLayout": "stm_siemens.json" + }, "120": { "TrainData": "TrainData/traindata_120.json", "SpeedDial": 400, diff --git a/libs/liborts b/libs/liborts index 4135ea52..335179a5 160000 --- a/libs/liborts +++ b/libs/liborts @@ -1 +1 @@ -Subproject commit 4135ea524ed2bb5c46a6fac750ba8173e6fd9274 +Subproject commit 335179a59f2872051430358984e433b4a46eadfa