From 97adcad816afaa3dc29f48967896fda790accdab Mon Sep 17 00:00:00 2001 From: Hadaq in Frankfurt Date: Thu, 28 Mar 2013 14:38:35 +0100 Subject: [PATCH] chains.ini.chain* files also changed. separated chain status/lastproginfo in monitor. bn --- soft/toolbox/jtag_atomic/.gitignore | 2 +- soft/toolbox/jtag_atomic/chains.ini | 4 +++- soft/toolbox/jtag_atomic/chains.ini.chain0 | 2 ++ soft/toolbox/jtag_atomic/chains.ini.chain1 | 2 ++ soft/toolbox/jtag_atomic/chains.ini.chain2 | 4 +++- .../jtag_atomic/jtagmonitor_lastcounters.ini | 17 ----------------- .../jtag_atomic/jtagmonitor_usechainsini4.pl | 19 ++++++++++++++----- soft/toolbox/prototype_setup.db | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 soft/toolbox/jtag_atomic/jtagmonitor_lastcounters.ini diff --git a/soft/toolbox/jtag_atomic/.gitignore b/soft/toolbox/jtag_atomic/.gitignore index e853193..a37273b 100644 --- a/soft/toolbox/jtag_atomic/.gitignore +++ b/soft/toolbox/jtag_atomic/.gitignore @@ -1 +1 @@ -jtagmonitor_lastcounters.ini +files/ diff --git a/soft/toolbox/jtag_atomic/chains.ini b/soft/toolbox/jtag_atomic/chains.ini index 2c49570..833d8e6 100644 --- a/soft/toolbox/jtag_atomic/chains.ini +++ b/soft/toolbox/jtag_atomic/chains.ini @@ -6,7 +6,10 @@ RAMtrbnetAddr=0xa000 CMDreg_trbnetAddr=0xa120 RAMbase_trbnetAddr=0xa121 DATAreg_trbnetAddr=0xa122 +STAT_NIBBLEStrbnetAddr=0x008d +STATUSCRCCHECKtrbnetAddr=0xa100 STATUS2RAM3BBASEADDRREGtrbnetAddr=0xa163 +STATUS2STARTEDtrbnetAddr=0xa164 STATUS2RAM3BtrbnetAddr=0xa170 CONFsignals_trbnetAddr=0xb020 CONFresetafterfirstwrite_trbnetAddr=0xb011 @@ -40,7 +43,6 @@ guiBM_NP_defaults2="" ;BEGIN GENERATE_CHAINORDER newchain1 JNR0_sensor8=sensor8.ini -JNR1_sensor7=sensor7.ini JNR2_sensor6=sensor6.ini JNR3_sensor5=sensor5.ini ;END GENERATE_CHAINORDER newchain1 diff --git a/soft/toolbox/jtag_atomic/chains.ini.chain0 b/soft/toolbox/jtag_atomic/chains.ini.chain0 index 02012c8..3dbdbc6 100644 --- a/soft/toolbox/jtag_atomic/chains.ini.chain0 +++ b/soft/toolbox/jtag_atomic/chains.ini.chain0 @@ -4,7 +4,9 @@ CMDreg_trbnetAddr=0xa120 RAMbase_trbnetAddr=0xa121 DATAreg_trbnetAddr=0xa122 STAT_NIBBLEStrbnetAddr=0x008d +STATUSCRCCHECKtrbnetAddr=0xa100 STATUS2RAM3BBASEADDRREGtrbnetAddr=0xa163 +STATUS2STARTEDtrbnetAddr=0xa164 STATUS2RAM3BtrbnetAddr=0xa170 CONFsignals_trbnetAddr=0xb020 CONFresetafterfirstwrite_trbnetAddr=0xb011 diff --git a/soft/toolbox/jtag_atomic/chains.ini.chain1 b/soft/toolbox/jtag_atomic/chains.ini.chain1 index 4d1866d..eeadcca 100644 --- a/soft/toolbox/jtag_atomic/chains.ini.chain1 +++ b/soft/toolbox/jtag_atomic/chains.ini.chain1 @@ -3,7 +3,9 @@ RAMtrbnetAddr=0xa000 CMDreg_trbnetAddr=0xa320 RAMbase_trbnetAddr=0xa321 DATAreg_trbnetAddr=0xa322 +STATUSCRCCHECKtrbnetAddr=0xa300 STATUS2RAM3BBASEADDRREGtrbnetAddr=0xa363 +STATUS2STARTEDtrbnetAddr=0xa364 STATUS2RAM3BtrbnetAddr=0xa370 CONFsignals_trbnetAddr=0xb021 CONFresetafterfirstwrite_trbnetAddr=0xb011 diff --git a/soft/toolbox/jtag_atomic/chains.ini.chain2 b/soft/toolbox/jtag_atomic/chains.ini.chain2 index 2b7f6bb..974abd8 100644 --- a/soft/toolbox/jtag_atomic/chains.ini.chain2 +++ b/soft/toolbox/jtag_atomic/chains.ini.chain2 @@ -3,7 +3,9 @@ RAMtrbnetAddr=0xa400 CMDreg_trbnetAddr=0xa520 RAMbase_trbnetAddr=0xa521 DATAreg_trbnetAddr=0xa522 -STATUS2RAM3BBASEADDRREGtrbnetAddr=0xe163 +STATUSCRCCHECKtrbnetAddr=0xa500 +STATUS2RAM3BBASEADDRREGtrbnetAddr=0xa563 +STATUS2STARTEDtrbnetAddr=0xa564 STATUS2RAM3BtrbnetAddr=0xa570 CONFsignals_trbnetAddr=0xb022 CONFresetafterfirstwrite_trbnetAddr=0xb011 diff --git a/soft/toolbox/jtag_atomic/jtagmonitor_lastcounters.ini b/soft/toolbox/jtag_atomic/jtagmonitor_lastcounters.ini deleted file mode 100644 index 8ff8f94..0000000 --- a/soft/toolbox/jtag_atomic/jtagmonitor_lastcounters.ini +++ /dev/null @@ -1,17 +0,0 @@ -[newchain1] -JNR3_sensor5_rerrors=12 -JNR3_sensor5_werrors=12 -JNR3_sensor5_run=4 -JNR3_sensor5_datach=6 -JNR2_sensor6_rerrors=12 -JNR2_sensor6_werrors=12 -JNR2_sensor6_run=4 -JNR2_sensor6_datach=6 -JNR1_sensor7_rerrors=12 -JNR1_sensor7_werrors=12 -JNR1_sensor7_run=4 -JNR1_sensor7_datach=6 -JNR0_sensor8_rerrors=12 -JNR0_sensor8_werrors=12 -JNR0_sensor8_run=4 -JNR0_sensor8_datach=6 diff --git a/soft/toolbox/jtag_atomic/jtagmonitor_usechainsini4.pl b/soft/toolbox/jtag_atomic/jtagmonitor_usechainsini4.pl index d95e5f6..11ebd4d 100755 --- a/soft/toolbox/jtag_atomic/jtagmonitor_usechainsini4.pl +++ b/soft/toolbox/jtag_atomic/jtagmonitor_usechainsini4.pl @@ -46,7 +46,7 @@ sub colored_table { trb_init_ports() or die trb_strerror(); my $chainsfile= './chains.ini'; -my $lastcountersfile= 'jtagmonitor_lastcounters.ini'; +my $lastcountersfile= 'files/jtagmonitor_lastcounters.ini'; my $fqa = QA::OpenQAFile(); @@ -72,6 +72,7 @@ while (1){ # my $str = Hmon::MakeDate(0,0,""); my $str = Hmon::MakeTitle(8,5,"JTAG Monitor",1); my $status_str = Hmon::MakeTitle(8,5,"JTAG Monitor",1); + my $updated_status_str = Hmon::MakeTitle(8,5,"JTAG Chain Controller Status",1); my $vert_list_counter = 0; # file to write counter values to open(my $lastcounters_fh, ">", $lastcountersfile); @@ -260,7 +261,8 @@ while (1){ elsif($botherrors == 1) { syslog("WARNING", "Only WRITE_ERROR and READ_ERROR $chain between runs $minlastruncounter and $maxruncounter. Power off?"); } - $status_str .= Hmon::MakeTitle(8,5,$chain . $last_run_successful,1); + $updated_status_str .= Hmon::MakeTitle(8,5,$chain .$last_run_successful,1); + $status_str .= Hmon::MakeTitle(8,5,$chain ,1); # Sensor 0 (first in status_table_row*) belongs at the end of the chain. @status_table_row1 = reverse @status_table_row1; @status_table_row2 = reverse @status_table_row2; @@ -281,10 +283,17 @@ while (1){ $status_str .= "

Legend

".colored_table(@legend_table) . "
"; $str = $status_str . $str; if((!($run_counter_changed == 0))||($notstarted_or_crcerrors != 0)) { - Hmon::WriteFile("jtagmonitor_usechainsini",$str); + Hmon::WriteFile("jtagmonitor_usechainsini_part1",$str); } - - + open(my $monitor_part1_fh, "<", "files/jtagmonitor_usechainsini_part1.htt"); + my $monitor_part1; + { + local $/ = undef; + $monitor_part1 = <$monitor_part1_fh>; + } + open(my $monitor_out_fh, ">", "files/jtagmonitor_usechainsini.htt"); + print $monitor_out_fh $updated_status_str; + print $monitor_out_fh $monitor_part1; } diff --git a/soft/toolbox/prototype_setup.db b/soft/toolbox/prototype_setup.db index 66ceb37..1215e9a 100644 --- a/soft/toolbox/prototype_setup.db +++ b/soft/toolbox/prototype_setup.db @@ -94,7 +94,7 @@ key jtag sensor5 newchain1 3 1.1 sensor6 newchain1 2 1.2 -sensor7 newchain1 1 1.4 +sensor7 newchain1 F 1.4 sensor8 newchain1 0 1.5 #sensor5 chain2 3 1.7 -- 2.43.0