Corrections in CAT021, CAT048 and CAt062

CroatiaControlLtd · Sep 21, 2020 · 639344f · 639344f
1 parent e58edfa
commit 639344f
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 87 deletions.
diff --git a/asterix/config/asterix_cat021_2_4.xml b/asterix/config/asterix_cat021_2_4.xml
@@ -1302,7 +1302,7 @@
                     </Bits>
                     <Bits bit="2">
                         <BitsShortName>IDENT</BitsShortName>
-                        <BitsName>Setting of 'IDENT'-switch</BitsName>
+                        <BitsName>Setting of IDENT-switch</BitsName>
                         <BitsValue val="0">IDENT switch not active</BitsValue>
                         <BitsValue val="1">IDENT switch active</BitsValue>
                     </Bits>

diff --git a/asterix/config/asterix_cat048_1_21.xml b/asterix/config/asterix_cat048_1_21.xml
@@ -144,7 +144,7 @@
                 <Fixed length="1">
                     <Bits from="8" to="2">
                         <BitsShortName>WE</BitsShortName>
-                        <BitsName>First warning/error condition value</BitsName>
+                        <BitsName>Warning/error condition value</BitsName>
                         <BitsValue val="0">Not defined, never used</BitsValue>
                         <BitsValue val="1">Multipath Reply (Reflection)</BitsValue>
                         <BitsValue val="2">Sidelobe Reply</BitsValue>

diff --git a/asterix/config/asterix_cat062_1_18.xml b/asterix/config/asterix_cat062_1_18.xml
@@ -3056,22 +3056,7 @@
                         <BitsValue val="1">extension into next extent</BitsValue>
                     </Bits>
                 </Fixed>
-                <Fixed length="3">
-                    <Bits from="17" to="24">
-                        <BitsShortName>SDPSUID</BitsShortName>
-                        <BitsName>SDPS Unit Identification</BitsName>
-                    </Bits>
-                    <Bits from="2" to="16">
-                        <BitsShortName>STN</BitsShortName>
-                        <BitsName>System Track Number</BitsName>
-                    </Bits>
-                    <Bits bit="1" fx="1">
-                        <BitsShortName>FX</BitsShortName>
-                        <BitsValue val="0">end of data item</BitsValue>
-                        <BitsValue val="1">extension into next extent</BitsValue>
-                    </Bits>
-                </Fixed>
-            </Variable>
+             </Variable>
         </DataItemFormat>
     </DataItem>
 

diff --git a/install/config/asterix_cat021_1_8.xml b/install/config/asterix_cat021_1_8.xml
@@ -192,7 +192,7 @@
                         <BitsShortName>FX</BitsShortName>
                         <BitsName>Field Extension</BitsName>
                         <BitsValue val="0">End of item</BitsValue>
-                        <BitsValue val="1">Entension into first extent</BitsValue>
+                        <BitsValue val="1">Extension into first extent</BitsValue>
                     </Bits>
                 </Fixed>
                 <Fixed length="1">
@@ -238,7 +238,7 @@
                         <BitsShortName>FX</BitsShortName>
                         <BitsName>Field Extension</BitsName>
                         <BitsValue val="0">End of item</BitsValue>
-                        <BitsValue val="1">Entension into second extent</BitsValue>
+                        <BitsValue val="1">Extension into second extent</BitsValue>
                     </Bits>
                 </Fixed>
                 <Fixed length="1">
@@ -288,7 +288,7 @@
                         <BitsShortName>FX</BitsShortName>
                         <BitsName>Field Extension</BitsName>
                         <BitsValue val="0">End of data item</BitsValue>
-                        <BitsValue val="1">Entension into third extent</BitsValue>
+                        <BitsValue val="1">Extension into third extent</BitsValue>
                     </Bits>
                 </Fixed>
             </Variable>
@@ -462,6 +462,7 @@
                     </Bits>
                     <Bits bit="1" fx="1">
                         <BitsShortName>FX</BitsShortName>
+                        <BitsName>Extension Indicator</BitsName>
                         <BitsValue val="0">End of Data Item</BitsValue>
                         <BitsValue val="1">Extension into first extent</BitsValue>
                     </Bits>
@@ -737,7 +738,7 @@
 
     <DataItem id="148" rule="optional">
         <DataItemName>Final State Selected Altitude</DataItemName>
-        <DataItemDefinition>The vertical intent value that corresponds with the ATC cleared altitude, as derived from the Altitude Control Panel (FCU/MCP).</DataItemDefinition>
+        <DataItemDefinition>The vertical intent value that corresponds with the ATC cleared altitude, as derived from the Altitude Control Panel (MCP/FCU).</DataItemDefinition>
         <DataItemFormat desc="Two-Octet fixed length data item.">
             <Fixed length="2">
                 <Bits bit="16">
@@ -917,7 +918,7 @@
                     <BitsName>Spare bits set to zero</BitsName>
                     <BitsConst>0</BitsConst>
                 </Bits>
-                <Bits from="10" to="1">
+                <Bits from="10" to="1" encode="signed">
                     <BitsShortName>TA_rate</BitsShortName>
                     <BitsName>Track Angle Rate</BitsName>
                     <BitsUnit scale="0.03125">deg/s</BitsUnit>
@@ -1198,7 +1199,7 @@
                         </Bits>
                         <Bits bit="7">
                             <BitsShortName>TRD</BitsShortName>
-                            <BitsName>arget Report Descriptor age</BitsName>
+                            <BitsName>Target Report Descriptor age</BitsName>
                             <BitsPresence>2</BitsPresence>
                         </Bits>
                         <Bits bit="6">

diff --git a/install/config/asterix_cat021_2_4.xml b/install/config/asterix_cat021_2_4.xml
@@ -1302,7 +1302,7 @@
                     </Bits>
                     <Bits bit="2">
                         <BitsShortName>IDENT</BitsShortName>
