Remove policy type state machine, power policy now builds

Author: RobertZ2011

embedded-service/Cargo.toml

@@ -21,6 +21,7 @@ defmt = { workspace = true, optional = true }
 document-features.workspace = true
 embassy-sync.workspace = true
 embassy-time.workspace = true
+embassy-futures.workspace = true
 embedded-batteries-async.workspace = true
 embedded-cfu-protocol.workspace = true
 embedded-hal-async.workspace = true
@@ -49,7 +50,6 @@ cortex-m.workspace = true
 
 [dev-dependencies]
 critical-section = { workspace = true, features = ["std"] }
-embassy-futures.workspace = true
 embassy-sync = { workspace = true, features = ["std"] }
 embassy-time = { workspace = true, features = ["std"] }
 embassy-time-driver = { workspace = true }

embedded-service/src/power/policy/action/mod.rs

@@ -1,9 +1,7 @@
 //! Device struct and methods
-use core::ops::DerefMut;
-
 use embassy_sync::mutex::Mutex;
 
-use super::{DeviceId, Error, action};
+use super::{DeviceId, Error};
 use crate::power::policy::policy::EventReceiver;
 use crate::power::policy::{ConsumerPowerCapability, ProviderPowerCapability};
 use crate::sync::Lockable;
@@ -52,7 +50,7 @@ impl State {
 /// Internal device state for power policy
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
-struct InternalState {
+pub struct InternalState {
     /// Current state of the device
     pub state: State,
     /// Current consumer capability
@@ -131,7 +129,7 @@ where
     /// Device ID
     id: DeviceId,
     /// Current state of the device
-    state: Mutex<GlobalRawMutex, InternalState>,
+    pub state: Mutex<GlobalRawMutex, InternalState>,
     /// Reference to hardware
     pub device: &'a C,
     /// Event receiver
@@ -194,40 +192,6 @@ where
     pub async fn is_provider(&self) -> bool {
         self.state().await.kind() == StateKind::ConnectedProvider
     }
-
-    /// Internal function to set device state
-    pub(super) async fn set_state(&self, new_state: State) {
-        let mut lock = self.state.lock().await;
-        let state = lock.deref_mut();
-        state.state = new_state;
-    }
-
-    /// Try to provide access to the policy actions for the given state
-    /// Implemented here for lifetime reasons
-    pub(super) async fn try_policy_action<S: action::Kind>(
-        &self,
-    ) -> Result<action::policy::Policy<'_, C, R, S>, Error> {
-        let state = self.state().await.kind();
-        if S::kind() != state {
-            return Err(Error::InvalidState(S::kind(), state));
-        }
-        Ok(action::policy::Policy::new(self))
-    }
-
-    /// Provide access to the current policy actions
-    /// Implemented here for lifetime reasons
-    pub(super) async fn policy_action(&self) -> action::policy::AnyState<'_, C, R> {
-        match self.state().await.kind() {
-            StateKind::Detached => action::policy::AnyState::Detached(action::policy::Policy::new(self)),
-            StateKind::Idle => action::policy::AnyState::Idle(action::policy::Policy::new(self)),
-            StateKind::ConnectedProvider => {
-                action::policy::AnyState::ConnectedProvider(action::policy::Policy::new(self))
-            }
-            StateKind::ConnectedConsumer => {
-                action::policy::AnyState::ConnectedConsumer(action::policy::Policy::new(self))
-            }
-        }
-    }
 }
 
 impl<C: Lockable, R: EventReceiver> intrusive_list::NodeContainer for Device<'static, C, R>

embedded-service/src/power/policy/action/policy.rs

@@ -1,5 +1,4 @@
 //! Power policy related data structures and messages
-pub mod action;
 pub mod charger;
 pub mod device;
 pub mod flags;