NaxdyOrg/NaxGCC-FW
2
0
Fork 2
Code Issues Pull requests 1 Releases 4 Activity Actions

change(input): use ticker for stick thread

Browse source
This commit is contained in:
Naxdy 2024-03-30 08:09:26 +01:00
parent 090a97b5a9
commit 55b9bc6d2c
Signed by: Naxdy
GPG key ID: CC15075846BCE91B
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/input.rs
View file

@ -16,7 +16,7 @@ use embassy_sync::{
pubsub::PubSubChannel, pubsub::PubSubChannel,
signal::Signal, signal::Signal,
}; };
use embassy_time::{Duration, Instant, Timer}; use embassy_time::{Duration, Instant, Ticker, Timer};
use libm::{fmaxf, fminf}; use libm::{fmaxf, fminf};
use crate::{ use crate::{
@ -511,14 +511,11 @@ pub async fn update_stick_states_task(
debug!("Entering stick update loop."); debug!("Entering stick update loop.");
// the time at which the current loop iteration should end
let mut end_time = Instant::now() + Duration::from_micros(1000);
let mut is_calibrating = false; let mut is_calibrating = false;
loop { let mut ticker = Ticker::every(Duration::from_hz(1000));
let timer = Timer::at(end_time);
loop {
current_stick_state = update_stick_states( current_stick_state = update_stick_states(
&current_stick_state, &current_stick_state,
&controlstick_params, &controlstick_params,
@ -534,9 +531,6 @@ pub async fn update_stick_states_task(
) )
.await; .await;
timer.await;
end_time += Duration::from_micros(1000);
if let Some(new_calibrating) = SIGNAL_IS_CALIBRATING.try_take() { if let Some(new_calibrating) = SIGNAL_IS_CALIBRATING.try_take() {
is_calibrating = new_calibrating; is_calibrating = new_calibrating;
} }
@ -544,7 +538,7 @@ pub async fn update_stick_states_task(
match Instant::now() { match Instant::now() {
n => { n => {
match (n - last_loop_time).as_micros() { match (n - last_loop_time).as_micros() {
a if a > 1999 => debug!("Loop took {} us", a), a if a > 1 => debug!("Loop took {} us", a),
_ => {} _ => {}
}; };
last_loop_time = n; last_loop_time = n;
@ -552,5 +546,7 @@ pub async fn update_stick_states_task(
}; };
SIGNAL_STICK_STATE.signal(current_stick_state.clone()); SIGNAL_STICK_STATE.signal(current_stick_state.clone());
ticker.next().await;
} }
} }