Corrected generate_chainorder. Changed Sensor DB prototype_setup.db, run aforemention...

diff --git a/soft/toolbox/jtag_atomic/chains.ini b/soft/toolbox/jtag_atomic/chains.ini
index 837a05fc0f918b7ce434b4fa461a60c491afc138..2c49570ccccb08b28623729eb69b54e16019d528 100644 (file)
--- a/soft/toolbox/jtag_atomic/chains.ini
+++ b/soft/toolbox/jtag_atomic/chains.ini
@@ -1,6 +1,6 @@
 ;WARNING this file is generated automatically. don't edit manually.
 
-[chain1]
+[newchain1]
 FPGAtrbnetAddr=0xf308
 RAMtrbnetAddr=0xa000
 CMDreg_trbnetAddr=0xa120
@@ -38,9 +38,9 @@ guiBM_NP_defaults1=h_delay1,h_prog_ram,h_set_timing_10mhz,h_set_inout,h_maps_res
 guiBM_NP_defaults2=""
 
 
-;BEGIN GENERATE_CHAINORDER chain1
-JNR0_sensor4=sensor4.ini
-JNR1_sensor3=sensor3.ini
-JNR2_sensor2=sensor2.ini
-JNR3_sensor1=sensor1.ini
-;END GENERATE_CHAINORDER chain1
+;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/generate_chainorder.pl b/soft/toolbox/jtag_atomic/generate_chainorder.pl
index f6c683af0f0a41c30323d306c14af2aae85c16b6..fb1185f35a5e580f8576283ad63dee78295e5a5e 100755 (executable)
--- a/soft/toolbox/jtag_atomic/generate_chainorder.pl
+++ b/soft/toolbox/jtag_atomic/generate_chainorder.pl
@@ -55,7 +55,7 @@ my @chain_names = sort keys (%chains);
 open(CHAINSFILE,">", "./chains.ini") || die("Cannot open file chains.ini!");
 print CHAINSFILE ";WARNING this file is generated automatically. don't edit manually.\n";
 
-for (my $i=0;$i<3;$i++) {
+for (my $i=0;$i<scalar @chain_names;$i++) {
   my $chainname = $chain_names[$i];
   my %sensors = %{$chains{$chainname}};
   print CHAINSFILE "\n[$chainname]\n";

diff --git a/soft/toolbox/prototype_setup.db b/soft/toolbox/prototype_setup.db
index 13f7dd39a1b4fa8c3b2759997cd8199cc2a9516a..66ceb37db3064caebab14342350760073fe60305 100644 (file)
--- a/soft/toolbox/prototype_setup.db
+++ b/soft/toolbox/prototype_setup.db
@@ -92,10 +92,10 @@ sensor12  fff1
 
 key jtag
 
-sensor1    chain1       3        1.1
-sensor2    chain1       2        1.2
-sensor3    chain1       1        1.4
-sensor4    chain1       0        1.5
+sensor5    newchain1       3        1.1
+sensor6    newchain1       2        1.2
+sensor7    newchain1       1        1.4
+sensor8    newchain1       0        1.5
 
 #sensor5    chain2       3        1.7
 #sensor6    chain2       2        1.8