Update rppal and retry crates

Author: TeyKey1

Cargo.lock

@@ -38,8 +38,8 @@ colored = "2.1"
 serial_test = "3.1"
 pca9535 = "2.0"
 embedded-hal = "1.0"
-rppal = "0.17"
-retry = "1.3"
+rppal = "0.19"
+retry = "2.0"
 antidote = "1.0"
 nix = "0.29"
 # Testcandidate used in runner crate

Cargo.toml

@@ -168,25 +168,19 @@ impl CombinedTestChannel {
                                         std::thread::sleep(std::time::Duration::from_millis(100));
                                         function(self, target_info, tss.get_position())
                                     }
-                                    Err(err) => match err {
-                                        retry::Error::Operation { error, .. } => {
-                                            log::error!(
+                                    Err(err) => {
+                                        log::error!(
                                                 "Failed to connect testchannel {:?} to target {:?}: {}\nCaused by: {:?}",
                                                 self.channel,
                                                 Target::try_from(pos as u8).unwrap(),
-                                                error,
-                                                error.source()
+                                                err.error,
+                                                err.error.source()
 
                                             );
-                                            // At this point it is uncertain in which state the busswitches are. Therefore we try to disconnect all affected switches, so any remaining operations are not influenced by this error.
-                                            // If disconnecting fails the testrack hardware is in an undefined and unrecoverable state, therefore the application panics as such errors need manual power reset and are likely caused by faulty hardware
-                                            tss.inner.borrow_mut().disconnect_all().expect("Failed to disconnect tss successfully, this error cannot be recovered, as further operation in such a state may influence other testchannels.\n This is likely caused by a hardware issue in the I2C communication, please verify that your hardware is working correctly.");
-                                        }
-                                        retry::Error::Internal(string) => panic!(
-                                            "Internal library error in retry crate: {}",
-                                            string
-                                        ),
-                                    },
+                                        // At this point it is uncertain in which state the busswitches are. Therefore we try to disconnect all affected switches, so any remaining operations are not influenced by this error.
+                                        // If disconnecting fails the testrack hardware is in an undefined and unrecoverable state, therefore the application panics as such errors need manual power reset and are likely caused by faulty hardware
+                                        tss.inner.borrow_mut().disconnect_all().expect("Failed to disconnect tss successfully, this error cannot be recovered, as further operation in such a state may influence other testchannels.\n This is likely caused by a hardware issue in the I2C communication, please verify that your hardware is working correctly.");
+                                    }
                                 }
                             }
                         }

controller/src/hardware/test_channel.rs

@@ -3,7 +3,7 @@ use embedded_hal::i2c::I2c;
 use pca9535::expander::SyncExpander;
 use pca9535::ExpanderError;
 use pca9535::ExpanderOutputPin;
-use retry::{delay::Fixed, retry, Error};
+use retry::{delay::Fixed, retry};
 
 use crate::StackShieldError;
 use crate::Target;
@@ -56,12 +56,7 @@ where
             Fixed::from_millis(FIXED_RETRY_DELAY_MS).take(RETRY_LIMIT),
             || self.disconnect_all(),
         )
-        .map_err(|err| match err {
-            Error::Internal(string) => {
-                panic!("Internal library error in retry crate: {}", string)
-            }
-            Error::Operation { error, .. } => error,
-        })?;
+        .map_err(|err| err.error)?;
 
         self.sw_test_channel[channel as usize]
             .set_low()