Forcing dslVersion="7".

commschamp · Dec 30, 2024 · e76ea73 · e76ea73
1 parent 8d7fcdb
commit e76ea73
Show file tree

Hide file tree

Showing 52 changed files with 138 additions and 142 deletions.
diff --git a/dsl/field/cfgval.xml b/dsl/field/cfgval.xml
@@ -756,7 +756,7 @@
             <validValue name="CFG_USBOUTPROT_RTCM3X" val="0x10780004" />
         </enum>
 
-        <int name="CfgValKey" type="uint32" failOnInvalid="true" displayReadOnly="true" displayName="Key" />
+        <int name="CfgValKey" type="uint32" failOnInvalid="true" fixedValue="true" displayName="Key" />
 
         <enum name="CfgValLayer" type="uint8">
             <validValue name="Ram" val="0" displayName="RAM" />
@@ -765,7 +765,7 @@
             <validValue name="Default" val="7" />
         </enum>
 
-        <variant name="CfgValPair" displayIdxReadOnlyHidden="true" forceGen="true">
+        <variant name="CfgValPair" forceGen="true">
             <!-- CFG-BDS -->
             <bundle name="BdsUsePrn1to5" displayName="CFG-BDS-USE_PRN_1_TO_5">
                 <int reuse="CfgValKey" name="Key" validValue="CfgValKeyId.CFG_BDS_USE_PRN_1_TO_5" defaultValue="CfgValKeyId.CFG_BDS_USE_PRN_1_TO_5" />
@@ -3595,7 +3595,7 @@
             </description>
             <members>
                 <ref field="CfgValKeyId" name="Key" />
-                <variant name="Val" displayIdxReadOnlyHidden="true">
+                <variant name="Val">
                     <ref field="CfgValL" name="L" displayName="L" />
                     <ref field="CfgValU1" name="U1" displayName="U1" />
                     <ref field="CfgValU2" name="U2" displayName="U2" />

diff --git a/dsl/main.xml b/dsl/main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema name="cc_ublox" endian="little" nonUniqueMsgIdAllowed="true" dslVersion="6" >
+<schema name="cc_ublox" endian="little" nonUniqueMsgIdAllowed="true" dslVersion="7" >
     <platform name="ublox5" />
     <platform name="ublox6" />
     <platform name="ublox7" />

diff --git a/dsl/message/AidAlpsrv.xml b/dsl/message/AidAlpsrv.xml
@@ -6,7 +6,7 @@
         <int name="ofs" type="uint16" />
         <int name="size" type="uint16" />
         <int name="fileId" type="uint16" />
-        <int name="dataSize" type="uint16" displayReadOnly="true"/>
+        <int name="dataSize" type="uint16"/>
         <int name="id1" type="uint8" />
         <int name="id2" type="uint8" />
         <int name="id3" type="uint32" />
@@ -17,7 +17,7 @@
         <int name="idSize" type="uint8" />        
         <int name="type" type="uint8" />        
         <int name="ofs" type="uint16" />
-        <int name="size" type="uint16" displayReadOnly="true" />
+        <int name="size" type="uint16" />
         <int name="fileId" type="uint16" />
         <list name="data" countPrefix="$size">
             <int name="element" type="uint16" displayName="_" />

diff --git a/dsl/message/AidIni.xml b/dsl/message/AidIni.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema>
     <message name="AidIni" id="MsgId.AidIni" displayName="AID-INI" platforms="-ublox9" order="0" readOverride="replace" refreshOverride="replace">
-        <optional name="ecefX" defaultMode="exist" displayExtModeCtrl="true">
+        <optional name="ecefX" defaultMode="exist">
             <int name="ecefX" type="int32" units="cm" />
         </optional>
-        <optional name="lat" defaultMode="missing" displayExtModeCtrl="true">        
+        <optional name="lat" defaultMode="missing">        
             <int name="lat" type="int32" units="deg" scaling="1/10000000" displayDecimals="7"/>
         </optional>
-        <optional name="ecefY" defaultMode="exist" displayExtModeCtrl="true">
+        <optional name="ecefY" defaultMode="exist">
             <int name="ecefY" type="int32" units="cm" />
         </optional>
-        <optional name="lon" defaultMode="missing" displayExtModeCtrl="true">        
+        <optional name="lon" defaultMode="missing">        
             <int name="lon" type="int32" units="deg" scaling="1/10000000" displayDecimals="7"/>
         </optional>
-        <optional name="ecefZ" defaultMode="exist" displayExtModeCtrl="true">
+        <optional name="ecefZ" defaultMode="exist">
             <int name="ecefZ" type="int32" units="cm" />
         </optional>
-        <optional name="alt" defaultMode="missing" displayExtModeCtrl="true">        
+        <optional name="alt" defaultMode="missing">        
             <int name="alt" type="int32" units="cm"/>
         </optional>
         <int name="posAcc" type="uint32" units="cm" />
@@ -25,19 +25,19 @@
             <bit name="tm1" idx="4" />
             <bit name="f1" idx="6" />
         </set>
-        <optional name="wno" defaultMode="exist" displayExtModeCtrl="true">
+        <optional name="wno" defaultMode="exist">
             <int name="wno" type="uint16" units="weeks" />
         </optional>
-        <optional name="date" defaultMode="missing" displayExtModeCtrl="true">
+        <optional name="date" defaultMode="missing">
             <bundle name="dateBundle" displayName="_">
                 <int name="year" type="int16" length="1" serOffset="-2000" defaultValue="2000" validRange="[2000, 2255]"/>
                 <int name="month" type="uint8" />
             </bundle>
         </optional>
-        <optional name="tow" defaultMode="exist" displayExtModeCtrl="true">
+        <optional name="tow" defaultMode="exist">
             <int name="tow" type="uint32" units="ms" />
         </optional>
-        <optional name="time" defaultMode="missing" displayExtModeCtrl="true">
+        <optional name="time" defaultMode="missing">
             <bundle name="timeBundle" displayName="_">
                 <int name="day" type="uint8" units="days"/>
                 <int name="hour" type="uint8" units="hours"/>
@@ -48,16 +48,16 @@
         <int name="towNs" type="int32" units="ns" />
         <int name="tAccMs" type="uint32" units="ms" />
         <int name="tAccNs" type="uint32" units="ns" />
-        <optional name="clkD" defaultMode="exist" displayExtModeCtrl="true">
+        <optional name="clkD" defaultMode="exist">
             <int name="clkD" type="int32" units="ns" />
         </optional>
-        <optional name="freq" defaultMode="missing" displayExtModeCtrl="true">
+        <optional name="freq" defaultMode="missing">
             <int name="freq" type="int32" units="hz" scaling="1/100" displayDecimals="2" />
         </optional>
-        <optional name="clkDAcc" defaultMode="exist" displayExtModeCtrl="true">
+        <optional name="clkDAcc" defaultMode="exist">
             <int name="clkDAcc" type="uint32" units="ns" />
         </optional>
-        <optional name="freqAcc" defaultMode="missing" displayExtModeCtrl="true">
+        <optional name="freqAcc" defaultMode="missing">
             <int name="freqAcc" type="uint32" />
         </optional>
         <set name="flags" length="4">

diff --git a/dsl/message/CfgDosc.xml b/dsl/message/CfgDosc.xml
@@ -2,7 +2,7 @@
 <schema>
     <message name="CfgDosc" id="MsgId.CfgDosc" displayName="CFG-DOSC" order="0" platforms="+ublox8">
         <int name="version" type="uint8" validValue="0" />
-        <int name="numOsc" type="uint8" displayReadOnly="true"/>
+        <int name="numOsc" type="uint8"/>
         <ref field="res2" name="reserved1" />
         <list name="list" countPrefix="$numOsc">
             <bundle name="element" displayName="_">