-                        <BitsName>Setting of 'IDENT'-switch</BitsName>
+                        <BitsName>Setting of IDENT-switch</BitsName>
                         <BitsValue val="0">IDENT switch not active</BitsValue>
                         <BitsValue val="1">IDENT switch active</BitsValue>
                     </Bits>

diff --git a/install/config/asterix_cat048_1_14.xml b/install/config/asterix_cat048_1_14.xml
@@ -49,7 +49,7 @@
                         <BitsName>TYP</BitsName>
                         <BitsValue val="0">No detection</BitsValue>
                         <BitsValue val="1">Single PSR detection</BitsValue>
-						<BitsValue val="2">Single SSR detection</BitsValue>
+<BitsValue val="2">Single SSR detection</BitsValue>
                         <BitsValue val="3">PSR+SSR detection</BitsValue>
                         <BitsValue val="4">Single ModeS All-Call</BitsValue>
 						<BitsValue val="5">Single ModeS Roll-Call</BitsValue>

diff --git a/install/config/asterix_cat048_1_21.xml b/install/config/asterix_cat048_1_21.xml
@@ -144,7 +144,7 @@
                 <Fixed length="1">
                     <Bits from="8" to="2">
                         <BitsShortName>WE</BitsShortName>
-                        <BitsName>First warning/error condition value</BitsName>
+                        <BitsName>Warning/error condition value</BitsName>
                         <BitsValue val="0">Not defined, never used</BitsValue>
                         <BitsValue val="1">Multipath Reply (Reflection)</BitsValue>
                         <BitsValue val="2">Sidelobe Reply</BitsValue>

diff --git a/install/config/asterix_cat062_0_17.xml b/install/config/asterix_cat062_0_17.xml
@@ -1385,21 +1385,6 @@
 					<BitsValue val="1">extension into next extent</BitsValue>
 				</Bits>
 			</Fixed>
-			<Fixed length="3">
-				<Bits from="17" to="24">
-					<BitsShortName>SDPSUID</BitsShortName>
-					<BitsName>SDPS UNIT IDENTIFICATION</BitsName>
-				</Bits>
-				<Bits from="2" to="16">
-					<BitsShortName>STN</BitsShortName>
-					<BitsName>SYSTEM TRACK NUMBER</BitsName>
-				</Bits>
-				<Bits bit="1" fx="1">
-					<BitsShortName>FX</BitsShortName>
-					<BitsValue val="0">end of data item</BitsValue>
-					<BitsValue val="1">extension into next extent</BitsValue>
-				</Bits>
-			</Fixed>
 		</Variable>
 		</DataItemFormat>
 	</DataItem>

diff --git a/install/config/asterix_cat062_1_16.xml b/install/config/asterix_cat062_1_16.xml
@@ -3028,21 +3028,6 @@
                         <BitsValue val="1">extension into next extent</BitsValue>
                     </Bits>
                 </Fixed>
-                <Fixed length="3">
-                    <Bits from="17" to="24">
-                        <BitsShortName>SDPSUID</BitsShortName>
-                        <BitsName>SDPS Unit Identification</BitsName>
-                    </Bits>
-                    <Bits from="2" to="16">
-                        <BitsShortName>STN</BitsShortName>
-                        <BitsName>System Track Number</BitsName>
-                    </Bits>
-                    <Bits bit="1" fx="1">
-                        <BitsShortName>FX</BitsShortName>
-                        <BitsValue val="0">end of data item</BitsValue>
-                        <BitsValue val="1">extension into next extent</BitsValue>
-                    </Bits>
-                </Fixed>
             </Variable>
         </DataItemFormat>
     </DataItem>

diff --git a/install/config/asterix_cat062_1_17.xml b/install/config/asterix_cat062_1_17.xml
@@ -3037,21 +3037,6 @@
                         <BitsValue val="1">extension into next extent</BitsValue>
                     </Bits>
                 </Fixed>
-                <Fixed length="3">
-                    <Bits from="17" to="24">
-                        <BitsShortName>SDPSUID</BitsShortName>
-                        <BitsName>SDPS Unit Identification</BitsName>
-                    </Bits>
-                    <Bits from="2" to="16">
-                        <BitsShortName>STN</BitsShortName>
-                        <BitsName>System Track Number</BitsName>
-                    </Bits>
-                    <Bits bit="1" fx="1">
-                        <BitsShortName>FX</BitsShortName>
-                        <BitsValue val="0">end of data item</BitsValue>
-                        <BitsValue val="1">extension into next extent</BitsValue>
-                    </Bits>
-                </Fixed>
             </Variable>
         </DataItemFormat>
     </DataItem>

diff --git a/install/config/asterix_cat062_1_7.xml b/install/config/asterix_cat062_1_7.xml
@@ -2739,21 +2739,6 @@
 					<BitsValue val="1">extension into next extent</BitsValue>
 				</Bits>
 			</Fixed>
-			<Fixed length="3">
-				<Bits from="17" to="24">
-					<BitsShortName>SUID</BitsShortName>
-					<BitsName>SYSTEM UNIT IDENTIFICATION</BitsName>
-				</Bits>
-				<Bits from="2" to="16">
-					<BitsShortName>STN</BitsShortName>
-					<BitsName>SYSTEM TRACK NUMBER</BitsName>
-				</Bits>
-				<Bits bit="1" fx="1">
-					<BitsShortName>FX</BitsShortName>
-					<BitsValue val="0">end of data item</BitsValue>
-					<BitsValue val="1">extension into next extent</BitsValue>
-				</Bits>
-			</Fixed>
 		</Variable>
 		</DataItemFormat>
 	</DataItem>