blocktrain 0.2.2 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTc0NWM2YjBkOGNlMjIyOTM1ZDNiNjRkMzhlZDZhNTRmNzNhZjIxMg==
+    ZTM3NjNiZGNiN2M2N2UwYWJiOTg0YjUxNjAwMzY3OTFhODlmMGQzMg==
   data.tar.gz: !binary |-
-    ZWFmMzA2M2UwMmRhM2QxYTZhNWYzMDQzMDJjMjExMGRiNjY5ODFhNQ==
+    MDg5NmYzMGMzMDgzMTU4MjMyYTdkZDdmMTJkOWQ5NGFhZmNhMWE1MA==
 SHA512:
   metadata.gz: !binary |-
-    OTE5Y2Q1NDY3MjgwYzMzNzUxNzFiZThiMTBmYzZmNTM1YjBiZjMzN2FjYmY4
-    NzFlNDVkNGMzMjQyYjg5ZTY1Y2JjZjYwMjRlNDczZjYzMWVhNGNjNTRmZGJi
-    NDcyMDA3MDhjZjY3Mjg0ZGE1MjJjZDczNzc5MzkxNGZjNGM2YjQ=
+    MmVkZWE4ZWVjYzU3MmI3ZTgzZWI0ODlhMjlhNDg4NjA2NDkwMjdiMmM3ZGE3
+    MDZiZGJjYzZlYjQzY2I3YWEwZjFiMTAyNzg0ZDc4ZGVjNGM4ZGU5N2VhMDE2
+    NjQyNWNlMTU1OTkyYjYzZDQxYzc1NGY1NmNhMjRlYjdkOTU2NGU=
   data.tar.gz: !binary |-
-    ZGIzMzIyZDRkM2JiMDE5Mjg1MmNiMWIwYmFiODExNWZkNWJiNTg5MjFlOTVl
-    ZGY0ZTZlOGY2Mjg2OGFhZDcxMmYyMTg0N2MyYWZiYzQxOGMzNTM2ZGQzYmM1
-    MjQwZDE0MmVlNTBmYjAyYWYxNjlmZDUxZDcxZmNkZDIwOTNkOTg=
+    NGYzM2U5ZDdlN2E4ZWVhYjAzMDMyNzY4NzVmZjFkNDRiMmNhMGQyZjJhZmY5
+    NjVjYjU2NTY1YmJhYjg1NjdkNWUwMjEwYjgzOGI4MjAyMWYxM2YzODMwYmI3
+    OTYzM2ZmZjZkMzlmY2Y5YTJhODI0YTFiMmM0YTI3NjgyMWI4MWU=

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 
 .env
