blocktrain 0.3.0 → 0.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +8 -8
  2. data/CHANGELOG.md +12 -0
  3. data/config/signal_aliases.yml +50 -60
  4. data/lib/blocktrain/lookups.rb +7 -0
  5. data/lib/blocktrain/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZTM3NjNiZGNiN2M2N2UwYWJiOTg0YjUxNjAwMzY3OTFhODlmMGQzMg==
4
+ ZjQ2YWExOGU0ODY5YWMxNTU0NzI4OTc3MzM4MDM5MjE0NDU2MmMxZQ==
5
5
  data.tar.gz: !binary |-
6
- MDg5NmYzMGMzMDgzMTU4MjMyYTdkZDdmMTJkOWQ5NGFhZmNhMWE1MA==
6
+ NDE3ODc2MTczMDRjM2QyYzNjNmMwMzg4NzZhZjk1MzdkODUxMzg5ZQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MmVkZWE4ZWVjYzU3MmI3ZTgzZWI0ODlhMjlhNDg4NjA2NDkwMjdiMmM3ZGE3
10
- MDZiZGJjYzZlYjQzY2I3YWEwZjFiMTAyNzg0ZDc4ZGVjNGM4ZGU5N2VhMDE2
11
- NjQyNWNlMTU1OTkyYjYzZDQxYzc1NGY1NmNhMjRlYjdkOTU2NGU=
9
+ ZmI0YzJkZjhmYWQ5NTI5MTU1ZjZhM2I3YjNlZWFmMzlhN2VjYzQ5MjVhMjg0
10
+ OTcxYTBlZmJiNDc0ZTA2MmZlOTUxNjZjMjkwNzAxMzc0ZTBmN2Q4Mjk3OTEz
11
+ MTE3OTFhMzI1YzVjYWQyOWVhZDY0ODBiZWRiNjdhNGE3Mzc3ZjI=
12
12
  data.tar.gz: !binary |-
13
- NGYzM2U5ZDdlN2E4ZWVhYjAzMDMyNzY4NzVmZjFkNDRiMmNhMGQyZjJhZmY5
14
- NjVjYjU2NTY1YmJhYjg1NjdkNWUwMjEwYjgzOGI4MjAyMWYxM2YzODMwYmI3
15
- OTYzM2ZmZjZkMzlmY2Y5YTJhODI0YTFiMmM0YTI3NjgyMWI4MWU=
13
+ ZTRkNjZhZjgyMjJiYTNjZmFmNmI2OGFiNzRlMmI1MzlhMzkzOWFmNjg0NjM0
14
+ NTEwOWY0ZWVmMjBjMmRmMTYyZjNlZTA2ZGQ5MWE5NjMxOTU0OGVlZTY3MTY5
15
+ NWMwOWRmYzNjMWUxMjY5MDlhYmI0ZmUxOGJhNmMzMmMxZDNiMjY=
data/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # Change Log
2
2
 
