Readd serde support

Add rust-analyzer in correct version
aeronautical-informatics · Jun 7, 2023 · fc5e4c5 · fc5e4c5
1 parent c5a119f
commit fc5e4c5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/flake.nix b/flake.nix
@@ -17,7 +17,7 @@
         let
           pkgs = import nixpkgs { inherit system; };
           rust-toolchain = with fenix.packages.${system}; combine [
-            rust-analyzer
+            stable.rust-analyzer
             stable.cargo
             stable.rustc
             stable.rustfmt

diff --git a/opentaws/Cargo.toml b/opentaws/Cargo.toml
@@ -22,8 +22,11 @@ is-it-maintained-open-issues = { repository = "aeronautical-informatics/openTAWS
 maintenance = { status = "actively-developed" }
 
 [features]
+default = ["use-serde"]
+use-serde = ["serde", "uom/use_serde"]
 
 [dependencies]
+serde = { version = "1.0", default-features = false, optional = true, features = ["derive"] }
 lazy_static = { version = "1", default-features = false, features = [
 	"spin_no_std",
 ] }

diff --git a/opentaws/src/aircraft_state.rs b/opentaws/src/aircraft_state.rs
@@ -30,6 +30,7 @@ pub struct Normalized;
 pub type NormalizedAircraftState = AircraftState<Normalized>;
 
 /// Represents the current state of an aircraft
+#[cfg_attr(feature = "use-serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Clone, Debug, Default)]
 pub struct AircraftState<T = ()> {
     /// Time when this aircraft state was emitted
@@ -240,7 +241,6 @@ impl<T> AircraftState<T> {
     }
 
     fn wrap_position(lat: Angle, lon: Angle) -> (Angle, Angle) {
-        use ::uom::num_traits::Float;
         let quadrant = ((lat.abs() / *QUARTER_REVOLUTION)
             .get::<ratio::ratio>()
             .floor() as i64)
@@ -337,6 +337,7 @@ AircrafState: {{
 }
 
 /// Represents a flight segment
+#[cfg_attr(feature = "use-serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum FlightSegment {
     /// The aircraft is in cruise flight situation

diff --git a/opentaws/src/alerts.rs b/opentaws/src/alerts.rs
@@ -4,6 +4,7 @@ use heapless::FnvIndexMap;
 use crate::prelude::*;
 
 /// TAWS Alert levels
+#[cfg_attr(feature = "use-serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum AlertLevel {
     /// The level or category of alert for conditions that require immediate flight crew awareness
@@ -20,6 +21,7 @@ pub enum AlertLevel {
 }
 
 /// Represents a TAWS alert
+#[cfg_attr(feature = "use-serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct Alert<AlertSource: TawsAlertSource> {
     /// The source resp. the TAWS functionallity which emitted this alert