+fixer.rb

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 rvm:
 - 2.2.3
 before_install: gem install bundler -v 1.10.6

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 ## [v0.2.2](https://github.com/TheODI-UD2D/blocktrain/tree/v0.2.2) (2015-11-11)
 [Full Changelog](https://github.com/TheODI-UD2D/blocktrain/compare/v0.2.1...v0.2.2)
 
+**Merged pull requests:**
+
+- Add task to publish gem [\#8](https://github.com/TheODI-UD2D/blocktrain/pull/8) ([pezholio](https://github.com/pezholio))
+
 ## [v0.2.1](https://github.com/TheODI-UD2D/blocktrain/tree/v0.2.1) (2015-11-10)
 [Full Changelog](https://github.com/TheODI-UD2D/blocktrain/compare/v0.2.0...v0.2.1)
 

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+# Code of Conduct
+
+All projects within the [ODI-UD2D](https://github.com/TheODI-UD2D) organisation are covered by the [Code of Conduct](https://github.com/TheODI-UD2D/code-of-conduct)

data/config/signal_aliases.yml

@@ -1 +1,88 @@
-train_speed: "@.MWT.M_T3_1.MRV_TrnSpd_1.TON_4.MRV_Xv_Trn"
+train_run_distance: "MSV_Xs_TrnRnDstTot"
+this_cab_active: "@.MWT.R_T3_1.RCV_S_ThisCabAct"
+atp_worst_case_forward_location: "@.MWT.S_ATC_T4_1.SSV_X_AtpWrstFwLocSegId"
+atp_worst_case_forward_location_offset: "@.MWT.S_ATC_T4_1.SSV_X_AtpWrstFwLocOffs"
+train_speed: "@.MWT.M_T3_1.MRV_TrnSpd_1.MRV_Xv_Trn"
+line_voltage: "@.MWT.CT_CI_T2_1.CI_COP_XU_Ln"
+line_current: "@.MWT.CT_CI_T2_1.CI_COP_XI_Ln"
+hscb_close: "@.MWT.H_T2_1.DX54_Out2_C_HscbCl"
+order_hscb_to_open_from_cop: "@.MWT.H_T3_1.HCV_C_CopHscbOp"
+cop_is_ok_for_supervision: "@.MWT.CT_CI_T3_1.CI_COP_S_CopOk"
+mcs_driving_mode_forward: "@.MWT.CT_CI_T3_1.DI13_In5_S_McsDrvMdFw"
+mcs_driving_mode_inter: "@.MWT.CT_CI_T3_1.DI13_In4_S_McsDrvMdInter"
+mcs_driving_mode_reverse: "@.MWT.CT_CI_T3_1.DI13_In3_S_McsDrvMdRv"
+mcs_driving_mode_protected_manual: "@.MWT.CT_CI_T3_1.DI13_In6_S_McsDrvMdPrMan"
+mcs_driving_mode_auto: "@.MWT.CT_CI_T3_1.DX17_In7_S_McsDrvMdAuto"
+mcs_driving_mode_selected: "@.MWT.M_T4_1.MCV_S_McsDrvMdSd"
+actuate_braking: "@.MWT.CT_CI_T2_1.DI20_In9_TrLn_AB"
+actuate_motor: "@.MWT.CT_CI_T2_1.DI20_In10_TrLn_AM"
+tr_br_effort_reference_1: "@.MWT.M_T2_1.MRV_W_PwmRef1"
+tr_br_effort_reference_2: "@.MWT.M_T2_1.MRV_W_PwmRef2"
+traction_brake_effort_reference: "@.MWT.M_T2_1.MRV_W_TrBrEffRef"
+emergency_brake_applied: "@.MWT.B_T3_1.BSV_S_EmBrApl"
+brake_cylinder_pressure_car_a_bogie_a: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarABgA"
+brake_cylinder_pressure_car_a_bogie_d: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarABgD"
+brake_cylinder_pressure_car_b_bogie_a: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarBBgA"
+brake_cylinder_pressure_car_b_bogie_d: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarBBgD"
+brake_cylinder_pressure_car_c_bogie_a: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarCBgA"
+brake_cylinder_pressure_car_c_bogie_d: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarCBgD"
+brake_cylinder_pressure_car_d_bogie_a: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarDBgA"
+brake_cylinder_pressure_car_d_bogie_d: "@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarDBgD"
+main_reservoir_pressure: "@.MWT.CT_CI_T4_1.CI_BGW_Wp_MnReservoir"
+wsp_active: "@.MWT.CT_CI_T3_1.CI_BGW_S_WspAct"
+all_doors_closed: "@.MWT.CT_CI_T3_1.DX11_In3_S_AllDrCld"
+mcm_state: "@.MWT.P_T3_1.PII_DCUM1_X_McmSt"
+mcm_state: "@.MWT.P_T3_1.PII_DCUM2_X_McmSt"
+traction_brake_achieved: "@.MWT.P_T2_1.PII_DCUM1_XF_TrBrAch"
+actual_chopper_power: "@.MWT.P_T3_1.PII_DCUM1_XP_Cp"
+actual_motor_power: "@.MWT.P_T3_1.PII_DCUM1_XP_Mt"
+available_dynamic_brake: "@.MWT.P_T3_1.PII_DCUM1_XF_BrAvl"
+estimated_brake_resistor_temparature: "@.MWT.P_T4_1.PII_DCUM1_XT_EstBrRs"
+estimated_brake_resistor_temparature: "@.MWT.P_T4_1.PII_DCUM2_XT_EstBrRs"
+actual_chopper_power: "@.MWT.P_T3_1.PII_DCUM2_XP_Cp"
+actual_motor_power: "@.MWT.P_T4_1.PII_DCUM2_XP_Mt"
+available_dynamic_brake: "@.MWT.P_T3_1.PII_DCUM2_XF_BrAvl"
+dynamic_brake_ok: "@.MWT.P_T2_1.PII_DCUM1_S_DynBrOk"
+dynamic_brake_ok: "@.MWT.P_T2_1.PII_DCUM2_S_DynBrOk"
+lma_end_location: "@.MWT.CT_CI_T4_1.CI_ATP1_X_LmaEndLocSegId"
+lma_end_location_offset: "@.MWT.CT_CI_T4_1.CI_ATP1_X_LmaEndLocOffset"
+lma_end_location: "@.MWT.CT_CI_T4_1.CI_ATP2_X_LmaEndLocSegId"
+lma_end_location_offset: "@.MWT.CT_CI_T4_1.CI_ATP2_X_LmaEndLocOffset"
+ato_start_button_1_pressed: "@.MWT.CT_CI_T3_1.DI13_In7_S_AtoPb1Act"
+ato_start_button_2_pressed: "@.MWT.CT_CI_T3_1.DI13_In8_S_AtoPb2Act"
+passesnger_load_car_a: "@.MWT.B_T5_1.BRV_X_prctPssngrLdCarA"
+passesnger_load_car_b: "@.MWT.B_T5_1.BRV_X_prctPssngrLdCarB"
+passesnger_load_car_c: "@.MWT.B_T5_1.BRV_X_prctPssngrLdCarC"
+passesnger_load_car_d: "@.MWT.B_T5_1.BRV_X_prctPssngrLdCarD"
+passenger_load_to_ato: "@.MWT.B_T5_1.BRV_X_TrnLd"
+compressor_start: "@.MWT.A_T4_1.ACV_C_CmprSta"
+compressor_motor_running: "@.MWT.A_T4_1.ASV_S_CmprMtRn"
+pressure_low_limit: "@.MWT.A_T4_1.ACV_MsCmpr_1.P_Xp_PrsLoLim"
+pressure_low_limit: "@.MWT.A_T4_1.ASV_AirPrs_1.P_Xp_PrsLoLim"
+sync_all_clocks: "@.MWT.CT_CO_T4_1.CP_C_TrgSncAll"
+sync_local_clock: "@.MWT.CT_CO_T4_1.CP_C_TrgSncLc"
+sync_master_clock_from_pdp1: "@.MWT.CT_CO_T4_1.CP_C_TrgSncMsPdp1"
+sync_master_clock_from_pdp2: "@.MWT.CT_CO_T4_1.CP_C_TrgSncMsPdp2"
+sync_pdp_clock: "@.MWT.CT_CO_T4_1.CP_C_TrgSncPdp"
+year: "@.MWT.CT_CO_T4_1.CP_X_AnsiYear"
+month: "@.MWT.CT_CO_T4_1.CP_X_AnsiMon"
+day: "@.MWT.CT_CO_T4_1.CP_X_AnsiDay"
+hour: "@.MWT.CT_CO_T4_1.CP_X_AnsiHour"
+minute: "@.MWT.CT_CO_T4_1.CP_X_AnsiMin"
+second: "@.MWT.CT_CO_T4_1.CP_X_AnsiSec"
+train_number: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnNo"
+crew_number: "@.MWT.S_ATC_T4_1.CO_ATO_X_CrwNo"
+destination_code: "@.MWT.S_ATC_T4_1.CO_ATO_X_DstntnCode"
+train_service_code: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnSrvCode"
+train_fault_report_code: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnFltRepCode"
+train_stock_type: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnStckTp"
+train_unit_number_1st: "@.MWT.S_ATC_T4_1.CO_ATO_X_FrstTrnUntId"
+train_unit_number_2nd: "@.MWT.S_ATC_T4_1.CO_ATO_X_SecTrnUntId"
+train_mode: "@.MWT.S_ATC_T4_1.CO_ATO_X_TrnMd"
+a_car_temperature: "@.MWT.CT_CI_T5_1.AX19_In2_X_AcarTmp"
+b_car_temperature: "@.MWT.CT_CI_T5_1.AX19_In4_X_BcarTmp"
+c_car_temperature: "@.MWT.CT_CI_T4_1.AX47_In4_X_CcarTmp"
+d_car_temperature: "@.MWT.CT_CI_T4_1.AX47_In2_X_DcarTmp"
+pv1_temperature: "@.MWT.K_T5_1.KCV_X_PrsVnt1TmpIn"
+pv1_temperature: "@.MWT.K_T5_1.KEV_X_PrsVnt1Tmp"
+pv2_temperature: "@.MWT.K_T5_1.KEV_X_PrsVnt2Tmp"

data/config/sources/signals.csv

@@ -0,0 +1,122 @@
+Signal Name,Memory Address,Signal Description,VCU's Logged,,JSON,,Type,Format,Description
+MSV_Xs_TrnRnDstTot,2e49278L,Train Run distance,"82,88",,"""2e49278L,""",2E49278L,Value,32 bit signed int,Odometer
+@.MWT.R_T3_1.RCV_S_ThisCabAct,2e4adec,This Cab Active,"82,88",,"""2e4adec,""",2E4ADEC,Status Flag,boolean,
+@.MWT.S_ATC_T4_1.SSV_X_AtpWrstFwLocSegId,2e5485aW,ATP worst case forward location,"82,88",,"""2e5485aW,""",2E5485AW,Value,16 bit signed int,Which segment train is in - see attached map
+@.MWT.S_ATC_T4_1.SSV_X_AtpWrstFwLocOffs,2e54858W,ATP worst case forward location Offset,"82,88",,"""2e54858W,""",2E54858W,Value,16 bit signed int,How far train is into segment
+@.MWT.M_T3_1.MRV_TrnSpd_1.MRV_Xv_Trn,2e491eeW,Train Speed,"82,88",,"""2e491eeW,""",2E491EEW,Value,16 bit signed int,
+@.MWT.CT_CI_T2_1.CI_COP_XU_Ln,2e4414aW,Line Voltage,"82,84,86,88",,"""2e4414aW,""",2E4414AW,Value,16 bit signed int,
+@.MWT.CT_CI_T2_1.CI_COP_XI_Ln,2e4414cW,Line Current,"82,84,86,88",,"""2e4414cW,""",2E4414CW,Value,16 bit signed int,
+@.MWT.H_T2_1.DX54_Out2_C_HscbCl,2e44cb0,HSCB Close,"82,84,86,88",,"""2e44cb0,""",2E44CB0,Status Flag,boolean,High speed circuit breaker
+@.MWT.H_T3_1.HCV_C_CopHscbOp,2e48698,Order HSCB to open from COP,"82,84,86,88",,"""2e48698,""",2E48698,Status Flag,boolean,Cut out position
+@.MWT.CT_CI_T3_1.CI_COP_S_CopOk,2e46508,COP is OK for supervision,"82,84,86,88",,"""2e46508,""",2E46508,Status Flag,boolean,
+@.MWT.CT_CI_T3_1.DI13_In5_S_McsDrvMdFw,2e4645a,MCS Driving Mode Forward,"82,88",,"""2e4645a,""",2E4645A,Status Flag,boolean,Master control switch
+@.MWT.CT_CI_T3_1.DI13_In4_S_McsDrvMdInter,2e46459,MCS Driving Mode Inter,"82,88",,"""2e46459,""",2E46459,Status Flag,boolean,
+@.MWT.CT_CI_T3_1.DI13_In3_S_McsDrvMdRv,2e46458,MCS Driving Mode Reverse,"82,88",,"""2e46458,""",2E46458,Status Flag,boolean,
+@.MWT.CT_CI_T3_1.DI13_In6_S_McsDrvMdPrMan,2e4645b,MCS Driving Mode Protected Manual,"82,88",,"""2e4645b,""",2E4645B,Status Flag,boolean,
+@.MWT.CT_CI_T3_1.DX17_In7_S_McsDrvMdAuto,2e4647f,MCS Driving Mode Auto,"82,88",,"""2e4647f,""",2E4647F,Status Flag,boolean,
+@.MWT.M_T4_1.MCV_S_McsDrvMdSd,2e55a2d,MCS Driving Mode Selected,"82,88",,"""2e55a2d,""",2E55A2D,Status Flag,boolean,
+@.MWT.CT_CI_T2_1.DI20_In9_TrLn_AB,2e44126,Actuate Braking,"82,88",,"""2e44126,""",2E44126,Status Flag,boolean,
+@.MWT.CT_CI_T2_1.DI20_In10_TrLn_AM,2e44127,Actuate Motor,"82,88",,"""2e44127,""",2E44127,Status Flag,boolean,
+@.MWT.M_T2_1.MRV_W_PwmRef1,2e450d6W,Tr/Br effort reference 1,"82,88",,"""2e450d6W,""",2E450D6W,Value,16 bit signed int,Traction/ Braking
+@.MWT.M_T2_1.MRV_W_PwmRef2,2e450d8W,Tr/Br effort reference 2,"82,88",,"""2e450d8W,""",2E450D8W,Value,16 bit signed int,
+@.MWT.M_T2_1.MRV_W_TrBrEffRef,2e450caW,Traction Brake effort reference,"82,88",,"""2e450caW,""",2E450CAW,Value,16 bit signed int,
+@.MWT.B_T3_1.BSV_S_EmBrApl,2e493ea,Emergency Brake Applied,"82,88",,"""2e493ea,""",2E493EA,Status Flag,boolean,
+@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarABgA,2e464b6W,Brake Cylinder Pressure Car A Bogie A,"82,88",,"""2e464b6W,""",2E464B6W,Value,16 bit signed int,
+@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarABgD,2e464b8W,Brake Cylinder Pressure Car A Bogie D,"82,88",,"""2e464b8W,""",2E464B8W,Value,16 bit signed int,
+@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarBBgA,2e464baW,Brake Cylinder Pressure Car B Bogie A,"82,88",,"""2e464baW,""",2E464BAW,Value,16 bit signed int,
+@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarBBgD,2e464bcW,Brake Cylinder Pressure Car B Bogie D,"82,88",,"""2e464bcW,""",2E464BCW,Value,16 bit signed int,
+@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarCBgA,2e464beW,Brake Cylinder Pressure Car C Bogie A,"82,88",,"""2e464beW,""",2E464BEW,Value,16 bit signed int,
+@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarCBgD,2e464c0W,Brake Cylinder Pressure Car C Bogie D,"82,88",,"""2e464c0W,""",2E464C0W,Value,16 bit signed int,
+@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarDBgA,2e464c2W,Brake Cylinder Pressure Car D Bogie A,"82,88",,"""2e464c2W,""",2E464C2W,Value,16 bit signed int,
+@.MWT.CT_CI_T3_1.CI_BGW_Wp_BcPrsCarDBgD,2e464c4W,Brake Cylinder Pressure Car D Bogie D,"82,88",,"""2e464c4W,""",2E464C4W,Value,16 bit signed int,
+@.MWT.CT_CI_T4_1.CI_BGW_Wp_MnReservoir,2e4cd7cW,Main Reservoir Pressure,"82,88",,"""2e4cd7cW,""",2E4CD7CW,Value,16 bit signed int,
+@.MWT.CT_CI_T3_1.CI_BGW_S_WspAct,2e464e7,WSP Active,"82,88",,"""2e464e7,""",2E464E7,Status Flag,boolean,Wheel slip protection
+@.MWT.CT_CI_T3_1.DX11_In3_S_AllDrCld,2e4643b,All Doors Closed,"82,88",,"""2e4643b,""",2E4643B,Status Flag,boolean,
+@.MWT.P_T3_1.PII_DCUM1_X_McmSt,2e49e12W,MCM State,"82,84,86,88",,"""2e49e12W,""",2E49E12W,Value,16 bit signed int,Motor commuter module
+@.MWT.P_T3_1.PII_DCUM2_X_McmSt,2e49e30W,MCM State,"84,86",,"""2e49e30W,""",2E49E30W,Value,16 bit signed int,
+@.MWT.P_T2_1.PII_DCUM1_XF_TrBrAch,2e4540cW,Traction Brake Achieved,"82,84,86,88",,"""2e4540cW,""",2E4540CW,Value,16 bit signed int,
+@.MWT.P_T3_1.PII_DCUM1_XP_Cp,2e49eb4W,Actual Chopper Power,"82,84,86,88",,"""2e49eb4W,""",2E49EB4W,Value,16 bit signed int,Rear static brakes
+@.MWT.P_T3_1.PII_DCUM1_XP_Mt,2e49a5aW,Actual Motor Power,"82,84,86,88",,"""2e49a5aW,""",2E49A5AW,Value,16 bit signed int,
+@.MWT.P_T3_1.PII_DCUM1_XF_BrAvl,2e49e16W,Available Dynamic Brake,"82,88",,"""2e49e16W,""",2E49E16W,Value,16 bit signed int,
+@.MWT.P_T4_1.PII_DCUM1_XT_EstBrRs,2e58b40W,Estimated Brake Resistor Temparature,"82,84,86,88",,"""2e58b40W,""",2E58B40W,Value,16 bit signed int,
+@.MWT.P_T4_1.PII_DCUM2_XT_EstBrRs,2e58b42W,Estimated Brake Resistor Temparature,"84,86",,"""2e58b42W,""",2E58B42W,Value,16 bit signed int,
+@.MWT.P_T3_1.PII_DCUM2_XP_Cp,2e49eccW,Actual Chopper Power,"84,86",,"""2e49eccW,""",2E49ECCW,Value,16 bit signed int,
+@.MWT.P_T4_1.PII_DCUM2_XP_Mt,2e58a38W,Actual Motor Power,"84,86",,"""2e58a38W,""",2E58A38W,Value,16 bit signed int,
+@.MWT.P_T3_1.PII_DCUM2_XF_BrAvl,2e49e2eW,Available Dynamic Brake,"82,88",,"""2e49e2eW,""",2E49E2EW,Value,16 bit signed int,
+@.MWT.P_T2_1.PII_DCUM1_S_DynBrOk,2e45405,Dynamic Brake OK,"82,84,86,88",,"""2e45405,""",2E45405,Status Flag,boolean,
+@.MWT.P_T2_1.PII_DCUM2_S_DynBrOk,2e45415,Dynamic Brake OK,"84,86",,"""2e45415,""",2E45415,Status Flag,boolean,
+@.MWT.CT_CI_T4_1.CI_ATP1_X_LmaEndLocSegId,2e4cfacW,LMA End Location,"82,88",,"""2e4cfacW,""",2E4CFACW,Value,16 bit signed int,Limit of movement autothoity - where the train is allowed to move too
+@.MWT.CT_CI_T4_1.CI_ATP1_X_LmaEndLocOffset,2e4cfaeW,LMA End Location (Offset),"82,88",,"""2e4cfaeW,""",2E4CFAEW,Value,16 bit signed int,
+@.MWT.CT_CI_T4_1.CI_ATP2_X_LmaEndLocSegId,2e4cfc0W,LMA End Location,"82,88",,"""2e4cfc0W,""",2E4CFC0W,Value,16 bit signed int,
+@.MWT.CT_CI_T4_1.CI_ATP2_X_LmaEndLocOffset,2e4cfc2W,LMA End Location (Offset),"82,88",,"""2e4cfc2W,""",2E4CFC2W,Value,16 bit signed int,
+@.MWT.CT_CI_T3_1.DI13_In7_S_AtoPb1Act,2e4645c,ATO Start Button 1 Pressed,"82,88",,"""2e4645c,""",2E4645C,Status Flag,boolean,Automatic Train Operation
+@.MWT.CT_CI_T3_1.DI13_In8_S_AtoPb2Act,2e4645d,ATO Start Button 2 Pressed,"82,88",,"""2e4645d,""",2E4645D,Status Flag,boolean,
+@.MWT.B_T5_1.BRV_X_prctPssngrLdCarA,2e64930W,Passesnger Load Car A (%),"82,88",,"""2e64930W,""",2E64930W,Value,16 bit signed int,0-100% load - Should be 0% when empty can be as high as 20% when empty
+@.MWT.B_T5_1.BRV_X_prctPssngrLdCarB,2e64932W,Passesnger Load Car B (%),"82,88",,"""2e64932W,""",2E64932W,Value,16 bit signed int,
+@.MWT.B_T5_1.BRV_X_prctPssngrLdCarC,2e64934W,Passesnger Load Car C (%),"82,88",,"""2e64934W,""",2E64934W,Value,16 bit signed int,
+@.MWT.B_T5_1.BRV_X_prctPssngrLdCarD,2e64936W,Passesnger Load Car D (%),"82,88",,"""2e64936W,""",2E64936W,Value,16 bit signed int,
+@.MWT.B_T5_1.BRV_X_TrnLd,2e6493cW,Passenger Load to ATO (%),"82,88",,"""2e6493cW,""",2E6493CW,Value,16 bit signed int,
+@.MWT.A_T4_1.ACV_C_CmprSta,2e60bc2,Compressor Start,"82,88",,"""2e60bc2,""",2E60BC2,Status Flag,boolean,
+@.MWT.A_T4_1.ASV_S_CmprMtRn,2e60ba2,Compressor Motor Running,"82,88",,"""2e60ba2,""",2E60BA2,Status Flag,boolean,
+@.MWT.A_T4_1.ACV_MsCmpr_1.P_Xp_PrsLoLim,2e60d96W,Pressure Low Limit,"82,88",,"""2e60d96W,""",2E60D96W,Value,16 bit signed int,
+@.MWT.A_T4_1.ASV_AirPrs_1.P_Xp_PrsLoLim,2e60e5eW,Pressure Low Limit,"82,88",,"""2e60e5eW,""",2E60E5EW,Value,16 bit signed int,
+@.MWT.CT_CO_T4_1.CP_C_TrgSncAll,2e62d14,Sync All Clocks,"82,84,86,88",,"""2e62d14,""",2E62D14,Status Flag,boolean,
+@.MWT.CT_CO_T4_1.CP_C_TrgSncLc,2e62d15,Sync Local Clock,"82,84,86,88",,"""2e62d15,""",2E62D15,Status Flag,boolean,
+@.MWT.CT_CO_T4_1.CP_C_TrgSncMsPdp1,2e62d16,Sync Master Clock from PDP1,"82,84,86,88",,"""2e62d16,""",2E62D16,Status Flag,boolean,
+@.MWT.CT_CO_T4_1.CP_C_TrgSncMsPdp2,2e62d17,Sync Master Clock from PDP2,"82,84,86,88",,"""2e62d17,""",2E62D17,Status Flag,boolean,
+@.MWT.CT_CO_T4_1.CP_C_TrgSncPdp,2e62d18,Sync PDP Clock,"82,84,86,88",,"""2e62d18,""",2E62D18,Status Flag,boolean,
+@.MWT.CT_CO_T4_1.CP_X_AnsiYear,2e629c6W,Year,"82,84,86,88",,"""2e629c6W,""",2E629C6W,Value,16 bit signed int,
+@.MWT.CT_CO_T4_1.CP_X_AnsiMon,2e629c8W,Month,"82,84,86,88",,"""2e629c8W,""",2E629C8W,Value,16 bit signed int,
+@.MWT.CT_CO_T4_1.CP_X_AnsiDay,2e629caW,Day,"82,84,86,88",,"""2e629caW,""",2E629CAW,Value,16 bit signed int,
+@.MWT.CT_CO_T4_1.CP_X_AnsiHour,2e629ccW,Hour,"82,84,86,88",,"""2e629ccW,""",2E629CCW,Value,16 bit signed int,
+@.MWT.CT_CO_T4_1.CP_X_AnsiMin,2e629ceW,Minute,"82,84,86,88",,"""2e629ceW,""",2E629CEW,Value,16 bit signed int,
+@.MWT.CT_CO_T4_1.CP_X_AnsiSec,2e629d0W,Second,"82,84,86,88",,"""2e629d0W,""",2E629D0W,Value,16 bit signed int,
+@.MWT.S_ATC_T4_1.CO_ATO_X_TrnNo,2e54840W,Train Number,"82,88",,"""2e54840W,""",2E54840W,Value,16 bit signed int,
+@.MWT.S_ATC_T4_1.CO_ATO_X_CrwNo,2e54842W,Crew Number,"82,88",,"""2e54842W,""",2E54842W,Value,16 bit signed int,
+@.MWT.S_ATC_T4_1.CO_ATO_X_DstntnCode,2e54844W,Destination Code,"82,88",,"""2e54844W,""",2E54844W,Value,16 bit signed int,
+@.MWT.S_ATC_T4_1.CO_ATO_X_TrnSrvCode,2e54846W,Train Service Code,"82,88",,"""2e54846W,""",2E54846W,Value,16 bit signed int,
+@.MWT.S_ATC_T4_1.CO_ATO_X_TrnFltRepCode,2e5484aW,Train Fault Report Code,"82,88",,"""2e5484aW,""",2E5484AW,Value,16 bit signed int,
+@.MWT.S_ATC_T4_1.CO_ATO_X_TrnStckTp,2e5484cW,Train Stock Type,"82,88",,"""2e5484cW,""",2E5484CW,Value,16 bit signed int,
+@.MWT.S_ATC_T4_1.CO_ATO_X_FrstTrnUntId,2e5484eW,Train Unit Number (1st),"82,88",,"""2e5484eW,""",2E5484EW,Value,16 bit signed int,
+@.MWT.S_ATC_T4_1.CO_ATO_X_SecTrnUntId,2e54850W,Train Unit Number (2nd),"82,88",,"""2e54850W,""",2E54850W,Value,16 bit signed int,
+@.MWT.S_ATC_T4_1.CO_ATO_X_TrnMd,2e54852W,Train Mode,"82,88",,"""2e54852W,""",2E54852W,Value,16 bit signed int,
+@.MWT.CT_CI_T5_1.AX19_In2_X_AcarTmp,2e63f52W,A Car Temperature,"82,88",,"""2e63f52W,""",2E63F52W,Value,16 bit signed int,Used in AC not as reliable a reading as PV
+@.MWT.CT_CI_T5_1.AX19_In4_X_BcarTmp,2e63f54W,B Car Temperature,"82,88",,"""2e63f54W,""",2E63F54W,Value,16 bit signed int,
+@.MWT.CT_CI_T4_1.AX47_In4_X_CcarTmp,2e4cd5cW,C Car Temperature,"82,88",,"""2e4cd5cW,""",2E4CD5CW,Value,16 bit signed int,
+@.MWT.CT_CI_T4_1.AX47_In2_X_DcarTmp,2e4cd5aW,D Car Temperature,"82,88",,"""2e4cd5aW,""",2E4CD5AW,Value,16 bit signed int,
+@.MWT.K_T5_1.KCV_X_PrsVnt1TmpIn,2e66ca6W,PV1 Temperature,"82,88",,"""2e66ca6W,""",2E66CA6W,Value,16 bit signed int,More reasonable values for temperature
+@.MWT.K_T5_1.KEV_X_PrsVnt1Tmp,2e66c1cW,PV1 Temperature,"82,88",,"""2e66c1cW,""",2E66C1CW,Value,16 bit signed int,
+@.MWT.K_T5_1.KEV_X_PrsVnt2Tmp,2e66c1eW,PV2 Temperature,"82,88",,"""2e66c1eW,""",2E66C1EW,Value,16 bit signed int,
+Depot Fault Finding Signals (WR),,,,,,,,,
+@.MWT.P_T3_1.PII_DCUM1_VU_DcLk,2e49ea9,,"82,84,86,88",,"""2e49ea9,""",,,,
+@.MWT.P_T3_1.PII_DCUM2_VU_DcLk,2e49ec2,,"82,84,86,88",,"""2e49ec2,""",,,,
+@.MWT.P_T2_1.PII_DCUM1_S_SsInd,2e4540a,,"82,84,86,88",,"""2e4540a,""",,,,
+@.MWT.P_T2_1.PII_DCUM2_S_SsInd,2e4541a,,"82,84,86,88",,"""2e4541a,""",,,,
+@.MWT.P_T3_1.PII_DCUM1_Xv_AxSpd1,2e49e1eW,,"82,84,86,88",,"""2e49e1eW,""",,,,
+@.MWT.P_T3_1.PII_DCUM1_Xv_AxSpd2,2e49e20W,,"82,84,86,88",,"""2e49e20W,""",,,,
+@.MWT.P_T3_1.PII_DCUM1_Xv_AxSpd3,2e49e22W,,"82,84,86,88",,"""2e49e22W,""",,,,
+@.MWT.P_T3_1.PII_DCUM1_Xv_AxSpd4,2e49e24W,,"82,84,86,88",,"""2e49e24W,""",,,,
+@.MWT.P_T3_1.PII_DCUM2_Xv_AxSpd1,2e49e38W,,"82,84,86,88",,"""2e49e38W,""",,,,
+@.MWT.P_T3_1.PII_DCUM2_Xv_AxSpd2,2e49e3aW,,"82,84,86,88",,"""2e49e3aW,""",,,,
+@.MWT.P_T3_1.PII_DCUM2_Xv_AxSpd3,2e49e3cW,,"82,84,86,88",,"""2e49e3cW,""",,,,
+@.MWT.P_T3_1.PII_DCUM2_Xv_AxSpd4,2e49e3eW,,"82,84,86,88",,"""2e49e3eW,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarAAxA,2e647f6W,,"82,84,86,88",,"""2e647f6W,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarAAxB,2e647f8W,,"82,84,86,88",,"""2e647f8W,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarAAxC,2e647faW,,"82,84,86,88",,"""2e647faW,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarAAxD,2e647fcW,,"82,84,86,88",,"""2e647fcW,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarBAxA,2e647feW,,"82,84,86,88",,"""2e647feW,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarBAxB,2e64800W,,"82,84,86,88",,"""2e64800W,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarBAxC,2e64802W,,"82,84,86,88",,"""2e64802W,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarBAxD,2e64804W,,"82,84,86,88",,"""2e64804W,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarCAxA,2e64806W,,"82,84,86,88",,"""2e64806W,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarCAxB,2e64808W,,"82,84,86,88",,"""2e64808W,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarCAxC,2e6480aW,,"82,84,86,88",,"""2e6480aW,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarCAxD,2e6480cW,,"82,84,86,88",,"""2e6480cW,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarDAxA,2e6480eW,,"82,84,86,88",,"""2e6480eW,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarDAxB,2e64810W,,"82,84,86,88",,"""2e64810W,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarDAxC,2e64812W,,"82,84,86,88",,"""2e64812W,""",,,,
+@.MWT.B_T5_1.CI_BGW_Xv_CarDAxD,2e64814W,,"82,84,86,88",,"""2e64814W,""",,,,
+@.MWT.CT_CI_T4_1.GCV_XU_Bat,2e4cd14W,,"82,88",,"""2e4cd14W,""",,,,
+@.MWT.CT_CI_T4_1.AX57_In2_X_Bat_1,2e582f8W,,"82,88",,"""2e582f8W,""",,,,
+@.MWT.CT_CI_T4_1.AX57_In4_X_Bat_2,2e582faW,,"82,88",,"""2e582faW,""",,,,
+@.MWT.CT_CI_T4_1.AX57_In1_X_BatCurSnsr,2e582f6W,,"82,88",,"""2e582f6W,""",,,,

data/lib/blocktrain/aggregations/terms_aggregation.rb

@@ -15,19 +15,22 @@ module Blocktrain
           }
         }
       end
-      
+
       def aggs
         {
           langs: {
-            terms: { field: @term }
+            terms: {
+              field: @term,
+              size: 0
+            }
           }
         }
       end
-      
+
       def results
         result['aggregations']['langs']['buckets']
       end
-      
+
     end
   end
 end

data/lib/blocktrain/lookups.rb

@@ -15,12 +15,13 @@ module Blocktrain
     def init!
       @lookups ||= {}
       # Get unique list of keys from ES
-      r = Aggregations::TermsAggregation.new(from: '2015-09-01 10:00:00Z', to: '2015-09-01 11:00:00Z', term: "memoryAddress").results
+      r = Aggregations::TermsAggregation.new(from: '2015-09-01 10:00:00Z', to: '2015-09-30 11:00:00Z', term: "memoryAddress").results
       addresses = r.map {|x| x["key"]}
       # Get a memory location for each key
       addresses.each do |address|
-        r = Query.new(from: '2015-09-01 10:00:00Z', to: '2015-09-01 11:00:00Z', memory_address: address, limit: 1).results
-        @lookups[r.first["_source"]["signalName"].to_s] = address
+        r = Query.new(from: '2015-09-01 10:00:00Z', to: '2015-09-30 11:00:00Z', memory_addresses: address, limit: 1).results
+        signal_name = remove_cruft(r.first["_source"]["signalName"].to_s)
+        @lookups[signal_name] = address
       end
       # Read aliases from file
       aliases = OpenStruct.new fetch_yaml 'signal_aliases'
@@ -34,5 +35,15 @@ module Blocktrain
     def fetch_yaml file
       YAML.load(File.open(File.join(File.dirname(__FILE__), '..', '..', 'config/%s.yml' % file)))
     end
+
+    # This will go away once we get the correct signals in the DB
+    def remove_cruft(signal)
+      parts = signal.split(".")
+      [
+        parts[0..-3].join('.'),
+        parts.pop
+      ].join('.')
+    end
+
   end
 end

data/lib/blocktrain/query.rb

@@ -2,20 +2,20 @@ module Blocktrain
   class Query
 
     def initialize(options = {})
-      @memory_address = options.fetch(:memory_address, nil)
-      @signal = options[:signal]
+      @memory_addresses = [options.fetch(:memory_addresses, nil)].flatten.compact
+      @signals = [options[:signals]].flatten.compact
 
       @from = parse_datetime(options.fetch(:from, '2015-09-01T00:00:00'))
       @to = parse_datetime(options.fetch(:to, '2015-09-02T00:00:00'))
-      
+
       @limit = options.fetch(:limit, 100)
     end
 
     def results
       result['hits']['hits']
     end
-    
-    def hits 
+
+    def hits
       result['hits']['total']
     end
 
@@ -26,12 +26,20 @@ module Blocktrain
 
     def address_query
       # Look up memory addresses directly if specified
-      return "memoryAddress:#{@memory_address}" if @memory_address
-      # No query if there isn't a signal specified
-      return nil if @signal.nil?
-      # Find the right memory address
-      lookups = Lookups.instance.lookups
-      "memoryAddress:#{lookups[@signal]}"
+      unless @memory_addresses == []
+        build_query(@memory_addresses)
+      else
+        # No query if there isn't a signal specified
+        return nil if @signals == []
+        lookups = Lookups.instance.lookups
+        @signals = @signals.map { |s| lookups[s] }
+        build_query(@signals)
+      end
+    end
+
+    def build_query(addresses)
+      addresses.map! { |a| "memoryAddress:#{a}" }
+      addresses.join(" OR ")
     end
 
     def query
@@ -42,7 +50,7 @@ module Blocktrain
         }
       }
     end
-    
+
     def filtered_query
       q = address_query
       return {} if q.nil?
@@ -52,7 +60,7 @@ module Blocktrain
         }
       }
     end
-    
+
     def filtered_filter
       {
         bool: {

data/lib/blocktrain/version.rb

@@ -1,3 +1,3 @@
 module Blocktrain
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blocktrain
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - pikesley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -219,6 +219,7 @@ files:
 - .ruby-version
 - .travis.yml
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
 - LICENSE.md
@@ -229,6 +230,7 @@ files:
 - bin/setup
 - blocktrain.gemspec
 - config/signal_aliases.yml
+- config/sources/signals.csv
 - lib/blocktrain.rb
 - lib/blocktrain/aggregation.rb
 - lib/blocktrain/aggregations/average_aggregation.rb