diff --git a/spinnyboy_rust/src/bin/dc_driver/afroesc.rs b/spinnyboy_rust/src/bin/dc_driver/afroesc.rs index 9a3b543..e0aa2b5 100644 --- a/spinnyboy_rust/src/bin/dc_driver/afroesc.rs +++ b/spinnyboy_rust/src/bin/dc_driver/afroesc.rs @@ -26,19 +26,19 @@ impl AfroEsc<'_>{ esc } pub fn set_timestamp(&mut self,value:u16){ - &self.pwm_pin.set_timestamp(value); + self.pwm_pin.set_timestamp(value); } //range is from 1121 till 1421 pub fn set_duty_percent(&mut self,value:u16){ if value > 100 { // failsafe! - &self.pwm_pin.set_timestamp(1055); + self.pwm_pin.set_timestamp(1055); } let new_timestamp = MIN_THROTTLE+value*GAP; - &self.pwm_pin.set_timestamp(new_timestamp); + self.pwm_pin.set_timestamp(new_timestamp); } pub fn set_arming_sequence(&mut self){ - &self.set_timestamp(1055); + self.set_timestamp(1055); } } \ No newline at end of file diff --git a/spinnyboy_rust/src/bin/main.rs b/spinnyboy_rust/src/bin/main.rs index 170dbc8..09b3f51 100644 --- a/spinnyboy_rust/src/bin/main.rs +++ b/spinnyboy_rust/src/bin/main.rs @@ -111,6 +111,7 @@ fn main() -> ! { display.send_command(b"page page0"); let mut rpm = DEFAULT_TARGET_RPM; let mut timer = DEFAULT_SPIN_TIME; + let mut started = false; loop { if display.read_ready() { match display.read_command() { @@ -118,10 +119,13 @@ fn main() -> ! { rprintln!("COMMAND SUCCESSFULLY executed"); } Ok(Command::Start) => { - rprintln!("START") + rprintln!("START"); + started = true; }, Ok(Command::Stop) => { - rprintln!("STOP") + rprintln!("STOP"); + started = false; + // spincoater.stop(); }, Ok(Command::SetRpm(x)) => { rprintln!("SET_RPM with {}", x); @@ -145,6 +149,10 @@ fn main() -> ! { } // display.send_command(b"page page0"); } + if started { + // spincoater.armed(); + rprintln!("STARTING!") + } //display.send_command(b"page page0"); //uart0.write(b"page page0\xff\xff\xff"); } diff --git a/spinnyboy_rust/src/bin/peripherals/nextion.rs b/spinnyboy_rust/src/bin/peripherals/nextion.rs index 74a74e4..a9fa346 100644 --- a/spinnyboy_rust/src/bin/peripherals/nextion.rs +++ b/spinnyboy_rust/src/bin/peripherals/nextion.rs @@ -1,5 +1,4 @@ use esp_hal::uart::RxError; -#[no_std] use esp_hal::uart::{Uart}; use esp_hal::{Blocking }; use rtt_target::rprintln;