diff --git a/dsl/message/CfgEsrc.xml b/dsl/message/CfgEsrc.xml
@@ -2,7 +2,7 @@
 <schema>
     <message name="CfgEsrc" id="MsgId.CfgEsrc" displayName="CFG-ESRC" order="0" platforms="+ublox8">
         <int name="version" type="uint8" validValue="0" />
-        <int name="numSources" type="uint8" displayReadOnly="true"/>
+        <int name="numSources" type="uint8"/>
         <ref field="res2" name="reserved1" />
         <list name="list" countPrefix="$numSources">
             <bundle name="element" displayName="_">

diff --git a/dsl/message/CfgFixseed.xml b/dsl/message/CfgFixseed.xml
@@ -2,7 +2,7 @@
 <schema>
     <message name="CfgFixseed" id="MsgId.CfgFixseed" displayName="CFG-FIXSEED" platforms="+ublox8" sender="client">
         <int name="version" type="uint8" defaultValidValue="2" />
-        <int name="length" type="uint8" displayReadOnly="true" validRange="[1, 10]" />
+        <int name="length" type="uint8" validRange="[1, 10]" />
         <ref field="res2" name="reserved1" />
         <int name="seedHi" type="uint32" />
         <int name="seedLo" type="uint32" />

diff --git a/dsl/message/CfgGeofence.xml b/dsl/message/CfgGeofence.xml
@@ -2,7 +2,7 @@
 <schema>
     <message name="CfgGeofence" id="MsgId.CfgGeofence" displayName="CFG-GEOFENCE" order="0" platforms="+ublox8,ublox9">
         <int name="version" type="uint8" validValue="0" />
-        <int name="numFences" type="uint8" displayReadOnly="true"/>
+        <int name="numFences" type="uint8"/>
         <int name="confLvl" type="uint8" />
         <ref field="res1" name="reserved1" />
         <enum name="pioEnabled" type="uint8" >

diff --git a/dsl/message/CfgGnss.xml b/dsl/message/CfgGnss.xml
@@ -4,7 +4,7 @@
         <int name="msgVer" type="uint8" validValue="0" />
         <int name="numTrkChHw" type="uint8" />
         <int name="numTrkChUse" type="uint8" />
-        <int name="numConfigBlocks" type="uint8" displayReadOnly="true" />
+        <int name="numConfigBlocks" type="uint8" />
         <list name="list" countPrefix="$numConfigBlocks">
             <bundle name="element" displayName="_">
                 <ref field="gnssId" />
@@ -16,7 +16,7 @@
                         <bit name="enable" idx="0" />
                     </set>
                     <int name="sigCfgMask" type="uint8" />
-                    <int reuse="res1" name="reserved" displayHidden="true"/>
+                    <int reuse="res1" name="reserved"/>
                 </bitfield>
             </bundle>
         </list>

diff --git a/dsl/message/CfgNavx5.xml b/dsl/message/CfgNavx5.xml
@@ -27,7 +27,7 @@
     </fields>
 
     <message name="CfgNavx5V3" id="MsgId.CfgNavx5" displayName="CFG-NAVX5" order="0" platforms="+ublox8">
-        <int name="version" type="uint16" defaultValidValue="3" failOnInvalid="true" displayReadOnly="true"/>
+        <int name="version" type="uint16" defaultValidValue="3" failOnInvalid="true" fixedValue="true" />
         <ref field="CfgNavx5Mask1" name="mask1" />
         <ref field="CfgNavx5Mask2" name="mask2" />
         <ref field="res2" name="reserved1" />
@@ -55,7 +55,7 @@
     </message>
 
     <message name="CfgNavx5V2" id="MsgId.CfgNavx5" displayName="CFG-NAVX5" order="1" platforms="+ublox8, ublox9">
