Commit 39d8c69b authored by Peter Jansweijer's avatar Peter Jansweijer

point to abscal merged in wrpc-sw proposed_master

parent 07db98c0
......@@ -9,21 +9,7 @@ Rem reference design software
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw\wrc.elf
Rem calibration software
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_1_insitu_sfp_functions\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_1_long_figer_huge_offset_solved\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_1bab25b_cb5934e\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_peter_fix_no_sdb\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_proposed_master_d64e82f_ppsi_cb5934e\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_peter_spec_v4_2_insitu_alpha_6fe568c_ppsi_cb5934e\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_rubi-170819_87dae46_ppsi_1ec7b83\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_rubi-170819_b541fcc_ppsi_cb5934e\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_rubi-170820_a018d81_ppsi_d7671ad\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_test_rubi1_9eb71bd_ppsi_3245918\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_test_rubi2_2db6d37_ppsi_ba65585\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_absolute_calibration_ce003ac_ppsi_ae60e23\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_adam_abscal_6cf47cc_ppsi_ae60e23_extra\wrc.elf
rem set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_adam_abscal_dea4eb6_ppsi_16aab89\wrc.elf
set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_adam_abscal_66f52af_ppsi_0cc9d34\wrc.elf
set elf_file_lm32_wrpc=..\..\..\sw\embedded\precompiled\wrpc-spec-sw-v4_2_proposed_master_49bb138_ppsi_0cc9d34\wrc.elf
set tag_lm32_wrpc="lm32_wrpc_memory"
......
Precompiled status after Adams merge into proposed_master (Mail d.d 30-8-2018)
peterj@Unstrut:/mnt/Ad/RnD_Projecten/WhiteRabbit/OHWR_Repositories/wrpc-sw$ git branch
Branch_wrpc-v4.0
absolute_calibration
adam-abscal
master
origin/adam_abscal
peter_clb_v3
peter_clb_v3_insitu_alpha
peter_clbv2_km3net
peter_clbv3_KPx5
peter_km3net_clb
peter_spec_v4_2_insitu_alpha
* proposed_master
rubi-180720
rubi-fix-171220
test-rubi1
test-rubi2
peterj@Unstrut:/mnt/Ad/RnD_Projecten/WhiteRabbit/OHWR_Repositories/wrpc-sw$ git log --reverse --oneline -5
16b46ec lldp: avoid polling while doing abscal
2fe8980 ppsi: turn on pps when abscal runs
72cd15f softpll: do not enable PPS output (upper levels do that)
efa50a7 introduce HAS_ABSCAL
49bb138 merge abscal
peterj@Unstrut:/mnt/Ad/RnD_Projecten/WhiteRabbit/OHWR_Repositories/wrpc-sw$ cd ppsi
peterj@Unstrut:/mnt/Ad/RnD_Projecten/WhiteRabbit/OHWR_Repositories/wrpc-sw/ppsi$ git log --reverse --oneline -5
c0a3c95 arch-wrpc/faults: support 64bit values of extra timestamp delays
b60c915 proto-ext-whiterabbit: print leading zeros in timestamps
cb5934e proto-standard: print real clockClass that was set, not a hardcoded
546edce abscal: only start pps when we start sending frames
0cc9d34 abscal: fix display of scaled_nsecs
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment