From 5953f2c5843503881e26758ff5b5f0c2414905b8 Mon Sep 17 00:00:00 2001 From: Andy Killorin <37423245+Speedy6451@users.noreply.github.com> Date: Sun, 19 Jan 2025 01:20:46 -0500 Subject: [PATCH] shifted override fire --- interface/src/main.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/interface/src/main.rs b/interface/src/main.rs index 9fc51d2..61a704b 100644 --- a/interface/src/main.rs +++ b/interface/src/main.rs @@ -46,6 +46,7 @@ fn main() -> Result<()> { let control = executor.block_on(async { let cruisecontrol = TcpStream::connect("169.254.1.1:1234").await?; + println!("connected"); cruisecontrol.set_nodelay(true)?; let (telem, control) = cruisecontrol.into_split(); @@ -90,7 +91,7 @@ async fn controller(mut notes: mpsc::Receiver<(Option { - println!("fire"); - control = ControlPacket::Fire; + println!("e"); } - _pitch => { + Pitch { letter: NoteLetter::F, accidental: 1} => { + println!("fire"); + control = ControlPacket::FireOverride(1.0); + } + pitch => { if vol > 3000. { println!("fire"); control = ControlPacket::FireOverride(1.0); } else { - //dbg!(pitch); + dbg!(pitch); } } }