-        <int name="version" type="uint16" defaultValidValue="2" failOnInvalid="true"  displayReadOnly="true"/>
+        <int name="version" type="uint16" defaultValidValue="2" failOnInvalid="true" />
         <ref field="CfgNavx5Mask1" name="mask1" />
         <ref field="CfgNavx5Mask2" name="mask2" />
         <ref field="res2" name="reserved1" />
@@ -81,7 +81,7 @@
     </message>
 
     <message name="CfgNavx5" id="MsgId.CfgNavx5" displayName="CFG-NAVX5" order="2" platforms="-ublox9">
-        <int name="version" type="uint16" defaultValidValue="0" failOnInvalid="true"  displayReadOnly="true"/>
+        <int name="version" type="uint16" defaultValidValue="0" failOnInvalid="true" />
         <ref field="CfgNavx5Mask1" name="mask1" />
         <ref field="CfgNavx5Mask2" name="mask2" />
         <ref field="res2" name="reserved1" />

diff --git a/dsl/message/CfgNmea.xml b/dsl/message/CfgNmea.xml
@@ -51,7 +51,7 @@
         <ref field="cfgNmeaSvNumbering" name="svNumbering" />
         <ref field="cfgMainTalkerId" name="mainTalkerId" />
         <ref field="cfgNmeaGsvTalkerId" name="gsvTalkerId" />
-        <int name="version" type="uint8" defaultValidValue="1" failOnInvalid="true" displayReadOnly="true"/>
+        <int name="version" type="uint8" defaultValidValue="1" failOnInvalid="true" fixedValue="true" />
         <data name="bdsTalkerId" length="2" />
         <ref field="res6" name="reserved1" />
     </message>
@@ -65,7 +65,7 @@
         <ref field="cfgNmeaSvNumbering" name="svNumbering" />
         <ref field="cfgMainTalkerId" name="mainTalkerId" />
         <ref field="cfgNmeaGsvTalkerId" name="gsvTalkerId" />
-        <int name="version" type="uint8" validValue="0" failOnInvalid="true" displayReadOnly="true"/>
+        <int name="version" type="uint8" validValue="0" failOnInvalid="true" fixedValue="true" />
     </message>
 
     <message name="CfgNmea" id="MsgId.CfgNmea" displayName="CFG-NMEA" order="2" platforms="-ublox9">    

diff --git a/dsl/message/CfgOdo.xml b/dsl/message/CfgOdo.xml
@@ -17,7 +17,7 @@
                 <validValue name="Car" val="3" />
                 <validValue name="Custom" val="4" />
             </enum>
-            <int reuse="res1" bitLength="5" name="reserved" displayHidden="true" />
+            <int reuse="res1" bitLength="5" name="reserved" />
         </bitfield>
         <ref field="res6" name="reserved2" />
         <int name="cogMaxSpeed" type="uint8" units="m/s" scaling="1/10" displayDecimals="1" />

diff --git a/dsl/message/CfgPm2.xml b/dsl/message/CfgPm2.xml
@@ -22,11 +22,11 @@
                 <validValue name="OnOff" val="0" displayName="ON/OFF" />
                 <validValue name="Cyclic" val="1" />
             </enum>
-            <int reuse="res2" name="reserved" bitLength="13" displayHidden="true" />
+            <int reuse="res2" name="reserved" bitLength="13" />
         </bitfield>
     </fields>
     <message name="CfgPm2V2" id="MsgId.CfgPm2" displayName="CFG-PM2 (V2)" order="0" platforms="+ublox8">
-        <int name="version" type="uint8" defaultValidValue="2" failOnInvalid="true"  displayReadOnly="true"/>
+        <int name="version" type="uint8" defaultValidValue="2" failOnInvalid="true" fixedValue="true" />
         <ref field="res1" name="reserved1" />
         <int name="maxStartupStateDur" type="uint8" units="s" />
         <ref field="res1" name="reserved2" />
@@ -43,7 +43,7 @@
     </message>
 
     <message name="CfgPm2" id="MsgId.CfgPm2" displayName="CFG-PM2" order="1" platforms="-ublox5,ublox9">
