From 3a2543aced75949635c0ac4797232361e27b717c Mon Sep 17 00:00:00 2001 From: hadaq Date: Fri, 6 Mar 2026 16:28:06 +0100 Subject: [PATCH] added new MBO, changed helperscripts --- helperscripts/flashMBO_single.sh | 18 +-- installation/mbo_positions.db | 78 ++++++------ installation/powerdistributor_positions.db | 4 +- pasttrec/pasttrec_baseline.db | 2 +- scripts/powercycle_missing.pl | 2 +- settings_power/settings_voltage.db | 140 ++++++++++----------- 6 files changed, 122 insertions(+), 122 deletions(-) diff --git a/helperscripts/flashMBO_single.sh b/helperscripts/flashMBO_single.sh index ec15e77..8add923 100755 --- a/helperscripts/flashMBO_single.sh +++ b/helperscripts/flashMBO_single.sh @@ -1,16 +1,16 @@ -#trbflash -y program 0xf6dc ~/mdcupgrade/mdctdc_20240508.bit -trbflash -y program 0xf60e ~/trbsoft/daq/mdc/bitfiles/mdcoep_20250703_newreset.bit +trbflash program 0xf6dc ~/trbsoft/daq/mdc/bitfiles/mdctdc_20250419.bit +#trbflash -y program 0xf60e ~/trbsoft/daq/mdc/bitfiles/mdcoep_20250703_newreset.bit # activate golden image echo " golden image flashing: " -#trbcmd loadbit 0xf6dc 0xd580 0x2 0x2 -trbcmd loadbit 0xf60e 0xd580 0x2 0x2 +trbcmd loadbit 0xf6dc 0xd580 0x2 0x2 +#trbcmd loadbit 0xf60e 0xd580 0x2 0x2 sleep 2 -#trbflash -s "golden image" -y program 0xf6dc ~/mdcupgrade/mdctdc_20240508.bit -trbflash -s "golden image" -y program 0xf60e ~/trbsoft/daq/mdc/bitfiles/mdcoep_20250703_newreset.bit -trbcmd reload 0xf60e -#trbcmd reload 0xf6dc +trbflash -s "golden image" program 0xf6dc ~/trbsoft/daq/mdc/bitfiles/mdctdc_20250419.bit +#trbflash -s "golden image" -y program 0xf60e ~/trbsoft/daq/mdc/bitfiles/mdcoep_20250703_newreset.bit +#trbcmd reload 0xf60e +trbcmd reload 0xf6dc sleep 2 trbflash info 0xf60e -trbflash verify 0xf60e ~/trbsoft/daq/mdc/bitfiles/mdcoep_20250703_newreset.bit +#trbflash verify 0xf60e ~/trbsoft/daq/mdc/bitfiles/mdcoep_20250703_newreset.bit #cd ~/git/hades_mdc_settings/scripts #./autoaddress.pl diff --git a/installation/mbo_positions.db b/installation/mbo_positions.db index 9c92bad..1d04c99 100644 --- a/installation/mbo_positions.db +++ b/installation/mbo_positions.db @@ -196,22 +196,22 @@ ########################################## -2 0 0 1 0 -2 0 1 0 0 -2 0 2 0 0 -2 0 3 0 0 -2 0 4 0 0 -2 0 5 1 0 -2 0 6 1 0 -2 0 7 0 0 -2 0 8 0 0 -2 0 9 0 0 -2 0 10 0 0 -2 0 11 1 0 -2 0 12 0 0 -2 0 13 1 0 -2 0 14 1 0 -2 0 15 0 0 +2 0 0 1 794 +2 0 1 0 471 +2 0 2 0 507 +2 0 3 0 512 +2 0 4 0 559 +2 0 5 1 995 +2 0 6 1 968 +2 0 7 0 472 +2 0 8 0 577 +2 0 9 0 572 +2 0 10 0 573 +2 0 11 1 792 +2 0 12 0 539 +2 0 13 1 938 +2 0 14 1 957 +2 0 15 0 575 2 1 0 1 867 2 1 1 0 614 @@ -225,7 +225,7 @@ 2 1 9 0 586 2 1 10 0 585 2 1 11 1 967 -2 1 12 0 363 +2 1 12 0 537 #363 T sensor kaputt 2 1 13 1 962 2 1 14 1 966 2 1 15 0 375 @@ -277,8 +277,8 @@ 2 4 10 0 509 2 4 11 1 946 2 4 12 0 570 #490 -2 4 13 1 928 -2 4 14 1 923 +2 4 13 1 948 #955 #928 +2 4 14 1 875 #923 2 4 15 0 535 2 5 0 1 0 @@ -300,22 +300,22 @@ ########################################## -3 0 0 0 0 -3 0 1 0 0 -3 0 2 0 0 -3 0 3 1 0 -3 0 4 1 0 -3 0 5 0 0 -3 0 6 0 0 -3 0 7 0 0 -3 0 8 0 0 -3 0 9 1 0 -3 0 10 1 0 -3 0 11 0 0 -3 0 12 0 0 -3 0 13 1 0 -3 0 14 1 0 -3 0 15 0 0 +3 0 0 0 470 +3 0 1 0 571 +3 0 2 0 568 +3 0 3 1 889 +3 0 4 1 943 +3 0 5 0 330 +3 0 6 0 574 +3 0 7 0 553 +3 0 8 0 565 +3 0 9 1 891 +3 0 10 1 936 +3 0 11 0 469 +3 0 12 0 000 +3 0 13 1 877 +3 0 14 1 937 +3 0 15 0 465 3 1 0 0 305 3 1 1 0 438 @@ -330,7 +330,7 @@ 3 1 10 1 960 3 1 11 0 606 3 1 12 0 538 -3 1 13 1 944 +3 1 13 1 931 #944 3 1 14 1 945 3 1 15 0 544 @@ -348,7 +348,7 @@ 3 2 11 0 587 3 2 12 0 557 3 2 13 1 922 -3 2 14 1 927 +3 2 14 1 949 #927 3 2 15 0 530 3 3 0 0 612 @@ -371,7 +371,7 @@ 3 4 0 0 550 3 4 1 0 551 3 4 2 0 454 -3 4 3 1 908 +3 4 3 1 955 #908 3 4 4 1 806 3 4 5 0 378 3 4 6 0 529 @@ -382,7 +382,7 @@ 3 4 11 0 588 3 4 12 0 506 3 4 13 1 804 -3 4 14 1 926 +3 4 14 1 941 #926 3 4 15 0 522 3 5 0 0 0 diff --git a/installation/powerdistributor_positions.db b/installation/powerdistributor_positions.db index 678867c..5587b12 100644 --- a/installation/powerdistributor_positions.db +++ b/installation/powerdistributor_positions.db @@ -18,14 +18,14 @@ 1 5 065 2 0 052 - 2 1 000 + 2 1 071 2 2 053 2 3 063 2 4 056 2 5 000 3 0 000 - 3 1 000 + 3 1 075 3 2 079 3 3 051 3 4 078 diff --git a/pasttrec/pasttrec_baseline.db b/pasttrec/pasttrec_baseline.db index a559bc1..4e74da2 100644 --- a/pasttrec/pasttrec_baseline.db +++ b/pasttrec/pasttrec_baseline.db @@ -1247,7 +1247,7 @@ 4081 0 19 26 23 25 24 23 22 11 4081 1 23 23 23 25 22 27 26 17 4081 2 19 12 24 20 21 22 21 22 - 4081 3 17 21 21 24 24 19 14 23 + 4081 3 17 21 23 30 24 19 14 23 4090 0 24 23 23 14 24 23 21 18 4090 1 21 16 19 16 20 18 24 24 4090 2 26 15 17 26 23 21 23 23 diff --git a/scripts/powercycle_missing.pl b/scripts/powercycle_missing.pl index 023c408..ae2ed02 100755 --- a/scripts/powercycle_missing.pl +++ b/scripts/powercycle_missing.pl @@ -20,7 +20,7 @@ my %cycledboards; foreach my $l (@logfile) { my @d = split("\t",$l); - if (defined $d[2] && $d[1] eq 'endp' && $d[2] eq 'mdc12') { + if (defined $d[2] && $d[1] eq 'endp' && $d[2] eq 'mdc') { next if scalar @d < 7; die "Looks like too many boards missing" unless scalar @d < 50; my @boards = split(' ',$d[7]); diff --git a/settings_power/settings_voltage.db b/settings_power/settings_voltage.db index 178578a..0d7df6b 100644 --- a/settings_power/settings_voltage.db +++ b/settings_power/settings_voltage.db @@ -170,7 +170,7 @@ 0x8ead 1 1 0x8eae 1 1 0x8eaf 1 1 - 0x8eb0 1 2 + 0x8eb0 2 3 0x8eb1 2 2 0x8eb2 2 3 0x8eb3 2 3 @@ -202,49 +202,49 @@ 0x8f0d 7 7 0x8f0e 7 7 0x8f0f 7 7 - 0x8f10 7 7 - 0x8f11 7 7 - 0x8f12 7 7 - 0x8f13 7 7 - 0x8f14 7 7 - 0x8f15 7 7 - 0x8f16 7 7 - 0x8f17 7 7 - 0x8f18 7 7 - 0x8f19 7 7 - 0x8f1a 7 7 - 0x8f1b 7 7 - 0x8f1c 7 7 - 0x8f1d 7 7 - 0x8f1e 7 7 - 0x8f1f 7 7 - 0x8f20 4 5 + 0x8f10 5 5 + 0x8f11 3 3 + 0x8f12 3 3 + 0x8f13 3 3 + 0x8f14 3 3 + 0x8f15 3 3 + 0x8f16 4 5 + 0x8f17 3 3 + 0x8f18 3 3 + 0x8f19 3 3 + 0x8f1a 3 3 + 0x8f1b 3 3 + 0x8f1c 2 2 + 0x8f1d 2 3 + 0x8f1e 2 3 + 0x8f1f 2 2 + 0x8f20 4 4 0x8f21 3 3 0x8f22 3 3 - 0x8f23 3 3 + 0x8f23 2 3 0x8f24 2 3 0x8f25 3 3 0x8f26 4 4 0x8f27 3 3 - 0x8f28 3 3 + 0x8f28 2 3 0x8f29 2 3 0x8f2a 2 3 0x8f2b 3 3 - 0x8f2c 2 2 + 0x8f2c 1 2 0x8f2d 2 2 0x8f2e 2 2 0x8f2f 2 2 - 0x8f30 4 5 - 0x8f31 3 4 + 0x8f30 4 4 + 0x8f31 3 3 0x8f32 3 3 0x8f33 3 3 0x8f34 2 3 - 0x8f35 3 5 - 0x8f36 4 5 - 0x8f37 3 4 + 0x8f35 3 4 + 0x8f36 4 4 + 0x8f37 3 3 0x8f38 3 3 - 0x8f39 3 3 - 0x8f3a 3 3 + 0x8f39 2 3 + 0x8f3a 2 3 0x8f3b 3 3 0x8f3c 2 2 0x8f3d 2 2 @@ -255,16 +255,16 @@ 0x8f42 2 3 0x8f43 2 3 0x8f44 2 3 - 0x8f45 2 2 + 0x8f45 2 3 0x8f46 3 4 0x8f47 3 3 0x8f48 3 3 0x8f49 2 3 0x8f4a 2 3 - 0x8f4b 1 2 + 0x8f4b 2 3 0x8f4c 2 2 - 0x8f4d 1 1 - 0x8f4e 1 1 + 0x8f4d 2 2 + 0x8f4e 2 2 0x8f4f 2 2 0x8f50 7 7 @@ -299,69 +299,69 @@ 0x8f6d 7 7 0x8f6e 7 7 0x8f6f 7 7 - 0x8f70 7 7 - 0x8f71 7 7 - 0x8f72 7 7 - 0x8f73 7 7 - 0x8f74 7 7 - 0x8f75 7 7 - 0x8f76 7 7 - 0x8f77 7 7 - 0x8f78 7 7 - 0x8f79 7 7 - 0x8f7a 7 7 - 0x8f7b 7 7 - 0x8f7c 7 7 - 0x8f7d 7 7 - 0x8f7e 7 7 - 0x8f7f 7 7 + 0x8f70 4 4 + 0x8f71 4 4 + 0x8f72 3 4 + 0x8f73 4 4 + 0x8f74 3 4 + 0x8f75 3 3 + 0x8f76 3 4 + 0x8f77 3 4 + 0x8f78 3 3 + 0x8f79 3 4 + 0x8f7a 3 3 + 0x8f7b 3 3 + 0x8f7c 2 2 + 0x8f7d 3 3 + 0x8f7e 2 3 + 0x8f7f 2 3 0x8f80 3 4 - 0x8f81 3 4 + 0x8f81 3 3 0x8f82 3 3 - 0x8f83 4 4 - 0x8f84 3 4 - 0x8f85 3 3 + 0x8f83 3 4 + 0x8f84 3 3 + 0x8f85 2 3 0x8f86 3 4 0x8f87 3 4 - 0x8f88 3 4 + 0x8f88 3 3 0x8f89 3 4 - 0x8f8a 3 4 - 0x8f8b 3 3 + 0x8f8a 3 3 + 0x8f8b 2 3 0x8f8c 2 2 - 0x8f8d 2 3 + 0x8f8d 2 2 0x8f8e 2 3 - 0x8f8f 2 3 - 0x8f90 3 4 - 0x8f91 3 4 - 0x8f92 3 3 + 0x8f8f 2 2 + 0x8f90 3 3 + 0x8f91 3 3 + 0x8f92 2 3 0x8f93 4 4 - 0x8f94 3 4 + 0x8f94 3 3 0x8f95 2 3 0x8f96 3 4 0x8f97 3 4 - 0x8f98 3 4 - 0x8f99 4 5 + 0x8f98 3 3 + 0x8f99 5 4 0x8f9a 3 4 - 0x8f9b 3 3 + 0x8f9b 2 3 0x8f9c 2 2 - 0x8f9d 2 3 - 0x8f9e 2 3 + 0x8f9d 2 2 + 0x8f9e 2 2 0x8f9f 2 2 0x8fa0 3 4 0x8fa1 3 4 0x8fa2 3 4 0x8fa3 3 4 0x8fa4 3 4 - 0x8fa5 3 3 + 0x8fa5 2 3 0x8fa6 3 4 0x8fa7 3 4 0x8fa8 3 3 - 0x8fa9 2 3 - 0x8faa 2 3 + 0x8fa9 3 4 + 0x8faa 3 4 0x8fab 2 3 0x8fac 2 2 0x8fad 2 3 - 0x8fae 1 2 + 0x8fae 2 2 0x8faf 2 2 0x8fb0 7 7 0x8fb1 7 7 -- 2.51.0