Fixed Operational Mode Codes

Moved `single antenna` and `GPS antenna offset` flags from V1 to V2
operational status messages.

Author: fixje

src/main/java/de/serosystems/example/ExampleDecoder.java

@@ -228,14 +228,14 @@ public void decodeMsg(long timestamp, String raw, Position receiver) {
 				System.out.println("          IDENT switch active: " + opstatA1.hasActiveIDENTSwitch());
 				System.out.println("          Has operational TCAS: " + opstatA1.hasOperationalTCAS());
 				System.out.println("          Has TCAS resolution advisory: " + opstatA1.hasTCASResolutionAdvisory());
-				System.out.println("          Uses single antenna: " + opstatA1.hasSingleAntenna());
 				System.out.println("          Supports air-referenced velocity reports: " + opstatA1.hasAirReferencedVelocity());
 
 				if (msg instanceof AirborneOperationalStatusV2Msg) {
 					System.out.println("          Gemoetric vertical accuracy: "+((AirborneOperationalStatusV2Msg) msg).getGeometricVerticalAccuracy()+"m");
 					System.out.println("          System design assurance: " + ((AirborneOperationalStatusV2Msg) msg).getSystemDesignAssurance());
 					System.out.println("          Has UAT in: " + ((AirborneOperationalStatusV2Msg) msg).hasUATIn());
 					System.out.println("          Has SIL supplement: " + ((AirborneOperationalStatusV2Msg) msg).hasSILSupplement());
+					System.out.println("          Uses single antenna: " + ((AirborneOperationalStatusV2Msg) msg).hasSingleAntenna());
 				}
 
 				break;
@@ -256,11 +256,9 @@ public void decodeMsg(long timestamp, String raw, Position receiver) {
 				System.out.println("          Has operational CDTI: " + opstatS1.hasOperationalCDTI());
 				System.out.println("          IDENT switch active: " + opstatS1.hasActiveIDENTSwitch());
 				System.out.println("          Has TCAS resolution advisory: " + opstatS1.hasTCASResolutionAdvisory());
-				System.out.println("          Uses single antenna: " + opstatS1.hasSingleAntenna());
 				System.out.println("          Airplane length: " + opstatS1.getAirplaneLength() + "m");
 				System.out.println("          Airplane width: " + opstatS1.getAirplaneWidth() + "m");
 				System.out.println("          Low (<70W) TX power: " + opstatS1.hasLowTxPower());
-				System.out.println("          Encoded GPS antenna offset: " + opstatS1.getGPSAntennaOffset());
 				System.out.println("          Has track heading info: " + opstatS1.hasTrackHeadingInfo());
 
 				if (msg instanceof SurfaceOperationalStatusV2Msg) {
@@ -269,6 +267,8 @@ public void decodeMsg(long timestamp, String raw, Position receiver) {
 					System.out.println("          Navigation Accuracy Category for velocity (NACv): " + ((SurfaceOperationalStatusV2Msg) msg).getNACv());
 					System.out.println("          Has SIL supplement: " + ((SurfaceOperationalStatusV2Msg) msg).hasSILSupplement());
 					System.out.println("          Has UAT in: " + ((SurfaceOperationalStatusV2Msg) msg).hasUATIn());
+					System.out.println("          Encoded GPS antenna offset: " + ((SurfaceOperationalStatusV2Msg) msg).getGPSAntennaOffset());
+					System.out.println("          Uses single antenna: " + ((SurfaceOperationalStatusV2Msg) msg).hasSingleAntenna());
 				}
 
 				break;

src/main/java/de/serosystems/lib1090/msgs/adsb/AirborneOperationalStatusV1Msg.java

@@ -163,13 +163,6 @@ public boolean hasActiveIDENTSwitch() {
 		return (operational_mode_code & 0x1000) != 0;
 	}
 
-	/**
-	 * @return whether aircraft uses a single antenna or two
-	 */
-	public boolean hasSingleAntenna() {
-		return (operational_mode_code & 0x400) != 0;
-	}
-
 	/**
 	 * @return the version number of the formats and protocols in use on the aircraft installation.<br>
 	 * 0: Conformant to DO-260/ED-102 and DO-242<br>

src/main/java/de/serosystems/lib1090/msgs/adsb/AirborneOperationalStatusV2Msg.java

@@ -97,6 +97,13 @@ public boolean hasUATIn() {
 		return (capability_class_code & 0x20) != 0;
 	}
 
+	/**
+	 * @return whether aircraft uses a single antenna or two
+	 */
+	public boolean hasSingleAntenna() {
+		return (operational_mode_code & 0x400) != 0;
+	}
+
 	/**
 	 * @return the encoded geometric vertical accuracy (see DO-260B 2.2.3.2.7.2.8)
 	 */

src/main/java/de/serosystems/lib1090/msgs/adsb/SurfaceOperationalStatusV1Msg.java

@@ -154,20 +154,6 @@ public boolean hasActiveIDENTSwitch() {
 		return (operational_mode_code & 0x1000) != 0;
 	}
 
-	/**
-	 * @return whether aircraft uses a single antenna or two
-	 */
-	public boolean hasSingleAntenna() {
-		return (operational_mode_code & 0x400) != 0;
-	}
-
-	/**
-	 * @return encoded longitudinal distance of the GPS Antenna from the NOSE of the aircraft
-	 * (see Table A-34, RTCA DO-260B)
-	 */
-	public byte getGPSAntennaOffset() {
-		return (byte) (operational_mode_code & 0xFF);
-	}
 
 	/**
 	 * According to DO-260B Table 2-74. Compatible with ADS-B version 1 and 2
@@ -231,8 +217,6 @@ public byte getSIL() {
 		return sil;
 	}
 
-	// TODO use in Surface position message?
-
 	/**
 	 * @return the Track Angle/Heading allows correct interpretation of the data
 	 * contained in the Heading/Ground Track subfield of ADS-B Surface

src/main/java/de/serosystems/lib1090/msgs/adsb/SurfaceOperationalStatusV2Msg.java

@@ -101,6 +101,13 @@ public boolean getNICSupplementC() {
 		return (capability_class_code & 0x10) != 0;
 	}
 
+	/**
+	 * @return whether aircraft uses a single antenna or two
+	 */
+	public boolean hasSingleAntenna() {
+		return (operational_mode_code & 0x400) != 0;
+	}
+
 	/**
 	 * For interpretation see Table 2-65 in DO-260B
 	 *
@@ -110,6 +117,14 @@ public byte getSystemDesignAssurance() {
 		return (byte) ((operational_mode_code & 0x300) >>> 8);
 	}
 
+	/**
+	 * @return encoded longitudinal and lateral distance of the GPS Antenna from the NOSE of the aircraft
+	 * (see Table A-33 and A-34, RTCA DO-260B)
+	 */
+	public byte getGPSAntennaOffset() {
+		return (byte) (operational_mode_code & 0xFF);
+	}
+
 	/**
 	 * DO-260B 2.2.3.2.7.2.14
 	 *