Add new xml registers for MDC upgrade

diff --git a/web/htdocs/addons/mdcupgrade.pl b/web/htdocs/addons/mdcupgrade.pl
index 6d22ff360d4ffce8727fed3cf30c4852d859bf4c..e6468fa021515dc42124123dd39c64e04f20ee26 100755 (executable)
--- a/web/htdocs/addons/mdcupgrade.pl
+++ b/web/htdocs/addons/mdcupgrade.pl
@@ -41,12 +41,13 @@ push(@setup,({name      => "HitCount",
               rates     => 1,
               address   => 1}));              
 
-push(@setup,({name      => "ADCControl", 
-              cmd       => "ADC_Controller-0xfe90-Control",
+push(@setup,({name      => "OEPControl", 
+              cmd       => "MDCUpgrade-0xfe90-OepConfig",
               period    => 1000,
               rates     => 1,
               address   => 1}));  
-push(@setup,({name      => "ADCResult", 
+              
+push(@setup,({name      => "ADC", 
               cmd       => "ADC_Controller-0xfe90-Results",
               period    => 1000,
               rates     => 1,

diff --git a/xml-db/database/I2C.xml b/xml-db/database/I2C.xml
index abdec1c5b0329582b3b40bf4f24c12589472b3ce..8e8b025ca3548071d6c70bb8da11134b862db5e9 100644 (file)
--- a/xml-db/database/I2C.xml
+++ b/xml-db/database/I2C.xml
@@ -33,8 +33,8 @@
       <field name="I2CExecute" start="7" bits="1" format="bitmask">
       <description>Trigger I2C action</description>
       </field>
-      <field name="I2CAddress" start="0" bits="7" format="hex" noflag="true" >
-        <description>I2C address byte, r/w bit is ignored</description>
+      <field name="I2CAddress" start="0" bits="7" format="hex" noflag="true" scale="2">
+        <description>I2C address byte, note: shift by 1 due to r/w bit!</description>
       </field>    
       <field name="I2CCommand" start="8" bits="8" format="hex" noflag="true" >
         <description>Command byte, sent after address</description>

diff --git a/xml-db/database/MDCUpgrade.xml b/xml-db/database/MDCUpgrade.xml
index b76d0c2e429f09e51a80f9c7b3d383595780819c..00e3b59eeec3915b7c49f36b5b88e87bcbf01346 100644 (file)
--- a/xml-db/database/MDCUpgrade.xml
+++ b/xml-db/database/MDCUpgrade.xml
@@ -86,6 +86,16 @@
     
   </group>
     
-    
+  <group name="OepConfig" address="c000"  size="11000"  purpose="config" mode="r" continuous="false">
+    <register name="OepBoardConfig" address="1580" >
+      <description>Board COnfiguration</description>
+      <field name="OepLedOff" start="0" bits="1" format="boolean"  noflag="true" mode="rw">
+        <description>Switch off LED</description>
+      </field>
+      <field name="OepFlashOverride" start="1" bits="1" format="boolean" errorflag="true" mode="rw">
+        <description>Override automatic Flash selection to select golden image</description>
+      </field>
+    </register>  
+  </group>
  
 </TrbNetEntity>