Merge branch 'unstable'

.travis.yml

@@ -3,9 +3,9 @@ language: c
 env:
   global:
     - MAKEFLAGS="-j2"
-    - DECODE_ARINC=./src/examples/decode_arinc
-    - SAMPLE_ADSC="d /BOMASAI.ADS.VT-ANB072501A070A988CA73248F0E5DC10200000F5EE1ABC000102B885E0A19F5"
-    - SAMPLE_CPDLC="d /AKLCDYA.AT1.B-2727A0D5470C3D803BA464FAE2A15530DA2448312641AB425383320C74009CE009090A2CCA506AA61941DCA5005763"
+    - DECODE_ACARS_APPS=./src/examples/decode_acars_apps
+    - SAMPLE_ADSC="d B6 /BOMASAI.ADS.VT-ANB072501A070A988CA73248F0E5DC10200000F5EE1ABC000102B885E0A19F5"
+    - SAMPLE_CPDLC="d BA /AKLCDYA.AT1.B-2727A0D5470C3D803BA464FAE2A15530DA2448312641AB425383320C74009CE009090A2CCA506AA61941DCA5005763"
     - DECODE_MEDIA_ADV=./src/examples/media_advisory
     - SAMPLE_MEDIA_ADV="0E2123245HV/TEXT"
 
@@ -22,9 +22,9 @@ script:
   - cmake ../
   - make VERBOSE=1
   - sudo make install
-  - ${DECODE_ARINC} ${SAMPLE_ADSC}
-  - '${DECODE_ARINC} ${SAMPLE_ADSC} | grep -q "Temperature: -62.75 C"'
-  - ${DECODE_ARINC} ${SAMPLE_CPDLC}
-  - '${DECODE_ARINC} ${SAMPLE_CPDLC} | grep -q "Flight level: 360"'
+  - ${DECODE_ACARS_APPS} ${SAMPLE_ADSC}
+  - '${DECODE_ACARS_APPS} ${SAMPLE_ADSC} | grep -q "Temperature: -62.75 C"'
+  - ${DECODE_ACARS_APPS} ${SAMPLE_CPDLC}
+  - '${DECODE_ACARS_APPS} ${SAMPLE_CPDLC} | grep -q "Flight level: 360"'
   - ${DECODE_MEDIA_ADV} ${SAMPLE_MEDIA_ADV}
   - '${DECODE_MEDIA_ADV} ${SAMPLE_MEDIA_ADV} | grep -q "Link VDL2 established at 12:32:45 UTC"'

README.md

@@ -116,9 +116,6 @@ Example apps are provided in `src/examples` subdirectory:
 - `decode_acars_apps` - reads messages from command line or from a file and
   decodes all ACARS applications supported by the library.
 
-- `decode_arinc` - decodes ARINC-622 messages (obsolete; please use
-  `decode_acars_apps` instead)
-
 - `adsc_get_position` - illustrates how to extract position-related
   fields from decoded ADS-C message.