Merge pull request #356 from rsadsb/update-deku

Update deku to 0.20.2

Author: wcampbell0x2a

Cargo.lock

@@ -55,7 +55,7 @@ use crate::airplanes::build_tab_airplanes;
 
 /// Amount of zoom out from your original lat/long position
 const MAX_PLOT_HIGH: f64 = 400.0;
-const MAX_PLOT_LOW: f64 = MAX_PLOT_HIGH * -1.0;
+const MAX_PLOT_LOW: f64 = -MAX_PLOT_HIGH;
 
 mod scale {
     /// Diff between scale changes
@@ -168,7 +168,7 @@ impl Settings {
         let (local_x, local_y) = self.local_lat_lon();
         let (x, y) = self.to_mercator(latitude, longitude);
         let (x, y) = (x - local_x, y - local_y);
-        (x, y * -1.0)
+        (x, -y)
     }
 
     /// Calculate mercator for local lat/long

apps/src/radar/radar.rs

@@ -17,7 +17,7 @@ std = ["deku/std", "alloc"]
 alloc = ["deku/alloc"]
 
 [dependencies]
-deku = { version = "0.19.0", default-features = false, features = ["bits"] }
+deku = { version = "0.20.2", default-features = false, features = ["bits"] }
 serde = { version = "1.0", features = ["derive"], optional = true }
 libm = "0.2.8"
 

libadsb_deku/Cargo.toml

@@ -4,7 +4,7 @@
 //! [`DF::TisB`]: crate::DF::TisB
 
 #[cfg(feature = "alloc")]
-use alloc::{fmt, format, string::String, vec};
+use alloc::{fmt, format, string::String};
 #[cfg(feature = "alloc")]
 use core::{
     clone::Clone,
@@ -57,6 +57,7 @@ impl ADSB {
 /// reference: ICAO 9871 (A.2.3.1)
 #[derive(Debug, PartialEq, DekuRead, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "5")]
 pub enum ME {
     #[deku(id_pat = "9..=18")]
@@ -322,6 +323,7 @@ pub struct AirspeedDecoding {
 /// Aircraft Operational Status Subtype
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "3")]
 pub enum OperationStatus {
     #[deku(id = "0")]
@@ -603,6 +605,7 @@ impl fmt::Display for OperationalMode {
 /// reference: ICAO 9871 (5.3.2.3)
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "3")]
 pub enum ADSBVersion {
     #[deku(id = "0")]
@@ -644,6 +647,7 @@ impl fmt::Display for ControlField {
 
 #[derive(Debug, PartialEq, Eq, DekuRead, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "3")]
 #[allow(non_camel_case_types)]
 pub enum ControlFieldType {
@@ -710,6 +714,7 @@ pub struct AircraftStatus {
 
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "3")]
 pub enum AircraftStatusType {
     #[deku(id = "0")]
@@ -724,6 +729,7 @@ pub enum AircraftStatusType {
 
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "3")]
 pub enum EmergencyState {
     None = 0,
@@ -784,6 +790,7 @@ pub struct Identification {
 
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "8")]
 pub enum TypeCoding {
     D = 1,
@@ -937,6 +944,7 @@ pub enum AirborneVelocitySubType {
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, DekuRead)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "3")]
 pub enum AirborneVelocityType {
     Subsonic = 1,
@@ -975,6 +983,7 @@ impl AirborneVelocitySubFields {
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, DekuRead)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "1")]
 pub enum DirectionEW {
     WestToEast = 0,
@@ -983,6 +992,7 @@ pub enum DirectionEW {
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, DekuRead)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "1")]
 pub enum DirectionNS {
     SouthToNorth = 0,
@@ -991,6 +1001,7 @@ pub enum DirectionNS {
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, DekuRead)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "1")]
 pub enum SourceBitVerticalRate {
     GNSS = 0,
@@ -999,6 +1010,7 @@ pub enum SourceBitVerticalRate {
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, DekuRead)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "1")]
 pub enum SignBitVerticalRate {
     Up = 0,
@@ -1007,6 +1019,7 @@ pub enum SignBitVerticalRate {
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, DekuRead)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "1")]
 pub enum SignBitGNSSBaroAltitudesDiff {
     Above = 0,
@@ -1015,6 +1028,7 @@ pub enum SignBitGNSSBaroAltitudesDiff {
 
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "1")]
 pub enum VerticalRateSource {
     BarometricPressureAltitude = 0,
@@ -1053,6 +1067,7 @@ pub struct SurfacePosition {
 
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "1")]
 pub enum StatusForGroundTrack {
     Invalid = 0,

libadsb_deku/src/adsb.rs

@@ -1,10 +1,7 @@
 //! B-Definition Subfield for Comm-B Messages
 
-use alloc::format;
 use alloc::string::String;
 #[cfg(feature = "alloc")]
-use alloc::vec;
-#[cfg(feature = "alloc")]
 use core::{
     clone::Clone, cmp::PartialEq, fmt, fmt::Debug, prelude::rust_2021::derive, result::Result::Ok,
     writeln,

libadsb_deku/src/bds.rs

@@ -176,6 +176,19 @@ impl<R: Read + Seek> Read for ReaderCrc<R> {
 
 impl<R: Read + Seek> Seek for ReaderCrc<R> {
     fn seek(&mut self, pos: deku::no_std_io::SeekFrom) -> deku::no_std_io::Result<u64> {
+        // When seeking forward, we need to read and cache the skipped bytes
+        // for the CRC calculation to work correctly
+        if let deku::no_std_io::SeekFrom::Current(offset) = pos {
+            if offset > 0 {
+                // Read and cache the bytes we're seeking over
+                let mut buf = vec![0u8; offset as usize];
+                let n = self.reader.read(&mut buf)?;
+                self.cache.extend_from_slice(&buf[..n]);
+                // Get current position after read
+                return self.reader.stream_position();
+            }
+        }
+
         self.just_seeked = true;
         self.reader.seek(pos)
     }
@@ -322,6 +335,7 @@ impl fmt::Display for Frame {
 /// Starting with 5 bits, decode the rest of the message as the correct data packets
 #[derive(Debug, PartialEq, DekuRead, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "5")]
 pub enum DF {
     /// 17: Extended Squitter, Downlink Format 17 (3.1.2.8.6)
@@ -573,37 +587,29 @@ impl Altitude {
 }
 
 /// SPI Condition
-#[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
+#[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone, Default)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "2")]
 pub enum SurveillanceStatus {
+    #[default]
     NoCondition = 0,
     PermanentAlert = 1,
     TemporaryAlert = 2,
     SPICondition = 3,
 }
 
-impl Default for SurveillanceStatus {
-    fn default() -> Self {
-        Self::NoCondition
-    }
-}
-
 /// Even / Odd
-#[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
+#[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone, Default)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "1")]
 pub enum CPRFormat {
+    #[default]
     Even = 0,
     Odd = 1,
 }
 
-impl Default for CPRFormat {
-    fn default() -> Self {
-        Self::Even
-    }
-}
-
 impl fmt::Display for CPRFormat {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
@@ -620,6 +626,7 @@ impl fmt::Display for CPRFormat {
 /// Positive / Negative
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "1")]
 pub enum Sign {
     Positive = 0,
@@ -709,6 +716,7 @@ impl core::str::FromStr for ICAO {
 /// Type of `DownlinkRequest`
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "5")]
 pub enum DownlinkRequest {
     #[deku(id = 0b00000)]
@@ -730,6 +738,7 @@ pub enum DownlinkRequest {
 /// Uplink / Downlink
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "1")]
 pub enum KE {
     DownlinkELMTx = 0,
@@ -747,6 +756,7 @@ pub struct UtilityMessage {
 /// Message Type
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "2")]
 pub enum UtilityMessageType {
     NoInformation = 0b00,
@@ -758,6 +768,7 @@ pub enum UtilityMessageType {
 /// Airborne / Ground and SPI
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "3")]
 pub enum FlightStatus {
     NoAlertNoSPIAirborne = 0b000,
@@ -832,6 +843,7 @@ impl AC13Field {
 /// Transponder level and additional information (3.1.2.5.2.2.1)
 #[derive(Debug, PartialEq, Eq, DekuRead, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[repr(u8)]
 #[deku(id_type = "u8", bits = "3")]
 #[allow(non_camel_case_types)]
 pub enum Capability {

libadsb_deku/src/lib.rs

@@ -6,13 +6,15 @@ const TEST_STR: &str = include_str!("../tests/lax-messages.txt");
 #[test]
 fn lax_messages() {
     // Read from test file and assert display implemented and non panic decode
-    for line in TEST_STR.lines() {
+    for (line_num, line) in TEST_STR.lines().enumerate() {
         let len = line.chars().count();
         let hex = &mut line.to_string()[1..len - 1].to_string();
         let bytes = hex::decode(&hex).unwrap();
         // test non panic decode
-        println!("{:02x?}", bytes);
-        let frame = Frame::from_bytes(&bytes).unwrap();
+        println!("Line {}: {:02x?}", line_num + 1, bytes);
+        let frame = Frame::from_bytes(&bytes).unwrap_or_else(|e| {
+            panic!("Line {} (hex: {}) failed: {:?}", line_num + 1, hex, e);
+        });
         // test fmt::Display implemented
         assert_ne!("{}", format!("{frame}"));
     }

libadsb_deku/tests/file.rs

@@ -10,7 +10,7 @@ fn testing01() {
     let bytes = hex!("8D40621D58C382D690C8AC2863A7");
     let frame = Frame::from_bytes(&bytes);
     if let DF::ADSB(adsb) = frame.unwrap().df {
-        if let ME::AirbornePositionBaroAltitude { id, altitude } = adsb.me {
+        if let ME::AirbornePositionBaroAltitude { id: _, altitude } = adsb.me {
             assert_eq!(altitude.alt, Some(38000));
             assert_eq!(altitude.lat_cpr, 93000);
             assert_eq!(altitude.lon_cpr, 51372);