GEM-Remotes/GemBluetoothEmbeddedDevice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed auto mode in fake pic

Browse Source
This commit is contained in:
Dave
2024-11-03 17:21:11 -05:00
parent 26cd5584e9
commit 01dd918f47
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gem-remotes-lib/src/fake_pic.rs
View File

@ -115,8 +115,10 @@ impl FakePic {
else { else {
info!("Starting motors moving up!"); info!("Starting motors moving up!");
self.motor_state.update_status(MotorStatus::GoingUp); self.motor_state.update_status(MotorStatus::GoingUp);
self.send_q.send(Commands::ButtonTimerRestart).await?;
self.send_q.send(Commands::BluetoothStatusMotor{ data: self.motor_state }).await?; self.send_q.send(Commands::BluetoothStatusMotor{ data: self.motor_state }).await?;
if self.status_state.intersection(Statuses::AUTO).is_empty() {
self.send_q.send(Commands::ButtonTimerRestart).await?;
}
} }
Ok(()) Ok(())
} }
@ -136,15 +138,17 @@ impl FakePic {
else { else {
info!("Starting motors moving down!"); info!("Starting motors moving down!");
self.motor_state.update_status(MotorStatus::GoingDown); self.motor_state.update_status(MotorStatus::GoingDown);
self.send_q.send(Commands::ButtonTimerRestart).await?;
self.send_q.send(Commands::BluetoothStatusMotor{ data: self.motor_state }).await?; self.send_q.send(Commands::BluetoothStatusMotor{ data: self.motor_state }).await?;
if self.status_state.intersection(Statuses::AUTO).is_empty() {
self.send_q.send(Commands::ButtonTimerRestart).await?;
}
} }
Ok(()) Ok(())
} }
pub async fn press_stop(&mut self) -> Result<()> { pub async fn press_stop(&mut self) -> Result<()> {
self.motor_state.stop(); self.motor_state.stop();
self.send_q.send(Commands::BluetoothStatusMotor { data: self.motor_state }).await?; self.send_q.send(Commands::BluetoothStatusMotor { data: self.motor_state }).await?;
//self.send_q.send(Commands::ButtonTimerClear).await?; // Stop waiting on button timeouts info!("Stopping motors");
Ok(()) Ok(())
} }
pub async fn toggle_panic(&mut self) -> Result<()> { pub async fn toggle_panic(&mut self) -> Result<()> {
@ -224,14 +228,14 @@ impl FakePic {
Commands::BluetoothUp { data } => { Commands::BluetoothUp { data } => {
if data.is_pressed() { if data.is_pressed() {
self.press_up().await?; self.press_up().await?;
} else { } else if self.status_state.intersection(Statuses::AUTO).is_empty() {
self.press_stop().await?; // Releasing up is equivalent to stop self.press_stop().await?; // Releasing up is equivalent to stop, if not in auto
} }
} }
Commands::BluetoothDown { data } => { Commands::BluetoothDown { data } => {
if data.is_pressed() { if data.is_pressed() {
self.press_down().await?; self.press_down().await?;
} else { } else if self.status_state.intersection(Statuses::AUTO).is_empty(){
self.press_stop().await?; // Releasing down is equivalent to stop self.press_stop().await?; // Releasing down is equivalent to stop
} }
} }