-        <int name="version" type="uint8" defaultValidValue="1" failOnInvalid="true" displayReadOnly="true" />
+        <int name="version" type="uint8" defaultValidValue="1" failOnInvalid="true" />
         <ref field="res1" name="reserved1" />
         <int name="maxStartupStateDur" type="uint8" units="s" />
         <ref field="res1" name="reserved2" />

diff --git a/dsl/message/CfgPrt.xml b/dsl/message/CfgPrt.xml
@@ -32,16 +32,15 @@
     </fields>
 
     <message name="CfgPrtDdc" id="MsgId.CfgPrt" displayName="CFG-PRT (DDC)" order="0">
-        <int name="portId" type="uint8" defaultValidValue="cfgPrtPortId.DDC">
+        <int name="portId" type="uint8" defaultValidValue="cfgPrtPortId.DDC" fixedValue="true">
             <failOnInvalid value="true" />
-            <displayReadOnly value="true" />
         </int>
         <ref field="res1" name="reserved1" />
         <ref field="cfgPrtTxReady" name="txReady" />
         <bitfield name="mode">
-            <int reuse="res1" name="reservedLow" bitLength="1" displayHidden="true" />
+            <int reuse="res1" name="reservedLow" bitLength="1" />
             <int name="slaveAddr" type="uint8" bitLength="7" validRange="[0x7, 0x78]" />
-            <int reuse="res3" name="reservedHigh" bitLength="24" displayHidden="true" />
+            <int reuse="res3" name="reservedHigh" bitLength="24" />
         </bitfield>
         <ref field="res4" name="reserved2" />
         <ref field="cfgPrtInProtoMask" name="inProtoMask" />
@@ -51,21 +50,20 @@
     </message>
 
     <message name="CfgPrtUart" id="MsgId.CfgPrt" displayName="CFG-PRT (UART)" order="1">
-        <int name="portId" type="uint8" defaultValidValue="cfgPrtPortId.UART">
+        <int name="portId" type="uint8" defaultValidValue="cfgPrtPortId.UART" fixedValue="true">
             <failOnInvalid value="true" />
-            <displayReadOnly value="true" />
         </int>
         <ref field="res1" name="reserved1" />
         <ref field="cfgPrtTxReady" name="txReady" />
         <bitfield name="mode">
-            <int reuse="res1" name="reservedLow" bitLength="6" displayHidden="true" />
+            <int reuse="res1" name="reservedLow" bitLength="6" />
             <enum name="charLen" type="uint8" bitLength="2" defaultValue="Bits8">
                 <validValue name="Bits5" val="0" displayName="5 bits" />
                 <validValue name="Bits6" val="1" displayName="6 bits" />
                 <validValue name="Bits7" val="2" displayName="7 bits" />
                 <validValue name="Bits8" val="3" displayName="8 bits" />
             </enum>
-            <int reuse="res1" name="reservedMid" bitLength="1" displayHidden="true" />
+            <int reuse="res1" name="reservedMid" bitLength="1" />
             <enum name="parity" type="uint8" bitLength="3" defaultValue="None">
                 <validValue name="Even" val="0"/>
                 <validValue name="Odd" val="1"/>
@@ -78,7 +76,7 @@
                 <validValue name="Bits_2" val="2" displayName="2 bits" />
                 <validValue name="Bits_0_5" val="3" displayName="0.5 bit" />
             </enum>                    
-            <int reuse="res3" name="reservedHigh" bitLength="18" displayHidden="true" />
+            <int reuse="res3" name="reservedHigh" bitLength="18" />
         </bitfield>
         <int name="baudRate" type="uint32" defaultValue="115200" />
         <ref field="cfgPrtInProtoMask" name="inProtoMask" />
@@ -88,9 +86,8 @@
     </message>
 
     <message name="CfgPrtUsb" id="MsgId.CfgPrt" displayName="CFG-PRT (USB)" order="2">
