no alloc maybe

Author: lattice0

src/cc253x.rs

@@ -1,10 +1,9 @@
 use crate::{
-    coordinator::{Coordinator, CoordinatorError, LedStatus, ResetType},
+    coordinator::{AddressMode, Coordinator, CoordinatorError, LedStatus, ResetType},
     unpi::{
         commands::{get_command_by_name, ParameterValue},
         LenTypeInfo, MessageType, Subsystem, UnpiPacket, MAX_FRAME_SIZE,
     },
-    AddressMode,
 };
 use serialport::SerialPort;
 use std::{path::PathBuf, time::Duration};
@@ -22,7 +21,7 @@ impl CC2531X {
         let serial = serialport::new(path.to_str().unwrap(), baud_rate)
             .timeout(Duration::from_millis(10))
             .open()
-            .map_err(|e| CoordinatorError::SerialOpen(e.to_string()))?;
+            .map_err(|_e| CoordinatorError::SerialOpen)?;
         Ok(Self {
             serial,
             _supports_led: None,
@@ -34,7 +33,6 @@ impl CC2531X {
         name: &str,
         message_type: MessageType,
         subsystem: Subsystem,
-        command: u8,
         _timeout: Option<std::time::Duration>,
     ) -> Result<(), CoordinatorError> {
         let command =
@@ -43,7 +41,7 @@ impl CC2531X {
         let len = self
             .serial
             .read(&mut buffer)
-            .map_err(|e| CoordinatorError::Io(e.to_string()))?;
+            .map_err(|_e| CoordinatorError::Io)?;
         let packet = UnpiPacket::from_payload(
             (&buffer[..len], LenTypeInfo::OneByte),
             (message_type, subsystem),
@@ -52,7 +50,7 @@ impl CC2531X {
         if packet.type_subsystem == (message_type, subsystem) && packet.command == command.id {
             Ok(())
         } else {
-            Err(CoordinatorError::Io("Unexpected message".to_string()))
+            Err(CoordinatorError::Io)
         }
     }
 }

src/coordinator.rs

@@ -40,6 +40,14 @@ pub trait Coordinator {
     ) -> impl Future<Output = Result<Option<Self::ZclPayload<'static>>, CoordinatorError>>;
 }
 
+pub enum AddressMode {
+    AddrNotPresent = 0,
+    AddrGroup = 1,
+    Addr16bit = 2,
+    Addr64bit = 3,
+    AddrBroadcast = 15,
+}
+
 #[derive(Debug, Copy, Clone)]
 pub enum LedStatus {
     Disable,
@@ -55,10 +63,10 @@ pub enum ResetType {
 
 #[derive(Debug)]
 pub enum CoordinatorError {
-    SerialOpen(String),
-    SerialWrite(String),
+    SerialOpen,
+    SerialWrite,
     NoCommandWithName,
-    Io(String),
+    Io,
     Parameter(ParameterError),
     InvalidChannel,
     RequestMismatch,
@@ -67,8 +75,8 @@ pub enum CoordinatorError {
 }
 
 impl From<std::io::Error> for CoordinatorError {
-    fn from(e: std::io::Error) -> Self {
-        CoordinatorError::Io(e.to_string())
+    fn from(_e: std::io::Error) -> Self {
+        CoordinatorError::Io
     }
 }
 

src/lib.rs

@@ -5,13 +5,6 @@ pub mod utils;
 pub mod cc253x;
 pub mod serial;
 
-pub enum AddressMode {
-    AddrNotPresent = 0,
-    AddrGroup = 1,
-    Addr16bit = 2,
-    Addr64bit = 3,
-    AddrBroadcast = 15,
-}
 
 #[cfg(test)]
 mod tests {

src/serial.rs

@@ -19,7 +19,7 @@ impl<'a> UnpiPacket<'a> {
         let written = self.to_bytes(&mut unpi_packet_buffer)?;
         serial
             .write_all(&unpi_packet_buffer[0..written])
-            .map_err(|e| CoordinatorError::SerialWrite(e.to_string()))?;
+            .map_err(|_e| CoordinatorError::SerialWrite)?;
         Ok(())
     }