Skip to content

Commit

Permalink
working example, some timing issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@tarfu
tarfu committed Dec 24, 2023
1 parent 4e9117b commit 9582e05
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 41 deletions.
49 changes: 10 additions & 39 deletions examples/embassy-stm32-example/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,48 +149,19 @@ async fn main_task(spawner: Spawner) {
// control.set_desired_state(PowerState::Connected).await;

defmt::unwrap!(spawner.spawn(cellular_task(runner)));
Timer::after(Duration::from_millis(1000)).await;
loop {
// loop {
// control.set_desired_state(PowerState::Connected).await;
// info!("set_desired_state(PowerState::Connected)");
// Timer::after(Duration::from_millis(1000)).await;
// control.set_desired_state(PowerState::PowerDown).await;
// info!("set_desired_state(PowerState::PowerDown)");
// Timer::after(Duration::from_millis(1000)).await;
// }
// runner.init().await.unwrap();
match control.power_state() {
OperationState::PowerDown => {
info!("PowerState::PowerDown");
control.set_desired_state(OperationState::PowerUp).await;
info!("set_desired_state(PowerState::PowerUp)");
control.set_desired_state(OperationState::Alive).await;
info!("set_desired_state(PowerState::Initialized)");
while control.power_state() != OperationState::Alive {
Timer::after(Duration::from_millis(1000)).await;
}
OperationState::PowerUp => {
info!("PowerState::PowerUp");
control.set_desired_state(OperationState::Alive).await;
info!("set_desired_state(PowerState::Alive)");
Timer::after(Duration::from_millis(1000)).await;
control.set_desired_state(OperationState::PowerDown).await;
info!("set_desired_state(PowerState::PowerDown)");
while control.power_state() != OperationState::PowerDown {
Timer::after(Duration::from_millis(1000)).await;
}
OperationState::Alive => {
info!("PowerState::Alive");
control.set_desired_state(OperationState::Initialized).await;
info!("set_desired_state(PowerState::Initialized)");
}
OperationState::Initialized => {
info!("PowerState::Initialized");
control.set_desired_state(OperationState::PowerDown).await;
info!("set_desired_state(PowerState::PowerDown)");
}
OperationState::Connected => {
info!("PowerState::Connected");
control.set_desired_state(OperationState::PowerDown).await;
info!("set_desired_state(PowerState::PowerDown)");
}
OperationState::DataEstablished => {
info!("PowerState::DataEstablished");
control.set_desired_state(OperationState::PowerDown).await;
info!("set_desired_state(PowerState::PowerDown)");
}
}
Timer::after(Duration::from_millis(5000)).await;
}
defmt::unwrap!(spawner.spawn(cellular_task(runner)));
Expand Down
29 changes: 27 additions & 2 deletions src/asynch/runner.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ impl<'d, AT: AtatClient, C: CellularConfig, const URC_CAPACITY: usize>
pin.set_low().map_err(|_| Error::IoPin)?;
Timer::after(crate::module_timing::pwr_on_time()).await;
pin.set_high().map_err(|_| Error::IoPin)?;
Timer::after(boot_time()).await;
self.ch.set_power_state(OperationState::PowerUp);
debug!("Powered up");
Ok(())
Expand Down Expand Up @@ -291,6 +292,17 @@ impl<'d, AT: AtatClient, C: CellularConfig, const URC_CAPACITY: usize>
}

pub async fn run(mut self) -> ! {
match self.has_power().await.ok() {
Some(false) => {
self.ch.set_power_state(OperationState::PowerDown);
}
Some(true) => {
self.ch.set_power_state(OperationState::PowerUp);
}
None => {
self.ch.set_power_state(OperationState::PowerDown);
}
}
loop {
match select(
self.ch.state_runner().wait_for_desired_state_change(),
Expand All @@ -305,13 +317,24 @@ impl<'d, AT: AtatClient, C: CellularConfig, const URC_CAPACITY: usize>
continue;
}
let desired_state = desired_state.unwrap();
if 0 < desired_state as isize - self.ch.state_runner().power_state() as isize {
if 0 >= desired_state as isize - self.ch.state_runner().power_state() as isize {
debug!(
"Power steps was negative, power down: {}",
desired_state as isize - self.ch.state_runner().power_state() as isize
);
self.power_down().await.ok();
self.ch.set_power_state(OperationState::PowerDown);
}
let start_state = self.ch.state_runner().power_state() as isize;
let steps = desired_state as isize - start_state;
for step in 0..steps {
for step in 0..=steps {
debug!(
"State transition {} steps: {} -> {}, {}",
steps,
start_state,
start_state + step,
step
);
let next_state = start_state + step;
match OperationState::try_from(next_state) {
Ok(OperationState::PowerDown) => {}
Expand All @@ -326,7 +349,9 @@ impl<'d, AT: AtatClient, C: CellularConfig, const URC_CAPACITY: usize>
},
Ok(OperationState::Alive) => match self.is_alive().await {
Ok(_) => {
debug!("Will set Alive");
self.ch.set_power_state(OperationState::Alive);
debug!("Set Alive");
}
Err(err) => {
error!("Error in is_alive: {:?}", err);
Expand Down

0 comments on commit 9582e05

Please sign in to comment.