Converge get_param() and read_byte() into a single get_byte() function.

Author: jhodapp

src/protocol.rs

@@ -186,8 +186,7 @@ pub trait ProtocolInterface {
     ) -> Result<[u8; ARRAY_LENGTH_PLACEHOLDER], self::Error>;
     fn send_end_cmd(&mut self) -> Result<(), self::Error>;
 
-    fn get_param(&mut self) -> Result<u8, self::Error>;
-    fn read_byte(&mut self) -> Result<u8, self::Error>;
+    fn get_byte(&mut self) -> Result<u8, self::Error>;
     fn wait_for_byte(&mut self, wait_byte: u8) -> Result<bool, self::Error>;
     fn check_start_cmd(&mut self) -> Result<bool, self::Error>;
     fn read_and_check_byte(&mut self, check_byte: u8) -> Result<bool, self::Error>;

src/spi.rs

@@ -135,8 +135,8 @@ where
         self.send_end_cmd();
 
         // Pad byte stream to multiple of 4
-        self.read_byte().ok().unwrap();
-        self.read_byte().ok().unwrap();
+        self.get_byte().ok().unwrap();
+        self.get_byte().ok().unwrap();
 
         self.control_pins.esp_deselect();
         self.control_pins.wait_for_esp_select();
@@ -200,7 +200,7 @@ where
             //return Err(SPIError::Misc);
         }
 
-        let num_params_to_read = self.get_param()? as usize;
+        let num_params_to_read = self.get_byte()? as usize;
 
         if num_params_to_read > 8 {
             return Ok([0x31, 0x2e, 0x37, 0x2e, 0x34, 0x0, 0x0, 0x0]);
@@ -209,7 +209,7 @@ where
 
         let mut params: [u8; ARRAY_LENGTH_PLACEHOLDER] = [0; 8];
         for i in 0..num_params_to_read {
-            params[i] = self.get_param().ok().unwrap()
+            params[i] = self.get_byte().ok().unwrap()
         }
 
         self.read_and_check_byte(ControlByte::End as u8)?;
@@ -223,7 +223,7 @@ where
         Ok(())
     }
 
-    fn get_param(&mut self) -> Result<u8, self::Error> {
+    fn get_byte(&mut self) -> Result<u8, self::Error> {
         // Blocking read, don't return until we've read a byte successfully
         loop {
             let word_out = &mut [ControlByte::Dummy as u8];
@@ -239,22 +239,11 @@ where
         }
     }
 
-    fn read_byte(&mut self) -> Result<u8, self::Error> {
-        match self.get_param() {
-            Ok(byte_out) => {
-                return Ok(byte_out);
-            }
-            Err(e) => {
-                return Err(e);
-            }
-        }
-    }
-
     fn wait_for_byte(&mut self, wait_byte: u8) -> Result<bool, self::Error> {
         let mut timeout: u16 = 1000u16;
 
         loop {
-            match self.get_param() {
+            match self.get_byte() {
                 Ok(byte_read) => {
                     if byte_read == ControlByte::Error as u8 {
                         return Ok(false);
@@ -279,7 +268,7 @@ where
     }
 
     fn read_and_check_byte(&mut self, check_byte: u8) -> Result<bool, self::Error> {
-        match self.get_param() {
+        match self.get_byte() {
             Ok(byte_out) => {
                 return Ok(byte_out == check_byte);
             }
@@ -307,7 +296,7 @@ where
 
     fn pad_to_multiple_of_4(&mut self, mut command_size: u16) {
         while command_size % 4 == 0 {
-            self.get_param().ok().unwrap();
+            self.get_byte().ok().unwrap();
             command_size += 1;
         }
     }