Skip to content

Commit

Permalink
Merge pull request #221 from CroatiaControlLtd/220-add-new-categories
Browse files Browse the repository at this point in the history 
Update CAT025 and CAT205
  • Loading branch information
@dsalantic
dsalantic authored Dec 4, 2023
2 parents 3267eaf + 646f3db commit af22984
Show file tree
Hide file tree
Showing 19 changed files with 1,493 additions and 711 deletions.
12 changes: 9 additions & 3 deletions HISTORY
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Version History for Asterix
===========================
0
2005-2013
0
2005-2013
Converter project.

1.0.0
Expand Down Expand Up @@ -259,4 +259,10 @@ Issue #202 Segmentation fault in python when explicit item is wrong

2.8.4 (python_v0.7.4)
Issue #207 Timestamp not created correctly
Added support for python 3.10
Added support for python 3.10

2.8.5 (python_v0.7.5)
Issue #209 replace asterix2json with asterixjson2xml in documentation
Issue #211 asterix-specs conversion fix
Issue #213 Fixed duplicate field names in I001/060 and I252/110
Issue #220 Correct CAT205 and CAT025
62 changes: 45 additions & 17 deletions asterix/config/asterix_cat025_1_2.xml → asterix/config/asterix_cat025_1_5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@

<!--
Asterix Category 025 v1.2 definition
Asterix Category 025 v1.5 definition
Author: tdoernbach
Created: 31.01.2020
Modified: 10.02.2020
04.12.2023. dsalantic names changed to match document
-->

<Category id="025" name="CNS/ATM Ground System Status Reports" ver="1.2">
<Category id="025" name="CNS/ATM Ground System Status Reports" ver="1.5">

<DataItem id="000">
<DataItemName>Report Type</DataItemName>
Expand Down Expand Up @@ -102,9 +103,9 @@
<Fixed length="1">
<Bits bit="8">
<BitsShortName>NOGO</BitsShortName>
<BitsName>Operational Release Status</BitsName>
<BitsValue val="0">Released for operational use</BitsValue>
<BitsValue val="1">Must not be used operationally</BitsValue>
<BitsName>Operational Release Status of the Data</BitsName>
<BitsValue val="0">Data is released for operational use</BitsValue>
<BitsValue val="1">Data must not be used operationally</BitsValue>
</Bits>
<Bits from="7" to="6" encode="unsigned">
<BitsShortName>OPS</BitsShortName>
Expand All @@ -121,7 +122,35 @@
<BitsValue val="1">Failed</BitsValue>
<BitsValue val="2">Degraded</BitsValue>
<BitsValue val="3">Undefined</BitsValue>
</Bits>
</Bits>
<Bits bit="1" fx="1">
<BitsShortName>FX</BitsShortName>
<BitsValue val="0">No extension</BitsValue>
<BitsValue val="1">Extension</BitsValue>
</Bits>
</Fixed>
<Fixed length="1">
<Bits bit="8">
<BitsShortName>spare</BitsShortName>
<BitsName>Spare bits set to 0</BitsName>
<BitsConst>0</BitsConst>
</Bits>
<Bits from="7" to="5" encode="unsigned">
<BitsShortName>SysSTAT</BitsShortName>
<BitsName>System Status</BitsName>
<BitsValue val="0">Running</BitsValue>
<BitsValue val="1">Failed</BitsValue>
<BitsValue val="2">Degraded</BitsValue>
<BitsValue val="3">Undefined</BitsValue>
</Bits>
<Bits from="4" to="2" encode="unsigned">
<BitsShortName>SeStTAT</BitsShortName>
<BitsName>Service Performance Status</BitsName>
<BitsValue val="0">OK</BitsValue>
<BitsValue val="1">Failed</BitsValue>
<BitsValue val="2">Degraded</BitsValue>
<BitsValue val="3">Undefined</BitsValue>
</Bits>
<Bits bit="1" fx="1">
<BitsShortName>FX</BitsShortName>
<BitsValue val="0">No extension</BitsValue>
Expand All @@ -141,11 +170,11 @@
<Bits from="8" to="1">
<BitsShortName>ERR</BitsShortName>
<BitsName>Warning and Error Code</BitsName>
<BitsValue val="0">No error</BitsValue>
<BitsValue val="0">No error detected</BitsValue>
<BitsValue val="1">Error Code Undefined</BitsValue>
<BitsValue val="2">Time Source Invalid</BitsValue>
<BitsValue val="3">Time Source Coasting</BitsValue>
<BitsValue val="4">Track ID numbering restarted</BitsValue>
<BitsValue val="4">Track ID numbering has restarted</BitsValue>
<BitsValue val="5">Data Processor Overload</BitsValue>
<BitsValue val="6">Ground Interface Data Comm Overload</BitsValue>
<BitsValue val="7">System stopped by operator</BitsValue>
Expand Down Expand Up @@ -198,13 +227,12 @@
<BitsValue val="2">Number of failed message conversions</BitsValue>
<BitsValue val="3">Total Number of messages received</BitsValue>
<BitsValue val="4">Total number of messages transmitted</BitsValue>

</Bits>
<Bits bit="40">
<BitsShortName>REF</BitsShortName>
<BitsName>Reference for counting messages</BitsName>
<BitsValue val="0">UTC midnight</BitsValue>
<BitsValue val="1">Previous Report</BitsValue>
<BitsValue val="0">From UTC midnight</BitsValue>
<BitsValue val="1">From the previous report</BitsValue>
</Bits>
<Bits from="39" to="33">
<BitsShortName>spare</BitsShortName>
Expand Down Expand Up @@ -240,13 +268,13 @@
<Fixed length="8">
<Bits from="64" to="33" encode="signed">
<BitsShortName>Lat</BitsShortName>
<BitsName>Latitude in WGS.84 in two's complement. Range -90 &lt; latitude &lt; 90 deg.</BitsName>
<BitsUnit scale="0.00000004190951586">deg</BitsUnit>
<BitsName>Latitude in WGS-84</BitsName>
<BitsUnit scale="0.00000004190951586" min="-90" max="90"> deg</BitsUnit>
</Bits>
<Bits from="32" to="1" encode="signed">
<BitsShortName>Lon</BitsShortName>
<BitsName>Longitude in WGS.84 in two's complement. Range -180 &lt; longitude &lt; 180 deg.</BitsName>
<BitsUnit scale="0.00000008381903172">deg</BitsUnit>
<BitsName>Longitude in WGS-84</BitsName>
<BitsUnit scale="0.00000008381903172" min="-180" max="180"> deg</BitsUnit>
</Bits>
</Fixed>
</DataItemFormat>
Expand All @@ -258,9 +286,9 @@
<DataItemFormat>
<Fixed length="2">
<Bits from="16" to="1" encode="signed">
<BitsShortName>Hgh</BitsShortName>
<BitsShortName>Height</BitsShortName>
<BitsName>Height above MSL.</BitsName>
<BitsUnit scale="0.25">m</BitsUnit>
<BitsUnit scale="0.25" min="-8192" max="8191.75">m</BitsUnit>
</Bits>
</Fixed>
</DataItemFormat>
Expand Down
Loading

0 comments on commit af22984

Please sign in to comment.