Remove Buffers type

FactbirdHQ · Dec 11, 2023 · 829d4e2 · 829d4e2
1 parent 23d9c18
commit 829d4e2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 94 deletions.
diff --git a/atat/src/buffers.rs b/atat/src/buffers.rs
diff --git a/atat/src/lib.rs b/atat/src/lib.rs
@@ -222,7 +222,6 @@
 // This mod MUST go first, so that the others see its macros.
 pub(crate) mod fmt;
 
-mod buffers;
 mod config;
 pub mod digest;
 mod error;
@@ -261,7 +260,6 @@ pub use serde_at;
 #[cfg(feature = "derive")]
 pub use heapless;
 
-pub use buffers::Buffers;
 pub use config::Config;
 pub use digest::{AtDigester, AtDigester as DefaultDigester, DigestResult, Digester, Parser};
 pub use error::{CmeError, CmsError, ConnectionError, Error, InternalError};

diff --git a/examples/src/bin/embassy.rs b/examples/src/bin/embassy.rs
@@ -3,7 +3,10 @@
 #![feature(type_alias_impl_trait)]
 #![allow(incomplete_features)]
 
-use atat::{asynch::AtatClient, AtatIngress, Buffers, DefaultDigester, Ingress};
+use atat::{
+    asynch::{AtatClient, Client},
+    AtatIngress, DefaultDigester, Ingress, ResponseChannel, UrcChannel,
+};
 use atat_examples::common;
 use embassy_executor::Spawner;
 use embassy_executor::_export::StaticCell;
@@ -47,14 +50,14 @@ async fn main(spawner: Spawner) {
     );
     let (reader, writer) = uart.split();
 
-    static BUFFERS: Buffers<common::Urc, INGRESS_BUF_SIZE, URC_CAPACITY, URC_SUBSCRIBERS> =
-        Buffers::<common::Urc, INGRESS_BUF_SIZE, URC_CAPACITY, URC_SUBSCRIBERS>::new();
-
-    let (ingress, mut client) = BUFFERS.split(
-        writer,
+    static RES_CHANNEL: ResponseChannel<INGRESS_BUF_SIZE> = ResponseChannel::new();
+    static URC_CHANNEL: UrcChannel<Urc, URC_CAPACITY, URC_SUBSCRIBERS> = UrcChannel::new();
+    let ingress = Ingress::new(
         DefaultDigester::<common::Urc>::default(),
-        atat::Config::default(),
+        RES_CHANNEL.publisher(),
+        URC_CHANNEL.publisher(),
     );
+    let mut client = Client::new(writer, RES_CHANNEL.subscriber(), atat::Config::default());
 
     spawner.spawn(ingress_task(ingress, reader)).unwrap();
 

diff --git a/examples/src/bin/std-tokio.rs b/examples/src/bin/std-tokio.rs
@@ -4,7 +4,7 @@ use atat_examples::common;
 
 use std::process::exit;
 
-use atat::{asynch::AtatClient, AtatIngress, Buffers, Config, DefaultDigester, Ingress};
+use atat::{asynch::AtatClient, AtatIngress, Config, DefaultDigester, Ingress};
 use embedded_io_adapters::tokio_1::FromTokio;
 use tokio_serial::SerialStream;
 
@@ -16,15 +16,19 @@ const URC_SUBSCRIBERS: usize = 3;
 async fn main() -> ! {
     env_logger::init();
 
-    static BUFFERS: Buffers<common::Urc, INGRESS_BUF_SIZE, URC_CAPACITY, URC_SUBSCRIBERS> =
-        Buffers::<common::Urc, INGRESS_BUF_SIZE, URC_CAPACITY, URC_SUBSCRIBERS>::new();
-
     let (reader, writer) = SerialStream::pair().expect("Failed to create serial pair");
 
-    let (ingress, mut client) = BUFFERS.split(
-        FromTokio::new(writer),
+    static RES_CHANNEL: ResponseChannel<INGRESS_BUF_SIZE> = ResponseChannel::new();
+    static URC_CHANNEL: UrcChannel<Urc, URC_CAPACITY, URC_SUBSCRIBERS> = UrcChannel::new();
+    let ingress = Ingress::new(
         DefaultDigester::<common::Urc>::default(),
-        Config::default(),
+        RES_CHANNEL.publisher(),
+        URC_CHANNEL.publisher(),
+    );
+    let mut client = Client::new(
+        FromTokio::new(writer),
+        RES_CHANNEL.subscriber(),
+        atat::Config::default(),
     );
 
     tokio::spawn(ingress_task(ingress, FromTokio::new(reader)));