3
+ ## [v0.3.0](https://github.com/TheODI-UD2D/blocktrain/tree/v0.3.0) (2015-11-12)
4
+ [Full Changelog](https://github.com/TheODI-UD2D/blocktrain/compare/v0.2.3...v0.3.0)
5
+
6
+ **Merged pull requests:**
7
+
8
+ - Query multiple signals [\#11](https://github.com/TheODI-UD2D/blocktrain/pull/11) ([pezholio](https://github.com/pezholio))
9
+ - Feature get all signals [\#10](https://github.com/TheODI-UD2D/blocktrain/pull/10) ([pikesley](https://github.com/pikesley))
10
+ - Code of conduct [\#9](https://github.com/TheODI-UD2D/blocktrain/pull/9) ([pikesley](https://github.com/pikesley))
11
+
12
+ ## [v0.2.3](https://github.com/TheODI-UD2D/blocktrain/tree/v0.2.3) (2015-11-11)
13
+ [Full Changelog](https://github.com/TheODI-UD2D/blocktrain/compare/v0.2.2...v0.2.3)
14
+
3
15
  ## [v0.2.2](https://github.com/TheODI-UD2D/blocktrain/tree/v0.2.2) (2015-11-11)
4
16
  [Full Changelog](https://github.com/TheODI-UD2D/blocktrain/compare/v0.2.1...v0.2.2)
5
17
 
data/config/signal_aliases.yml CHANGED
@@ -1,25 +1,16 @@
1
1
  train_run_distance: "MSV_Xs_TrnRnDstTot"
2
- this_cab_active: "@.MWT.R_T3_1.RCV_S_ThisCabAct"
3
- atp_worst_case_forward_location: "@.MWT.S_ATC_T4_1.SSV_X_AtpWrstFwLocSegId"
4
- atp_worst_case_forward_location_offset: "@.MWT.S_ATC_T4_1.SSV_X_AtpWrstFwLocOffs"
5
- train_speed: "@.MWT.M_T3_1.MRV_TrnSpd_1.MRV_Xv_Trn"
6
- line_voltage: "@.MWT.CT_CI_T2_1.CI_COP_XU_Ln"
7
- line_current: "@.MWT.CT_CI_T2_1.CI_COP_XI_Ln"
8
- hscb_close: "@.MWT.H_T2_1.DX54_Out2_C_HscbCl"
9
- order_hscb_to_open_from_cop: "@.MWT.H_T3_1.HCV_C_CopHscbOp"
10
- cop_is_ok_for_supervision: "@.MWT.CT_CI_T3_1.CI_COP_S_CopOk"
11
- mcs_driving_mode_forward: "@.MWT.CT_CI_T3_1.DI13_In5_S_McsDrvMdFw"
12
- mcs_driving_mode_inter: "@.MWT.CT_CI_T3_1.DI13_In4_S_McsDrvMdInter"
13
- mcs_driving_mode_reverse: "@.MWT.CT_CI_T3_1.DI13_In3_S_McsDrvMdRv"
14
- mcs_driving_mode_protected_manual: "@.MWT.CT_CI_T3_1.DI13_In6_S_McsDrvMdPrMan"
15
- mcs_driving_mode_auto: "@.MWT.CT_CI_T3_1.DX17_In7_S_McsDrvMdAuto"
16
- mcs_driving_mode_selected: "@.MWT.M_T4_1.MCV_S_McsDrvMdSd"
2
+ a_car_temperature: "@.MWT.CT_CI_T5_1.AX19_In2_X_AcarTmp"
3
+ actual_chopper_power: "@.MWT.P_T3_1.PII_DCUM2_XP_Cp"
4
+ actual_motor_power: "@.MWT.P_T4_1.PII_DCUM2_XP_Mt"
17
5
  actuate_braking: "@.MWT.CT_CI_T2_1.DI20_In9_TrLn_AB"
18
6
  actuate_motor: "@.MWT.CT_CI_T2_1.DI20_In10_TrLn_AM"
19
- tr_br_effort_reference_1: "@.MWT.M_T2_1.MRV_W_PwmRef1"
20
- tr_br_effort_reference_2: "@.MWT.M_T2_1.MRV_W_PwmRef2"
21
- traction_brake_effort_reference: "@.MWT.M_T2_1.MRV_W_TrBrEffRef"
22
- emergency_brake_applied: "@.MWT.B_T3_1.BSV_S_EmBrApl"
7
+ all_doors_closed: "@.MWT.CT_CI_T3_1.DX11_In3_S_AllDrCld"
8
+ ato_start_button_1_pressed: "@.MWT.CT_CI_T3_1.DI13_In7_S_AtoPb1Act"
9
+ ato_start_button_2_pressed: "@.MWT.CT_CI_T3_1.DI13_In8_S_AtoPb2Act"
10
+ atp_worst_case_forward_location_offset: "@.MWT.S_ATC_T4_1.SSV_X_AtpWrstFwLocOffs"
11
+ atp_worst_case_forward_location: "@.MWT.S_ATC_T4_1.SSV_X_AtpWrstFwLocSegId"
12
+ available_dynamic_brake: "@.MWT.P_T3_1.PII_DCUM1_XF_BrAvl"
13
+ b_car_temperature: "@.MWT.CT_CI_T5_1.AX19_In4_X_BcarTmp"
23
14
  brake_cylinder_pressure_car_a_bogie_a: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarABgA"
24
15
  brake_cylinder_pressure_car_a_bogie_d: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarABgD"
25
16
  brake_cylinder_pressure_car_b_bogie_a: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarBBgA"
@@ -28,61 +19,60 @@ brake_cylinder_pressure_car_c_bogie_a: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarCBgA"
28
19
  brake_cylinder_pressure_car_c_bogie_d: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarCBgD"
29
20
  brake_cylinder_pressure_car_d_bogie_a: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarDBgA"
30
21
  brake_cylinder_pressure_car_d_bogie_d: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarDBgD"
31
- main_reservoir_pressure: "@.MWT.CT_CI_T4_1.CI_BGW_Wp_MnReservoir"
32
- wsp_active: "@.MWT.CT_CI_T3_1.CI_BGW_S_WspAct"
33
- all_doors_closed: "@.MWT.CT_CI_T3_1.DX11_In3_S_AllDrCld"
34
- mcm_state: "@.MWT.P_T3_1.PII_DCUM1_X_McmSt"
35
- mcm_state: "@.MWT.P_T3_1.PII_DCUM2_X_McmSt"
36
- traction_brake_achieved: "@.MWT.P_T2_1.PII_DCUM1_XF_TrBrAch"
37
- actual_chopper_power: "@.MWT.P_T3_1.PII_DCUM1_XP_Cp"
38
- actual_motor_power: "@.MWT.P_T3_1.PII_DCUM1_XP_Mt"
39
- available_dynamic_brake: "@.MWT.P_T3_1.PII_DCUM1_XF_BrAvl"
40
- estimated_brake_resistor_temparature: "@.MWT.P_T4_1.PII_DCUM1_XT_EstBrRs"
41
- estimated_brake_resistor_temparature: "@.MWT.P_T4_1.PII_DCUM2_XT_EstBrRs"
42
- actual_chopper_power: "@.MWT.P_T3_1.PII_DCUM2_XP_Cp"
43
- actual_motor_power: "@.MWT.P_T4_1.PII_DCUM2_XP_Mt"
44
- available_dynamic_brake: "@.MWT.P_T3_1.PII_DCUM2_XF_BrAvl"
22
+ c_car_temperature: "@.MWT.CT_CI_T4_1.AX47_In4_X_CcarTmp"
23
+ compressor_motor_running: "@.MWT.A_T4_1.ASV_S_CmprMtRn"
24
+ compressor_start: "@.MWT.A_T4_1.ACV_C_CmprSta"
25
+ cop_is_ok_for_supervision: "@.MWT.CT_CI_T3_1.CI_COP_S_CopOk"
26
+ crew_number: "@.MWT.S_ATC_T4_1.CO_ATO_X_CrwNo"
27
+ d_car_temperature: "@.MWT.CT_CI_T4_1.AX47_In2_X_DcarTmp"
28
+ day: "@.MWT.CT_CO_T4_1.CP_X_AnsiDay"
29
+ destination_code: "@.MWT.S_ATC_T4_1.CO_ATO_X_DstntnCode"
45
30
  dynamic_brake_ok: "@.MWT.P_T2_1.PII_DCUM1_S_DynBrOk"
46
- dynamic_brake_ok: "@.MWT.P_T2_1.PII_DCUM2_S_DynBrOk"
47
- lma_end_location: "@.MWT.CT_CI_T4_1.CI_ATP1_X_LmaEndLocSegId"
31
+ emergency_brake_applied: "@.MWT.B_T3_1.BSV_S_EmBrApl"
32
+ estimated_brake_resistor_temparature: "@.MWT.P_T4_1.PII_DCUM1_XT_EstBrRs"
33
+ hour: "@.MWT.CT_CO_T4_1.CP_X_AnsiHour"
34
+ hscb_close: "@.MWT.H_T2_1.DX54_Out2_C_HscbCl"
35
+ line_current: "@.MWT.CT_CI_T2_1.CI_COP_XI_Ln"
36
+ line_voltage: "@.MWT.CT_CI_T2_1.CI_COP_XU_Ln"
48
37
  lma_end_location_offset: "@.MWT.CT_CI_T4_1.CI_ATP1_X_LmaEndLocOffset"
49
- lma_end_location: "@.MWT.CT_CI_T4_1.CI_ATP2_X_LmaEndLocSegId"
50
- lma_end_location_offset: "@.MWT.CT_CI_T4_1.CI_ATP2_X_LmaEndLocOffset"
51
- ato_start_button_1_pressed: "@.MWT.CT_CI_T3_1.DI13_In7_S_AtoPb1Act"
52
- ato_start_button_2_pressed: "@.MWT.CT_CI_T3_1.DI13_In8_S_AtoPb2Act"
38
+ lma_end_location: "@.MWT.CT_CI_T4_1.CI_ATP1_X_LmaEndLocSegId"
39
+ main_reservoir_pressure: "@.MWT.CT_CI_T4_1.CI_BGW_Wp_MnReservoir"
40
+ mcm_state: "@.MWT.P_T3_1.PII_DCUM1_X_McmSt"
41
+ mcs_driving_mode_auto: "@.MWT.CT_CI_T3_1.DX17_In7_S_McsDrvMdAuto"
42
+ mcs_driving_mode_forward: "@.MWT.CT_CI_T3_1.DI13_In5_S_McsDrvMdFw"
43
+ mcs_driving_mode_inter: "@.MWT.CT_CI_T3_1.DI13_In4_S_McsDrvMdInter"
44
+ mcs_driving_mode_protected_manual: "@.MWT.CT_CI_T3_1.DI13_In6_S_McsDrvMdPrMan"
45
+ mcs_driving_mode_reverse: "@.MWT.CT_CI_T3_1.DI13_In3_S_McsDrvMdRv"
46
+ mcs_driving_mode_selected: "@.MWT.M_T4_1.MCV_S_McsDrvMdSd"
47
+ minute: "@.MWT.CT_CO_T4_1.CP_X_AnsiMin"
48
+ month: "@.MWT.CT_CO_T4_1.CP_X_AnsiMon"
49
+ order_hscb_to_open_from_cop: "@.MWT.H_T3_1.HCV_C_CopHscbOp"
50
+ passenger_load_to_ato: "@.MWT.B_T5_1.BRV_X_TrnLd"
53
51
  passesnger_load_car_a: "@.MWT.B_T5_1.BRV_X_prctPssngrLdCarA"
54
52
  passesnger_load_car_b: "@.MWT.B_T5_1.BRV_X_prctPssngrLdCarB"
55
53
  passesnger_load_car_c: "@.MWT.B_T5_1.BRV_X_prctPssngrLdCarC"
56
54
  passesnger_load_car_d: "@.MWT.B_T5_1.BRV_X_prctPssngrLdCarD"
57
- passenger_load_to_ato: "@.MWT.B_T5_1.BRV_X_TrnLd"
58
- compressor_start: "@.MWT.A_T4_1.ACV_C_CmprSta"
59
- compressor_motor_running: "@.MWT.A_T4_1.ASV_S_CmprMtRn"
60
55
  pressure_low_limit: "@.MWT.A_T4_1.ACV_MsCmpr_1.P_Xp_PrsLoLim"
61
- pressure_low_limit: "@.MWT.A_T4_1.ASV_AirPrs_1.P_Xp_PrsLoLim"
56
+ pv1_temperature: "@.MWT.K_T5_1.KCV_X_PrsVnt1TmpIn"
57
+ pv2_temperature: "@.MWT.K_T5_1.KEV_X_PrsVnt2Tmp"
58
+ second: "@.MWT.CT_CO_T4_1.CP_X_AnsiSec"
62
59
  sync_all_clocks: "@.MWT.CT_CO_T4_1.CP_C_TrgSncAll"
63
60
  sync_local_clock: "@.MWT.CT_CO_T4_1.CP_C_TrgSncLc"
64
61
  sync_master_clock_from_pdp1: "@.MWT.CT_CO_T4_1.CP_C_TrgSncMsPdp1"
65
62
  sync_master_clock_from_pdp2: "@.MWT.CT_CO_T4_1.CP_C_TrgSncMsPdp2"
66
63
  sync_pdp_clock: "@.MWT.CT_CO_T4_1.CP_C_TrgSncPdp"
67
- year: "@.MWT.CT_CO_T4_1.CP_X_AnsiYear"
68
- month: "@.MWT.CT_CO_T4_1.CP_X_AnsiMon"
69
- day: "@.MWT.CT_CO_T4_1.CP_X_AnsiDay"
70
- hour: "@.MWT.CT_CO_T4_1.CP_X_AnsiHour"
71
- minute: "@.MWT.CT_CO_T4_1.CP_X_AnsiMin"
72
- second: "@.MWT.CT_CO_T4_1.CP_X_AnsiSec"
64
+ this_cab_active: "@.MWT.R_T3_1.RCV_S_ThisCabAct"
65
+ tr_br_effort_reference_1: "@.MWT.M_T2_1.MRV_W_PwmRef1"
66
+ tr_br_effort_reference_2: "@.MWT.M_T2_1.MRV_W_PwmRef2"
67
+ traction_brake_achieved: "@.MWT.P_T2_1.PII_DCUM1_XF_TrBrAch"
68
+ traction_brake_effort_reference: "@.MWT.M_T2_1.MRV_W_TrBrEffRef"
69
+ train_fault_report_code: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnFltRepCode"
70
+ train_mode: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnMd"
73
71
  train_number: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnNo"
74
- crew_number: "@.MWT.S_ATC_T4_1.CO_ATO_X_CrwNo"
75
- destination_code: "@.MWT.S_ATC_T4_1.CO_ATO_X_DstntnCode"
76
72
  train_service_code: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnSrvCode"
77
- train_fault_report_code: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnFltRepCode"
73
+ train_speed: "@.MWT.M_T3_1.MRV_TrnSpd_1.MRV_Xv_Trn"
78
74
  train_stock_type: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnStckTp"
79
75
  train_unit_number_1st: "@.MWT.S_ATC_T4_1.CO_ATO_X_FrstTrnUntId"
80
76
  train_unit_number_2nd: "@.MWT.S_ATC_T4_1.CO_ATO_X_SecTrnUntId"
81
- train_mode: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnMd"
82
- a_car_temperature: "@.MWT.CT_CI_T5_1.AX19_In2_X_AcarTmp"
83
- b_car_temperature: "@.MWT.CT_CI_T5_1.AX19_In4_X_BcarTmp"
84
- c_car_temperature: "@.MWT.CT_CI_T4_1.AX47_In4_X_CcarTmp"
85
- d_car_temperature: "@.MWT.CT_CI_T4_1.AX47_In2_X_DcarTmp"
86
- pv1_temperature: "@.MWT.K_T5_1.KCV_X_PrsVnt1TmpIn"
87
- pv1_temperature: "@.MWT.K_T5_1.KEV_X_PrsVnt1Tmp"
88
- pv2_temperature: "@.MWT.K_T5_1.KEV_X_PrsVnt2Tmp"
77
+ wsp_active: "@.MWT.CT_CI_T3_1.CI_BGW_S_WspAct"
78
+ year: "@.MWT.CT_CO_T4_1.CP_X_AnsiYear"
data/lib/blocktrain/lookups.rb CHANGED
@@ -7,6 +7,11 @@ module Blocktrain
7
7
  @lookups
8
8
  end
9
9
 
10
+ def aliases
11
+ init! if @aliases.nil?
12
+ @aliases
13
+ end
14
+
10
15
  def reset!
11
16
  @lookups = nil
12
17
  end
@@ -14,6 +19,7 @@ module Blocktrain
14
19
  # Separate out initialization for testing purposes
15
20
  def init!
16
21
  @lookups ||= {}
22
+ @aliases ||= {}
17
23
  # Get unique list of keys from ES
18
24
  r = Aggregations::TermsAggregation.new(from: '2015-09-01 10:00:00Z', to: '2015-09-30 11:00:00Z', term: "memoryAddress").results
19
25
  addresses = r.map {|x| x["key"]}
@@ -26,6 +32,7 @@ module Blocktrain
26
32
  # Read aliases from file
27
33
  aliases = OpenStruct.new fetch_yaml 'signal_aliases'
28
34
  aliases.each_pair do |key, value|
35
+ @aliases[key.to_s] = @lookups[value]
29
36
  @lookups[key.to_s] = @lookups[value]
30
37
  end
31
38
  end
data/lib/blocktrain/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Blocktrain
2
- VERSION = '0.3.0'
2
+ VERSION = '0.3.1'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: blocktrain
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - pikesley
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2015-11-12 00:00:00.000000000 Z
12
+ date: 2015-11-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: dotenv