diff --git a/src-slider_io/src/device/diva.rs b/src-slider_io/src/device/diva.rs index ec95cff..e8cbc2b 100644 --- a/src-slider_io/src/device/diva.rs +++ b/src-slider_io/src/device/diva.rs @@ -215,8 +215,10 @@ impl ThreadJob for DivaSliderJob { match self.bootstrap { DivaSliderBootstrap::Init => { + println!("Diva sending init"); let mut reset_packet = DivaPacket::from_bytes(0x10, &[]); serial_port.write(reset_packet.serialize()).ok(); + println!("Diva sent init"); self.bootstrap = DivaSliderBootstrap::AwaitReset; work = true; @@ -299,6 +301,7 @@ impl ThreadJob for DivaSliderJob { impl Drop for DivaSliderJob { fn drop(&mut self) { + println!("Dropping diva"); match self.bootstrap { DivaSliderBootstrap::AwaitStart | DivaSliderBootstrap::ReadLoop => { info!("Diva slider sending stop"); diff --git a/src-tauri/README.txt b/src-tauri/README.txt index afcf01b..f77f222 100644 --- a/src-tauri/README.txt +++ b/src-tauri/README.txt @@ -3,4 +3,6 @@ / __| | |/ _` |/ _ \ '__/ __| '_ \| | '_ ` _ \ \__ \ | | (_| | __/ | \__ \ | | | | | | | | | |___/_|_|\__,_|\___|_| |___/_| |_|_|_| |_| |_| -=============================================== \ No newline at end of file +=============================================== + +https://github.com/4yn/slidershim \ No newline at end of file diff --git a/src/App.svelte b/src/App.svelte index 3ae2768..88d99dd 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -10,6 +10,7 @@ let outputMode = "none"; let ledMode = "none"; + let divaSerialPort = "COM1"; let keyboardSensitivity = 20; let outputPolling = "100"; let outputWebsocketUrl = "http://localhost:3000"; @@ -56,6 +57,7 @@ outputMode = payload.outputMode || "none"; ledMode = payload.ledMode || "none"; + divaSerialPort = payload.divaSerialPort || "COM1"; keyboardSensitivity = payload.keyboardSensitivity || 20; outputPolling = payload.outputPolling || "100"; outputWebsocketUrl = @@ -103,6 +105,7 @@ deviceMode, outputMode, ledMode, + divaSerialPort, keyboardSensitivity, outputPolling, outputWebsocketUrl, @@ -157,6 +160,7 @@ + @@ -179,6 +183,24 @@ {/if} + {#if deviceMode === "diva"} +
+
Diva Serial Port
+
+ +
+
+ {/if}
Output Mode