Merge branch 'embedded-nal_0.8' into 0.1.x

Cargo.toml

@@ -5,25 +5,28 @@ keywords = ["ESP8266", "network", "no_std", "at"]
 categories  = ["embedded", "network-programming", "no-std"]
 authors = ["PEGASUS GmbH <[email protected]>"]
 license = "MIT OR Apache-2.0"
-version = "0.1.2"
+version = "0.2.1"
 edition = "2021"
 repository = "https://github.com/pegasus-aero/rt-esp-at-nal"
 readme = "README.md"
 documentation = "https://docs.rs/esp-at-nal"
 
 [dependencies]
-atat = "0.17.0"
-embedded-nal = "0.6.0"
+atat = "0.18.0"
+embedded-nal = "0.8.0"
 nb = "1.0.0"
 fugit = "0.3.6"
 fugit-timer = "0.1.3"
 heapless = "0.7.16"
-bbqueue = { version = "0.5.0", optional=true }
+bbqueue = { version = "0.5.0", optional = true }
 numtoa = "0.2"
 base16 = { version = "0.2", default-features = false }
 
 [dev-dependencies]
+env_logger = "0.6"
+log = "0.4"
 mockall = "0.11.2"
+serialport = { git = "https://github.com/dbrgn/serialport-rs", branch = "embedded-hal", features = ["embedded"], default_features = false }
 
 [features]
 default = ["examples"]

README.md

@@ -1,4 +1,5 @@
 # no_std ESP-AT network layer