-        <int name="portId" type="uint8" defaultValidValue="cfgPrtPortId.USB">
+        <int name="portId" type="uint8" defaultValidValue="cfgPrtPortId.USB" fixedValue="true">
             <failOnInvalid value="true" />
-            <displayReadOnly value="true" />
         </int>
         <ref field="res1" name="reserved1" />
         <ref field="cfgPrtTxReady" name="txReady" />
@@ -103,14 +100,13 @@
     </message>
 
     <message name="CfgPrtSpi" id="MsgId.CfgPrt" displayName="CFG-PRT (SPI)" order="3">
-        <int name="portId" type="uint8" defaultValidValue="cfgPrtPortId.SPI">
+        <int name="portId" type="uint8" defaultValidValue="cfgPrtPortId.SPI" fixedValue="true">
             <failOnInvalid value="true" />
-            <displayReadOnly value="true" />
         </int>
         <ref field="res1" name="reserved1" />
         <ref field="cfgPrtTxReady" name="txReady" />
         <bitfield name="mode">
-            <int reuse="res1" name="reservedLow" bitLength="1" displayHidden="true" />
+            <int reuse="res1" name="reservedLow" bitLength="1" />
             <enum name="spiMode" type="uint8" bitLength="2">
                 <validValue name="Mode0" val="0" displayName="Mode 0: CPOL = 0, CPHA = 0" />
                 <validValue name="Mode1" val="1" displayName="Mode 1: CPOL = 0, CPHA = 1" />
@@ -121,7 +117,7 @@
                 <bit name="flowControl" idx="3" />
             </set>
             <int name="ffCnt" type="uint8" bitLength="6" />
-            <int reuse="res3" name="reservedHigh" bitLength="18" displayHidden="true" />
+            <int reuse="res3" name="reservedHigh" bitLength="18" />
         </bitfield>
         <ref field="res4" name="reserved2" />
         <ref field="cfgPrtInProtoMask" name="inProtoMask" />

diff --git a/dsl/message/CfgTmode2.xml b/dsl/message/CfgTmode2.xml
@@ -11,22 +11,22 @@
             <bit name="lla" idx="0" />
             <bit name="altInv" idx="1" />
         </set>
-        <optional name="ecefX" defaultMode="exist" displayExtModeCtrl="true" cond="!$flags.lla">
+        <optional name="ecefX" defaultMode="exist" cond="!$flags.lla">
             <int name="ecefX" type="int32" units="cm" />
         </optional>
-        <optional name="lat" defaultMode="missing" displayExtModeCtrl="true" cond="$flags.lla">
+        <optional name="lat" defaultMode="missing" cond="$flags.lla">
             <int name="lat" type="int32" units="deg" scaling="1/10000000" displayDecimals="7"/>
         </optional>
-        <optional name="ecefY" defaultMode="exist" displayExtModeCtrl="true" cond="!$flags.lla">
+        <optional name="ecefY" defaultMode="exist" cond="!$flags.lla">
             <int name="ecefY" type="int32" units="cm" />
         </optional>
-        <optional name="lon" defaultMode="missing" displayExtModeCtrl="true" cond="$flags.lla">
+        <optional name="lon" defaultMode="missing" cond="$flags.lla">
             <int name="lon" type="int32" units="deg" scaling="1/10000000" displayDecimals="7"/>
         </optional>
-        <optional name="ecefZ" defaultMode="exist" displayExtModeCtrl="true" cond="!$flags.lla">
+        <optional name="ecefZ" defaultMode="exist" cond="!$flags.lla">
             <int name="ecefZ" type="int32" units="cm" />
         </optional>
-        <optional name="alt" defaultMode="missing" displayExtModeCtrl="true" cond="$flags.lla">
+        <optional name="alt" defaultMode="missing" cond="$flags.lla">
             <int name="alt" type="int32" units="cm"/>
         </optional>
         <int name="fixedPosAcc" type="uint32" units="mm" />