Merge branch 'main' into feat/gst-sentence

Cargo.toml

@@ -1,3 +1,6 @@
+[workspace]
+members = [".", "benches-harness"]
+
 [package]
 name = "nmea"
 version = "0.6.0"
@@ -64,7 +67,7 @@ defmt-03 = ["dep:defmt", "heapless/defmt-03"]
 
 all-sentences = ["GNSS", "waypoint", "maritime", "water", "vendor-specific", "other"]
 # GNSS specific sentences related to the possition or speed relative to the ground
-GNSS = ["ALM", "GBS", "GGA", "GLL", "GNS", "GSA", "GST", "GSV", "RMC", "VTG"]
+GNSS = ["APA", "ALM", "GBS", "GGA", "GLL", "GNS", "GSA", "GST", "GSV", "RMC", "VTG"]
 
 waypoint = ["AAM", "BOD", "BWC", "BWW", "WNC", "ZFO", "ZTG"]
 maritime = ["waypoint", "water"]
@@ -80,6 +83,10 @@ AAM = []
 # feature: GNSS
 ALM = []
 
+# APA - Autopilot Sentence "A"
+# feature: GNSS
+APA = []
+
 # BOD - Bearing - Waypoint to Waypoint
 # feature: waypoint
 BOD = []
@@ -182,6 +189,3 @@ required-features = ["all-sentences"]
 [[test]]
 name = "functional_tests"
 required-features = ["all-sentences"]
-
-[workspace]
-members = [".", "benches-harness"]

src/parse.rs

@@ -109,6 +109,7 @@ pub fn parse_nmea_sentence(sentence: &str) -> core::result::Result<NmeaSentence,
 pub enum ParseResult {
     AAM(AamData),
     ALM(AlmData),
+    APA(ApaData),
     BOD(BodData),
     BWC(BwcData),
     BWW(BwwData),
@@ -142,6 +143,7 @@ impl From<&ParseResult> for SentenceType {
         match parse_result {
             ParseResult::AAM(_) => SentenceType::AAM,
             ParseResult::ALM(_) => SentenceType::ALM,
+            ParseResult::APA(_) => SentenceType::APA,
             ParseResult::BOD(_) => SentenceType::BOD,
             ParseResult::BWC(_) => SentenceType::BWC,
             ParseResult::BWW(_) => SentenceType::BWW,
@@ -219,6 +221,15 @@ pub fn parse_str(sentence_input: &str) -> Result<ParseResult, Error> {
                     }
                 }
             }
+            SentenceType::APA => {
+                cfg_if! {
+                    if #[cfg(feature = "APA")] {
+                        parse_apa(nmea_sentence).map(ParseResult::APA)
+                    } else {
+                        return Err(Error::DisabledSentence);
+                    }
+                }
+            }
             SentenceType::BOD => {
                 cfg_if! {
                     if #[cfg(feature = "BOD")] {

src/parser.rs

@@ -376,6 +376,7 @@ impl<'a> Nmea {
             | ParseResult::GBS(_)
             | ParseResult::GST(_)
             | ParseResult::AAM(_)
+            | ParseResult::APA(_)
             | ParseResult::ALM(_)
             | ParseResult::HDT(_)
             | ParseResult::PGRMZ(_)

src/sentences/aam.rs

@@ -26,7 +26,7 @@ use crate::{parse::NmeaSentence, sentences::utils::array_string, Error, Sentence
 ///   1. Status, BOOLEAN, A = Arrival circle entered, V = not passed
 ///   2. Status, BOOLEAN, A = perpendicular passed at waypoint, V = not passed
 ///   3. Arrival circle radius
-///   4. Units of radiuos, nautical miles
+///   4. Units of radius, nautical miles
 ///   5. Waypoint ID
 ///   6. Checksum
 ///