+
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Crates.io](https://img.shields.io/crates/v/esp-at-nal.svg)](https://crates.io/crates/esp-at-nal)
@@ -11,6 +12,9 @@ Currently, this crates offers the following features
 * TCP client stack (multi socket), s. [stack module](https://docs.rs/esp-at-nal/latest/esp_at_nal/stack/index.html)
 
 ## Example
+
+Here's a simple example using a mocked AtClient:
+
 ````rust
 use std::str::FromStr;
 use embedded_nal::{SocketAddr, TcpClientStack};
@@ -34,17 +38,25 @@ adapter.connect(&mut socket, SocketAddr::from_str("10.0.0.1:21").unwrap()).unwra
 adapter.send(&mut socket, b"hallo!").unwrap();
 ````
 
+To see a real-world example that runs on Linux, check out `examples/linux.rs`:
+
+    # For logging
+    export RUST_LOG=trace
+
+    cargo run --example linux --features "atat/log" -- \
+        /dev/ttyUSB0 115200 mywifi hellopasswd123
 
 ## Development
 
 Any form of support is greatly appreciated. Feel free to create issues and PRs.
 See [DEVELOPMENT](DEVELOPMENT.md) for more details.
 
 ## License
+
 Licensed under either of
 
 * Apache License, Version 2.0, (LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0)
 * MIT license (LICENSE-MIT or http://opensource.org/licenses/MIT)
   at your option.
 
-Each contributor agrees that his/her contribution covers both licenses.
+Each contributor agrees that his/her contribution covers both licenses.

examples/linux.rs

@@ -0,0 +1,274 @@
+//! Example that runs on Linux using a serial-USB-adapter.
+use std::{
+    env, io,
+    net::{SocketAddr as StdSocketAddr, ToSocketAddrs},
+    thread,
+    time::Duration,
+};
+
+use atat::bbqueue::BBBuffer;
+use embedded_nal::{SocketAddr as NalSocketAddr, TcpClientStack};
+use esp_at_nal::{
+    urc::URCMessages,
+    wifi::{Adapter, WifiAdapter},
+};
+use serialport::{DataBits, FlowControl, Parity, SerialPort, StopBits};
+
+// Chunk size in bytes when sending data. Higher value results in better
+// performance, but introduces also higher stack memory footprint. Max value: 8192.
+const TX_SIZE: usize = 1024;
+// Chunk size in bytes when receiving data. Value should be matched to buffer
+// size of receive() calls.
+const RX_SIZE: usize = 2048;
+
+// Constants derived from TX_SIZE and RX_SIZE
+const ESP_TX_SIZE: usize = TX_SIZE;
+const ESP_RX_SIZE: usize = RX_SIZE;
+const ATAT_RX_SIZE: usize = RX_SIZE;
+const URC_RX_SIZE: usize = RX_SIZE;
+const RES_CAPACITY: usize = RX_SIZE;
+const URC_CAPACITY: usize = RX_SIZE * 3;
+
+// Timer frequency in Hz
+const TIMER_HZ: u32 = 1000;
+
+fn main() {
+    env_logger::init();
+
+    // Parse args
+    let args: Vec<String> = env::args().collect();
+    if args.len() != 5 {
+        println!("Usage: {} <path-to-serial> <baudrate> <ssid> <psk>", args[0]);
+        println!("Example: {} /dev/ttyUSB0 115200 mywifi hellopasswd123", args[0]);
+        println!("\nNote: To run the example with debug logging, run it like this:");
+        println!("\n  RUST_LOG=trace cargo run --example linux --features \"atat/log\" -- /dev/ttyUSB0 115200 mywifi hellopasswd123");
+        std::process::exit(1);
+    }
+    let dev = &args[1];
+    let baud_rate: u32 = args[2].parse().unwrap();
+    let ssid = &args[3];
+    let psk = &args[4];
+
+    println!("Starting (dev={}, baud={:?})...", dev, baud_rate);
+
+    // Open serial port
+    let serial_tx = serialport::new(dev, baud_rate)
+        .data_bits(DataBits::Eight)
+        .flow_control(FlowControl::None)
+        .parity(Parity::None)
+        .stop_bits(StopBits::One)
+        .timeout(Duration::from_millis(500))
+        .open()
+        .expect("Could not open serial port");
+    let mut serial_rx = serial_tx.try_clone().expect("Could not clone serial port");
+
+    // Atat queues
+    static mut RES_QUEUE: BBBuffer<RES_CAPACITY> = BBBuffer::new();
+    static mut URC_QUEUE: BBBuffer<URC_CAPACITY> = BBBuffer::new();
+    let queues = atat::Queues {
+        res_queue: unsafe { RES_QUEUE.try_split_framed().unwrap() },
+        urc_queue: unsafe { URC_QUEUE.try_split_framed().unwrap() },
+    };
+
+    // Two timer instances
+    let atat_timer = timer::SysTimer::new();
+    let esp_timer = timer::SysTimer::new();
+
+    // Atat client
+    let config = atat::Config::new(atat::Mode::Timeout);
+    let digester = atat::AtDigester::<URCMessages<URC_RX_SIZE>>::new();
+    let (client, mut ingress) =
+        atat::ClientBuilder::<_, _, _, TIMER_HZ, ATAT_RX_SIZE, RES_CAPACITY, URC_CAPACITY>::new(
+            serial_tx, atat_timer, digester, config,
+        )
+        .build(queues);
+
+    // Flush serial RX buffer, to ensure that there isn't any remaining left
+    // form previous sessions.
+    flush_serial(&mut serial_rx);
+
+    // Launch reading thread, to pass incoming data from serial to the atat ingress
+    thread::Builder::new()
+        .name("serial_read".to_string())
+        .spawn(move || loop {
+            let mut buffer = [0; 32];
+            match serial_rx.read(&mut buffer[..]) {
+                Ok(0) => {}
+                Ok(bytes_read) => {
+                    ingress.write(&buffer[0..bytes_read]);
+                    ingress.digest();
+                    ingress.digest();
+                }
+                Err(e) => match e.kind() {
+                    io::ErrorKind::WouldBlock | io::ErrorKind::TimedOut | io::ErrorKind::Interrupted => {
+                        // Ignore
+                    }
+                    _ => {
+                        log::error!("Serial reading thread error while reading: {}", e);
+                    }
+                },
+            }
+        })
+        .unwrap();
+
+    // ESP AT adapter
+    let mut adapter: Adapter<_, _, TIMER_HZ, ESP_TX_SIZE, ESP_RX_SIZE> = Adapter::new(client, esp_timer);
+
+    // Join WIFI access point
+    println!("Join WiFi \"{}\"...", ssid);
+    let state = adapter.join(ssid, psk).unwrap();
+    assert!(state.connected);
+
+    // Resolve IPv4 for ifconfig.net
+    let remote_host = "ifconfig.net";
+    let ipv4_and_port = (remote_host, 80)
+        .to_socket_addrs()
+        .unwrap()
+        .find_map(|addr| match addr {
+            StdSocketAddr::V4(v4) => Some((v4.ip().octets(), v4.port())),
+            _ => None,
+        })
+        .unwrap();
+    let socket_addr = NalSocketAddr::from(ipv4_and_port);
+
+    // Create TCP connection
+    let mut socket = adapter.socket().expect("Failed to create socket");
+    println!("Connecting to {}...", remote_host);
+    adapter
+        .connect(&mut socket, socket_addr)
+        .unwrap_or_else(|_| panic!("Failed to connect to {}", remote_host));
+    println!("Connected!");
+
+    // Send HTTP request
+    println!("Sending HTTP request...");
+    let request = b"GET / HTTP/1.1\r\nAccept: text/plain\r\nHost: ifconfig.net\r\n\r\n";
+    adapter.send(&mut socket, request).expect("Could not send HTTP request");
+
+    // Read response
+    let mut rx_buf = [0; RX_SIZE];
+    let bytes_read = nb::block!(adapter.receive(&mut socket, &mut rx_buf)).expect("Error while receiving data");
+    println!("Read {} bytes", bytes_read);
+    assert!(bytes_read < rx_buf.len(), "HTTP response did not fit in rx_buffer");
+    let response = std::str::from_utf8(&rx_buf[..bytes_read]).expect("HTTP response is not valid UTF8");
+
+    // Very primitive HTTP response parsing
+    let (headers, body) = response.split_once("\r\n\r\n").unwrap_or_else(|| {
+        println!("Response:\n---\n{}\n---", response);
+        panic!("Could not parse HTTP response");
+    });
+    if !headers.starts_with("HTTP/1.1 ") {
+        panic!(
+            "Unsupported HTTP response, expected HTTP/1.1 but found {}",
+            &headers[..8]
+        );
+    }
+    if !headers.starts_with("HTTP/1.1 200 ") {
+        panic!("Bad HTTP response code, expected 200 but found {}", &headers[9..12]);
+    }
+    println!("Your public IP, as returned by {}: {}", remote_host, body.trim());
+}
+
+/// Flush the serial port receive buffer.
+fn flush_serial(serial_rx: &mut Box<dyn SerialPort>) {
+    let mut buf = [0; 32];
+    loop {
+        match serial_rx.read(&mut buf[..]) {
+            Ok(0) => break,
+            Err(e) if e.kind() == io::ErrorKind::WouldBlock || e.kind() == io::ErrorKind::TimedOut => break,
+            Ok(_) => continue,
+            Err(e) => panic!("Error while flushing serial: {}", e),
+        }
+    }
+}
+
+mod timer {
+    use std::{convert::TryInto, time::Instant as StdInstant};
+
+    use atat::clock::Clock;
+    use fugit::Instant;
+
+    /// A timer with millisecond precision.
+    pub struct SysTimer {
+        start: StdInstant,
+        duration_ms: u32,
+        started: bool,
+    }
+
+    impl SysTimer {
+        pub fn new() -> SysTimer {
+            SysTimer {
+                start: StdInstant::now(),
+                duration_ms: 0,
+                started: false,
+            }
+        }
+    }
+
+    impl Clock<1000> for SysTimer {
+        type Error = &'static str;
+
+        /// Return current time `Instant`
+        fn now(&mut self) -> fugit::TimerInstantU32<1000> {
+            let milliseconds = (StdInstant::now() - self.start).as_millis();
+            let ticks: u32 = milliseconds.try_into().expect("u32 timer overflow");
+            Instant::<u32, 1, 1000>::from_ticks(ticks)
+        }
+
+        /// Start timer with a `duration`
+        fn start(&mut self, duration: fugit::TimerDurationU32<1000>) -> Result<(), Self::Error> {
+            // (Re)set start and duration
+            self.start = StdInstant::now();
+            self.duration_ms = duration.ticks();
+
+            // Set started flag
+            self.started = true;
+
+            Ok(())
+        }
+
+        /// Tries to stop this timer.
+        ///
+        /// An error will be returned if the timer has already been canceled or was never started.
+        /// An error is also returned if the timer is not `Periodic` and has already expired.
+        fn cancel(&mut self) -> Result<(), Self::Error> {
+            if !self.started {
+                Err("cannot cancel stopped timer")
+            } else {
+                self.started = false;
+                Ok(())
+            }
+        }
+
+        /// Wait until timer `duration` has expired.
+        /// Must return `nb::Error::WouldBlock` if timer `duration` is not yet over.
+        /// Must return `OK(())` as soon as timer `duration` has expired.
+        fn wait(&mut self) -> nb::Result<(), Self::Error> {
+            let now = StdInstant::now();
+            if (now - self.start).as_millis() > self.duration_ms.into() {
+                Ok(())
+            } else {
+                Err(nb::Error::WouldBlock)
+            }
+        }
+    }
+
+    #[cfg(test)]
+    mod tests {
+        use super::*;
+
+        #[test]
+        fn test_delay() {
+            let mut timer = SysTimer::new();
+
+            // Wait 500 ms
+            let before = StdInstant::now();
+            timer.start(fugit::Duration::<u32, 1, 1000>::from_ticks(500)).unwrap();
+            nb::block!(timer.wait()).unwrap();
+            let after = StdInstant::now();
+
+            let duration_ms = (after - before).as_millis();
+            assert!(duration_ms >= 500);
+            assert!(duration_ms < 1000);
+        }
+    }
+}