Merge pull request #44 from terminal2/fix-bds40-decoding-high-alt-fli…

…ghts Improves high altitude flight detection of BDS40 data
terminal2 · Oct 6, 2022 · df9c40d · df9c40d · filipjonckers · Oct 7, 2022
2 parents ddbff38 + 518dd6b
commit df9c40d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/src/main/java/aero/t2s/modes/decoder/df/bds/Bds40.java b/src/main/java/aero/t2s/modes/decoder/df/bds/Bds40.java
@@ -113,7 +113,7 @@ public Bds40(short[] data) {
 
  selectedAltitude = (((data[4] & 0b01111111) << 5) | (data[5] & 0b11111000) >>> 3) * 16;
  if (statusMcp) {
- if (selectedAltitude > 50000) {
+ if (selectedAltitude > 52000) {
  invalidate();
  return;
  }
@@ -126,7 +126,7 @@ public Bds40(short[] data) {
 
  fmsAltitude = (((data[5] & 0x3) << 10) | (data[6] << 2) | ((data[7] >>> 6) & 0x3)) * 16;
  if (statusFms) {
- if (fmsAltitude <= 0 || fmsAltitude > 50000) {
+ if (fmsAltitude <= 0 || fmsAltitude > 52000) {
  invalidate();
  return;
  }

diff --git a/src/test/java/aero/t2s/modes/decoder/df/DfRealMessageTest.java b/src/test/java/aero/t2s/modes/decoder/df/DfRealMessageTest.java
@@ -1,9 +1,12 @@
 package aero.t2s.modes.decoder.df;
 
 import aero.t2s.modes.BinaryHelper;
+import aero.t2s.modes.constants.SelectedAltitudeSource;
 import aero.t2s.modes.database.ModeSDatabase;
 import aero.t2s.modes.decoder.Decoder;
 import aero.t2s.modes.decoder.UnknownDownlinkFormatException;
+import aero.t2s.modes.decoder.df.bds.Bds40;
+import aero.t2s.modes.decoder.df.bds.Bds50;
 import aero.t2s.modes.decoder.df.bds.Bds60;
 import org.junit.jupiter.api.Test;
 
@@ -35,6 +38,34 @@ public void test_bds60() throws UnknownDownlinkFormatException {
  assertEquals(32, bds.getIrsRocd());
  }
 
+ @Test
+ public void test() throws UnknownDownlinkFormatException {
+// DownlinkFormat df = testMessage("5D4CA64");
+ DownlinkFormat df = testMessage("A00006A1E3A71D30AA014672C8DF");
+
+ assertInstanceOf(DF20.class, df);
+ DF20 df20 = (DF20) df;
+ assertEquals("A48E35", df.getIcao());
+ assertEquals(51000, df20.getAltitude().getAltitude());
+
+ assertTrue(df20.isValid());
+ assertInstanceOf(Bds40.class, df20.getBds());
+
+ Bds40 bds = (Bds40) df20.getBds();
+ assertTrue(bds.isStatusTargetSource());
+ assertEquals(SelectedAltitudeSource.MCP, bds.getSelectedAltitudeSource());
+ assertTrue(bds.isStatusMcp());
+ assertEquals(51008, bds.getSelectedAltitude());
+ assertTrue(bds.isStatusFms());
+ assertEquals(51008, bds.getFmsAltitude());
+ assertTrue(bds.isStatusBaro());
+ assertEquals(1013.3, bds.getBaro(), 0.1);
+ assertTrue(bds.isStatusMcpMode());
+ assertFalse(bds.isAutopilotApproach());
+ assertFalse(bds.isAutopilotVnav());
+ assertTrue(bds.isAutopilotAltitudeHold());
+ }
+
  private DownlinkFormat testMessage(String message) throws UnknownDownlinkFormatException {
  Decoder decoder = new Decoder(new HashMap<>(), 50, 2, ModeSDatabase.createDatabase());