Remove unneeded mutex and provide some sample error handlers

[m17rt] / m17app / src / serial.rs

diff --git a/m17app/src/serial.rs b/m17app/src/serial.rs
index 8abb4b93ca170ee95c2cff7833f0eaa65f94e8c2..7747c3de73a03bdea38d37898e910bdf184cd621 100644 (file)
--- a/m17app/src/serial.rs
+++ b/m17app/src/serial.rs
@@ -1,6 +1,6 @@
 use serialport::SerialPort;
 
 use serialport::SerialPort;
 

-use crate::soundmodem::Ptt;
+use crate::{error::SoundmodemError, soundmodem::Ptt};

 
 /// The pin on the serial port which is driving PTT
 pub enum PttPin {
 
 /// The pin on the serial port which is driving PTT
 pub enum PttPin {


@@ -23,27 +23,26 @@ impl SerialPtt {
             .map(|i| i.port_name)
     }
 
             .map(|i| i.port_name)
     }
 

-    pub fn new(port_name: &str, pin: PttPin) -> Self {
-        // TODO: error handling
-        let port = serialport::new(port_name, 9600).open().unwrap();
+    pub fn new(port_name: &str, pin: PttPin) -> Result<Self, SoundmodemError> {
+        let port = serialport::new(port_name, 9600).open()?;

         let mut s = Self { port, pin };
         let mut s = Self { port, pin };

-        s.ptt_off();
-        s
+        s.ptt_off()?;
+        Ok(s)

     }
 }
 
 impl Ptt for SerialPtt {
     }
 }
 
 impl Ptt for SerialPtt {

-    fn ptt_on(&mut self) {
-        let _ = match self.pin {
+    fn ptt_on(&mut self) -> Result<(), SoundmodemError> {
+        Ok(match self.pin {

             PttPin::Rts => self.port.write_request_to_send(true),
             PttPin::Dtr => self.port.write_data_terminal_ready(true),
             PttPin::Rts => self.port.write_request_to_send(true),
             PttPin::Dtr => self.port.write_data_terminal_ready(true),

-        };
+        }?)

     }
 
     }
 

-    fn ptt_off(&mut self) {
-        let _ = match self.pin {
+    fn ptt_off(&mut self) -> Result<(), SoundmodemError> {
+        Ok(match self.pin {

             PttPin::Rts => self.port.write_request_to_send(false),
             PttPin::Dtr => self.port.write_data_terminal_ready(false),
             PttPin::Rts => self.port.write_request_to_send(false),
             PttPin::Dtr => self.port.write_data_terminal_ready(false),

-        };
+        }?)

     }
 }
     }
 }