From: Michael Wiebusch <stratomaster@gmx.net>
Date: Wed, 26 Jun 2013 17:17:13 +0000 (+0200)
Subject: created/moved specs directory
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=3a0ec928d249e4596daf5f418f8471ec6a44fb6e;p=mvdsensorcontrol.git

created/moved specs directory
---

diff --git a/config/settings.xml b/config/settings.xml
index f755437..ded0929 100644
--- a/config/settings.xml
+++ b/config/settings.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml">
-<register name="CONTROL_PIX_REG"><field name="NU" value="0"/><field name="SelPad1" value="0"/><field name="SelPad2" value="0"/><field name="RowMkLast" value="0x023F"/><field name="RowMkd" value="0"/><field name="RowMka" value="0"/></register><register name="CONTROL_SUZE_REG"><field name="NU" value="0"/><field name="SelPad3" value="0"/><field name="En_auto_scan_discri" value="0"/><field name="En_scan" value="0"/><field name="Test_after_mux" value="0"/><field name="entestdatadisc" value="0"/><field name="RowLastSuze" value="0x023F"/><field name="dualchannelout" value="0"/><field name="clkrateout" value="0"/><field name="jsupinitmem" value="1"/><field name="disckgmodgate" value="0"/><field name="cfgwr" value="0"/><field name="cfgdata" value="0"/></register><register name="DAC_BIAS"><field name="IAnaBUF" value="50"/></register></MAPS>
+<register name="CONTROL_SUZE_REG"><field name="NU" value="0"/><field name="SelPad4" value="0"/><field name="SelPad3" value="0"/><field name="En_auto_scan_discri" value="0"/><field name="En_scan" value="0"/><field name="Test_after_mux" value="0"/><field name="entestdatadisc" value="0"/><field name="RowLastSuze" value="0x23F"/><field name="ScanLineTst" value="0"/><field name="dualchannelout" value="0"/><field name="clkrateout" value="0"/><field name="jsupinitmem" value="1"/><field name="disckgmodgate" value="0"/><field name="cfgwr" value="0"/><field name="cfgdata" value="0"/><field name="cfgcs" value="0"/><field name="cfadr" value="0"/></register><register name="LINEPAT1_REG"><field name="LinePatL1Reg" value="10"/></register><register name="RO_MODE1"><field name="EnDiscriAOP" value="0"/></register></MAPS>
diff --git a/config/specifications/MIMOSA26_JTAG_SPEC.xml b/specs/MIMOSA26_JTAG_SPEC.xml
similarity index 100%
rename from config/specifications/MIMOSA26_JTAG_SPEC.xml
rename to specs/MIMOSA26_JTAG_SPEC.xml
diff --git a/xml_spielwiese/.cgitest.pl.swo b/xml_spielwiese/.cgitest.pl.swo
deleted file mode 100644
index bca9741..0000000
Binary files a/xml_spielwiese/.cgitest.pl.swo and /dev/null differ
diff --git a/xml_spielwiese/.cgitest.pl.swp b/xml_spielwiese/.cgitest.pl.swp
deleted file mode 100644
index a3e318b..0000000
Binary files a/xml_spielwiese/.cgitest.pl.swp and /dev/null differ
diff --git a/xml_spielwiese/cgitest.pl b/xml_spielwiese/cgitest.pl
index b107ac8..8603757 100755
--- a/xml_spielwiese/cgitest.pl
+++ b/xml_spielwiese/cgitest.pl
@@ -64,7 +64,7 @@ my $spectree;
 my $settree;
 
 my $confDir = '../config';
-my $specDir = '../config/specifications';
+my $specDir = '../specs';
 
 
 if ($cgiHash{'print'} eq 'fileSelection'){
@@ -311,7 +311,7 @@ for my $register (@registers ){
 	my $registerName = $register->findvalue("./\@name");
 	my $registerId = $register->findvalue("./\@id");
 	my $registerSize = $register->findvalue("./\@size");
-  my $registerDescr = prepare_text($register->findvalue("./description") || "n/a");
+  my $registerDescr = prepare_text($spectree->findvalue("/MAPS/register[\@name='""']description") || "n/a");
 
 	my $flistid = $xmlfile."//".$registerName;