Cons-n-Stuff/slidershim
1
0
Fork 0
mirror of https://github.com/4yn/slidershim.git synced 2025-02-02 04:27:58 +01:00
Code Releases Activity

diva serial ui

Browse Source
This commit is contained in:
4yn 2022-02-13 23:39:54 +08:00
parent f356624502
commit 6bc462210f
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src-slider_io/src/device/diva.rs
View File

@ -215,8 +215,10 @@ impl ThreadJob for DivaSliderJob {
match self.bootstrap { match self.bootstrap {
DivaSliderBootstrap::Init => { DivaSliderBootstrap::Init => {
println!("Diva sending init");
let mut reset_packet = DivaPacket::from_bytes(0x10, &[]); let mut reset_packet = DivaPacket::from_bytes(0x10, &[]);
serial_port.write(reset_packet.serialize()).ok(); serial_port.write(reset_packet.serialize()).ok();
println!("Diva sent init");
self.bootstrap = DivaSliderBootstrap::AwaitReset; self.bootstrap = DivaSliderBootstrap::AwaitReset;
work = true; work = true;
@ -299,6 +301,7 @@ impl ThreadJob for DivaSliderJob {
impl Drop for DivaSliderJob { impl Drop for DivaSliderJob {
fn drop(&mut self) { fn drop(&mut self) {
println!("Dropping diva");
match self.bootstrap { match self.bootstrap {
DivaSliderBootstrap::AwaitStart | DivaSliderBootstrap::ReadLoop => { DivaSliderBootstrap::AwaitStart | DivaSliderBootstrap::ReadLoop => {
info!("Diva slider sending stop"); info!("Diva slider sending stop");

2
src-tauri/README.txt
View File

@ -4,3 +4,5 @@
\__ \ | | (_| | __/ | \__ \ | | | | | | | | | \__ \ | | (_| | __/ | \__ \ | | | | | | | | |
|___/_|_|\__,_|\___|_| |___/_| |_|_|_| |_| |_| |___/_|_|\__,_|\___|_| |___/_| |_|_|_| |_| |_|
=============================================== ===============================================
https://github.com/4yn/slidershim

22
src/App.svelte
View File

@ -10,6 +10,7 @@
let outputMode = "none"; let outputMode = "none";
let ledMode = "none"; let ledMode = "none";
let divaSerialPort = "COM1";
let keyboardSensitivity = 20; let keyboardSensitivity = 20;
let outputPolling = "100"; let outputPolling = "100";
let outputWebsocketUrl = "http://localhost:3000"; let outputWebsocketUrl = "http://localhost:3000";
@ -56,6 +57,7 @@
outputMode = payload.outputMode || "none"; outputMode = payload.outputMode || "none";
ledMode = payload.ledMode || "none"; ledMode = payload.ledMode || "none";
divaSerialPort = payload.divaSerialPort || "COM1";
keyboardSensitivity = payload.keyboardSensitivity || 20; keyboardSensitivity = payload.keyboardSensitivity || 20;
outputPolling = payload.outputPolling || "100"; outputPolling = payload.outputPolling || "100";
outputWebsocketUrl = outputWebsocketUrl =
@ -103,6 +105,7 @@
deviceMode, deviceMode,
outputMode, outputMode,
ledMode, ledMode,
divaSerialPort,
keyboardSensitivity, keyboardSensitivity,
outputPolling, outputPolling,
outputWebsocketUrl, outputWebsocketUrl,
@ -157,6 +160,7 @@
<option value="tasoller-one">GAMO2 Tasoller, 1.0 HID Firmware</option> <option value="tasoller-one">GAMO2 Tasoller, 1.0 HID Firmware</option>
<option value="tasoller-two">GAMO2 Tasoller, 2.0 HID Firmware</option> <option value="tasoller-two">GAMO2 Tasoller, 2.0 HID Firmware</option>
<option value="yuancon">Yuancon Laverita, HID Firmware</option> <option value="yuancon">Yuancon Laverita, HID Firmware</option>
<option value="diva">Diva Slider over Serial</option>
<option value="brokenithm">Brokenithm</option> <option value="brokenithm">Brokenithm</option>
<option value="brokenithm-led">Brokenithm + Led</option> <option value="brokenithm-led">Brokenithm + Led</option>
<option value="brokenithm-ground">Brokenithm, Ground only</option> <option value="brokenithm-ground">Brokenithm, Ground only</option>
@ -179,6 +183,24 @@
</div> </div>
</div> </div>
{/if} {/if}
{#if deviceMode === "diva"}
<div class="row">
<div class="label">Diva Serial Port</div>
<div class="input">
<select bind:value={divaSerialPort} on:change={markDirty}>
<option value="COM1">COM1</option>
<option value="COM2">COM2</option>
<option value="COM3">COM3</option>
<option value="COM4">COM4</option>
<option value="COM5">COM5</option>
<option value="COM6">COM6</option>
<option value="COM7">COM7</option>
<option value="COM8">COM8</option>
<option value="COM9">COM9</option>
</select>
</div>
</div>
{/if}
<div class="row"> <div class="row">
<div class="label">Output Mode</div> <div class="label">Output Mode</div>