Minor fixes (#16)

jarpoole · Nov 7, 2022 · c865ce2 · c865ce2
1 parent 79451b0
commit c865ce2
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 14 deletions.
diff --git a/backend/etherweasel_rs_container/etherweasel_rs/src/driver/hardware_driver.rs b/backend/etherweasel_rs_container/etherweasel_rs/src/driver/hardware_driver.rs
@@ -3,6 +3,10 @@ use super::{
     tle8108em::tle8108em::{Channel, ChannelMode, TLE8108EM},
 };
 use async_trait::async_trait;
+use std::time::Duration;
+
+// EC2-5TNU relay datasheet specifies 2ms operating time
+const SWITCHING_TIME_MS: u64 = 10;
 
 const BLUE_ACTIVE: Channel = Channel::CH4;
 const BLUE_PASSIVE: Channel = Channel::CH8;
@@ -37,9 +41,9 @@ impl Driver for HardwareDriver {
                 .set_channel(ORANGE_ACTIVE, ChannelMode::ON)
                 .set_channel(GREEN_ACTIVE, ChannelMode::ON)
                 .set_channel(BROWN_ACTIVE, ChannelMode::ON)
-                .update()
-                .await?;
-            self.tle8108em.reset_channels().update().await?;
+                .update()?;
+            wait_for_switch().await;
+            self.tle8108em.reset_channels().update()?;
             self.mode = DriverMode::ACTIVE;
         } else {
             self.tle8108em
@@ -48,9 +52,9 @@ impl Driver for HardwareDriver {
                 .set_channel(ORANGE_PASSIVE, ChannelMode::ON)
                 .set_channel(GREEN_PASSIVE, ChannelMode::ON)
                 .set_channel(BROWN_PASSIVE, ChannelMode::ON)
-                .update()
-                .await?;
-            self.tle8108em.reset_channels().update().await?;
+                .update()?;
+            wait_for_switch().await;
+            self.tle8108em.reset_channels().update()?;
             self.mode = DriverMode::PASSIVE;
         }
         Ok(())
@@ -59,3 +63,7 @@ impl Driver for HardwareDriver {
         Ok(self.mode)
     }
 }
+
+async fn wait_for_switch() {
+    sleep(Duration::from_millis(SWITCHING_TIME_MS)).await;
+}
diff --git a/...therweasel_rs_container/etherweasel_rs/src/driver/tle8108em/KEM_R7002_EC2_EE2-1104574.pdf b/...therweasel_rs_container/etherweasel_rs/src/driver/tle8108em/KEM_R7002_EC2_EE2-1104574.pdf
diff --git a/backend/etherweasel_rs_container/etherweasel_rs/src/driver/tle8108em/tle8108em.rs b/backend/etherweasel_rs_container/etherweasel_rs/src/driver/tle8108em/tle8108em.rs
@@ -1,9 +1,7 @@
 use spidev::{SpiModeFlags, Spidev, SpidevOptions, SpidevTransfer};
 use std::io;
-use std::time::Duration;
 use tokio::time::sleep;
 
-const SWITCHING_TIME_MS: u64 = 500;
 const TLE8108EM_SPI_SCLK_HZ: u32 = 100000;
 const TLE8108EM_SPI_MODE: SpiModeFlags = SpiModeFlags::SPI_MODE_1;
 
@@ -137,18 +135,13 @@ impl TLE8108EM {
         self.modes = Register::<ChannelMode>::reset();
         return self;
     }
-    pub async fn update(&mut self) -> io::Result<()> {
+    pub fn update(&mut self) -> io::Result<()> {
         let response = transfer(&mut self.spidev, self.modes.pack())?;
         self.diags = response.unpack();
-        wait_for_switch().await;
         Ok(())
     }
 }
 
-async fn wait_for_switch() {
-    sleep(Duration::from_millis(SWITCHING_TIME_MS)).await;
-}
-
 fn transfer(spi: &mut Spidev, payload: BinaryRegister) -> io::Result<BinaryRegister> {
     println!("SPI TX: 0x{:X}{:X}", payload[1], payload[0]);
     let mut response = [0; 2];

diff --git a/backend/etherweasel_rs_container/install.sh b/backend/etherweasel_rs_container/install.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "Installing..."
+if ! command -v redis-cli &> /dev/null; then
+    echo "Installing redis..."
+    sudo apt install redis -y
+fi
+echo "Installed"
diff --git a/backend/etherweasel_rs_container/run.sh b/backend/etherweasel_rs_container/run.sh
@@ -95,6 +95,8 @@ if [[ $TARGET = "raspi" ]]; then
     --target $RASPI_TARGET --release
   # Transfer the binary
   sshpass -p "$PASSWORD" rsync ./etherweasel_rs/target/$RASPI_TARGET/release/etherweasel_rs "$HOST":~/etherweasel_rs
+  sshpass -p "$PASSWORD" rsync ./install.sh "$HOST":~/install.sh
   # Run the binary
+  sshpass -p "$PASSWORD" ssh -t "$HOST" ~/install.sh
   sshpass -p "$PASSWORD" ssh -t "$HOST" ~/etherweasel_rs --driver=hardware "$@"
 fi