fix: endianness issue

Author: Ofenhed

Cargo.lock

@@ -1,6 +1,6 @@
 name: "Intouch2-MQTT"
 description: "A bridge between intouch2, used in spa systems, and MQTT 3.3"
-version: "0.1.259"
+version: "0.1.260"
 slug: "intouch2-mqtt"
 init: false
 arch:

config.yaml

@@ -1,6 +1,6 @@
 [package]
 name = "intouch2-mqtt"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

intouch2-mqtt/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "intouch2"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

intouch2/Cargo.toml

@@ -26,14 +26,6 @@ impl ToStatic for StatusChange<'_> {
     }
 }
 
-impl ToStatic for ReminderInfo {
-    type Static = ReminderInfo;
-
-    fn to_static(&self) -> Self::Static {
-        self.clone()
-    }
-}
-
 #[derive(
     Clone,
     Copy,
@@ -59,12 +51,14 @@ pub enum ReminderIndex {
 
 pub type ReminderData = i16;
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
-pub struct ReminderInfo {
-    pub index: ReminderIndex,
-    pub data: ReminderData,
-    pub valid: bool,
+crate::gen_packages! {
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
+    pub struct ReminderInfo {
+        pub index: ReminderIndex,
+        pub data: ReminderData,
+        pub valid: bool,
+    }
 }
 
 crate::gen_packages! {
@@ -133,6 +127,10 @@ impl ActualType for WatercareInfo {
 }
 
 macro_rules! simple_type {
+    ($ty:ty: Transmute $(,$($rest:tt)*)?) => {
+        impl TransmutedArray for $ty {}
+        simple_type!{ $ty $(,$($rest)*)? }
+    };
     ($ty:ty $(,$($rest:tt)*)?) => {
         impl ActualType for $ty {
             type Type = $ty;
@@ -143,20 +141,19 @@ macro_rules! simple_type {
                 *self
             }
         }
-        impl TransmutedArray for $ty {}
         simple_type!{ $($($rest)*)? }
     };
     () => {};
 }
 simple_type!(
-    u8,
+    u8: Transmute,
     u16,
     i16,
-    bool,
-    WatercareType,
-    Weekday,
-    Time,
-    ReminderIndex
+    bool: Transmute,
+    WatercareType: Transmute,
+    Weekday: Transmute,
+    Time: Transmute,
+    ReminderIndex: Transmute
 );
 
 pub mod package_data {

intouch2/src/object.rs

@@ -358,9 +358,6 @@ macro_rules! gen_packages {
   };
   ($(#[$meta:meta])* pub struct $parse:ident { $($rest:tt)* }) => {
     $(#[$meta])* pub struct $parse { $($rest)* }
-    mod fuck_you {
-        use super::*;
-        $crate::gen_packages!{ BUILD_STRUCT_IMPLS $parse b"" [] [] [] {[] [] $($rest)*} => $($rest)*}
-    }
+    $crate::gen_packages!{ BUILD_STRUCT_IMPLS $parse b"" [] [] [] {[] [] $($rest)*} => $($rest)*}
   };
 }

intouch2/src/object_macro.rs

@@ -67,6 +67,26 @@ fn parse_addressed_package<'a>(input: &'a [u8]) -> IResult<&'a [u8], NetworkPack
     ))
 }
 
+impl<'a> DatasContent<'a> for u16 {
+    fn parse(input: &'a [u8]) -> nom::IResult<&'a [u8], Self> {
+        nom::number::complete::be_u16(input)
+    }
+
+    fn compose(&self) -> Cow<'a, [u8]> {
+        Cow::Owned(self.to_be_bytes().into())
+    }
+}
+
+impl<'a> DatasContent<'a> for i16 {
+    fn parse(input: &'a [u8]) -> nom::IResult<&'a [u8], Self> {
+        nom::number::complete::be_i16(input)
+    }
+
+    fn compose(&self) -> Cow<'a, [u8]> {
+        Cow::Owned(self.to_be_bytes().into())
+    }
+}
+
 impl<'a, T1: DatasContent<'a>, T2: DatasContent<'a>> DatasContent<'a> for (T1, T2) {
     fn parse(input: &'a [u8]) -> nom::IResult<&'a [u8], Self> {
         let (input, t1) = T1::parse(input)?;
@@ -148,53 +168,6 @@ impl<'a> DatasContent<'a> for StatusChange<'a> {
     }
 }
 
-impl<'a> DatasContent<'a> for ReminderInfo {
-    fn parse(input: &'a [u8]) -> nom::IResult<&'a [u8], Self> {
-        let (new_input, index) = u8::parse(input)?;
-        let (input, index) = (
-            new_input,
-            ReminderIndex::from_repr(index).ok_or_else(|| {
-                nom::Err::Failure(nom::error::make_error(
-                    new_input,
-                    nom::error::ErrorKind::OneOf,
-                ))
-            })?,
-        );
-
-        let Some((data, input)) = input.split_first_chunk::<2>() else {
-            return Err(nom::Err::Failure(nom::error::make_error(
-                input,
-                nom::error::ErrorKind::Eof,
-            )));
-        };
-        let data = i16::from_le_bytes(*data);
-        let before_valid = input;
-        let (input, valid) = <u8 as DatasContent>::parse(input)?;
-        let valid = match valid {
-            0 => false,
-            1 => true,
-            _ => {
-                return Err(nom::Err::Failure(nom::error::make_error(
-                    before_valid,
-                    nom::error::ErrorKind::OneOf,
-                )))?
-            }
-        };
-        Ok((input, Self { index, data, valid }))
-    }
-
-    fn compose(&self) -> Cow<'a, [u8]> {
-        Cow::Owned(
-            [
-                &[self.index as u8],
-                self.data.to_le_bytes().as_ref(),
-                if self.valid { b"\x01" } else { b"\x00" },
-            ][..]
-                .concat(),
-        )
-    }
-}
-
 impl<'a, T: DatasContent<'a> + Clone> DatasContent<'a> for Cow<'a, [T]>
 where
     [T]: ToOwned,