Make flowcontrol a bool in config trait, and export config trait

FactbirdHQ · Aug 30, 2023 · 07665cc · 07665cc
1 parent 60d570f
commit 07665cc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/ublox-cellular/src/client.rs b/ublox-cellular/src/client.rs
@@ -287,7 +287,7 @@ where
 
         // Tell module whether we support flow control
         // FIXME: Use AT+IFC=2,2 instead of AT&K here
-        if Config::FLOW_CONTROL == crate::config::FlowControl::RtsCts {
+        if Config::FLOW_CONTROL {
             self.network.send_internal(
                 &SetFlowControl {
                     value: FlowControl::RtsCts,

diff --git a/ublox-cellular/src/config.rs b/ublox-cellular/src/config.rs
@@ -26,20 +26,12 @@ impl OutputPin for NoPin {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum FlowControl {
-    /// No flow control is being used
-    None,
-    /// Hardware flow control
-    RtsCts,
-}
-
 pub trait CellularConfig {
     type ResetPin: OutputPin;
     type PowerPin: OutputPin;
     type VintPin: InputPin;
 
-    const FLOW_CONTROL: FlowControl = FlowControl::None;
+    const FLOW_CONTROL: bool = false;
     const HEX_MODE: bool = true;
 
     fn reset_pin(&mut self) -> Option<&mut Self::ResetPin>;

diff --git a/ublox-cellular/src/lib.rs b/ublox-cellular/src/lib.rs
@@ -118,6 +118,8 @@ pub type UbloxCellularIngress<'a, const INGRESS_BUF_SIZE: usize> = atat::Ingress
 
 pub type UbloxCellularUrcChannel = atat::UrcChannel<Urc, URC_CAPACITY, URC_SUBSCRIBERS>;
 
+pub use config::CellularConfig;
+
 /// Prelude - Include traits
 pub mod prelude {
     #[cfg(any(feature = "socket-udp", feature = "socket-tcp"))]