refactor clock and ntp tzinfo

Author: HerrMuellerluedenscheid

examples/pico-embassy/src/main.rs

@@ -111,7 +111,7 @@ async fn main(spawner: Spawner) -> ! {
         });
 
     modem
-        .send_and_wait_reply(at_command::ntp::NTPTime {})
+        .send_and_wait_reply(at_command::ntp::Clock {})
         .await
         .unwrap();
 

examples/pico/src/main.rs

@@ -174,28 +174,30 @@ fn main() -> ! {
         .send_and_wait_reply(&at_command::at_creg::NetworkRegistration {})
         .unwrap();
 
-    delay.delay_ms(4000);
-    let _ = modem
-        .send_and_wait_reply(&at_command::ntp::StartQueryNTP {
-            url: "202.112.29.82",
-            tzinfo: None,
-        })
-        .or_else(|e| {
-            warn!("failed starting ntp connection. Connection already established?");
-            return Err(e);
-        });
-
-    modem
-        .send_and_wait_reply(&at_command::ntp::NTPTime {})
+    let time = modem
+        .send_and_wait_reply(&at_command::clock::Clock {})
         .unwrap();
-
-    delay.delay_ms(4000);
-    let _ = modem
-        .send_and_wait_reply(&at_command::ntp::StopQueryNTP {})
-        .or_else(|e| {
-            warn!("failed stopping ntp connection. Connection already established?");
-            return Err(e);
-        });
+    info!("network time: {}", time);
+    //
+    // delay.delay_ms(4000);
+    // let _ = modem
+    //     .send_and_wait_reply(&at_command::ntp::StartQueryNTP {
+    //         url: "pool.ntp.org",
+    //         tzinfo: Some("+32"),
+    //     })
+    //     .or_else(|e| {
+    //         warn!("failed starting ntp connection. Connection already established?");
+    //         return Err(e);
+    //     });
+    //
+    // delay.delay_ms(10000);
+    // let _ = modem
+    //     .send_and_wait_reply(&at_command::ntp::StopQueryNTP {})
+    //     .or_else(|e| {
+    //         warn!("failed stopping ntp connection. Connection already established?");
+    //         return Err(e);
+    //     });
+    // // here we should expect an unsolicited ntp response
 
     // if let Err(e) = test_http_connection(&mut modem) {
     //     error!("http test failed");

src/at_command/clock.rs

@@ -0,0 +1,27 @@
+use crate::at_command::{AtRequest, AtResponse, BufferType};
+use crate::AtError;
+use chrono::NaiveDateTime;
+
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+pub struct Clock {}
+
+impl AtRequest for Clock {
+    type Response = Result<(), AtError>;
+    fn get_command<'a>(&'a self, buffer: &'a mut BufferType) -> Result<&'a [u8], usize> {
+        at_commands::builder::CommandBuilder::create_query(buffer, true)
+            .named("+CCLK")
+            .finish()
+    }
+
+    fn parse_response(&self, data: &[u8]) -> Result<AtResponse, AtError> {
+        let (parsed,) = at_commands::parser::CommandParser::parse(data)
+            .expect_identifier(b"\r\n+CCLK: ")
+            .expect_raw_string()
+            .expect_identifier(b"\r\n\r\nOK")
+            .finish()?;
+        // 00/01/01,00:07:50+32  // +32 means east according to datasheet. Need to understand how to interpret
+        // these zone infos
+        let timestamp = NaiveDateTime::parse_from_str(&parsed[..17], "%y/%m/%d,%H:%M:%S").unwrap();
+        Ok(AtResponse::NTPTimestamp(timestamp.and_utc().timestamp()))
+    }
+}

src/at_command/mod.rs

@@ -21,6 +21,7 @@ pub mod ate;
 pub mod ati;
 pub mod ceer;
 pub mod cgcontrdp;
+pub mod clock;
 pub mod cmee;
 pub(crate) mod flow_control;
 pub mod http;

src/at_command/model_identification.rs

@@ -19,7 +19,7 @@ impl AtRequest for ModelIdentification {
         let (parsed,) = at_commands::parser::CommandParser::parse(data)
             .expect_identifier(b"\r\n")
             .expect_raw_string()
-            .expect_identifier(b"\r\n\r\nOK\r")
+            .expect_identifier(b"\r\n\r\nOK")
             .finish()
             .inspect(|e| {
                 #[cfg(feature = "defmt")]

src/at_command/ntp.rs

@@ -1,22 +1,27 @@
-use crate::at_command::{AtRequest, AtResponse, BufferType};
+use crate::at_command::{AtRequest, BufferType};
 use crate::AtError;
-use chrono::NaiveDateTime;
 
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct StartQueryNTP<'a> {
     pub url: &'a str,
-    pub tzinfo: Option<i8>,
+    pub tzinfo: Option<&'a str>, // currently not implemented
 }
 
 impl AtRequest for StartQueryNTP<'_> {
     type Response = Result<(), AtError>;
 
     fn get_command<'a>(&'a self, buffer: &'a mut BufferType) -> Result<&'a [u8], usize> {
-        at_commands::builder::CommandBuilder::create_set(buffer, true)
-            .named("+CSNTPSTART")
-            .with_string_parameter(self.url)
-            .with_optional_int_parameter(self.tzinfo)
-            .finish()
+        match &self.tzinfo {
+            None => at_commands::builder::CommandBuilder::create_set(buffer, true)
+                .named("+CSNTPSTART")
+                .with_string_parameter(self.url)
+                .finish(),
+            Some(tzinfo) => at_commands::builder::CommandBuilder::create_set(buffer, true)
+                .named("+CSNTPSTART")
+                .with_string_parameter(self.url)
+                .with_string_parameter(tzinfo)
+                .finish(),
+        }
     }
 }
 
@@ -32,27 +37,3 @@ impl AtRequest for StopQueryNTP {
             .finish()
     }
 }
-
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
-pub struct NTPTime {}
-
-impl AtRequest for NTPTime {
-    type Response = Result<(), AtError>;
-    fn get_command<'a>(&'a self, buffer: &'a mut BufferType) -> Result<&'a [u8], usize> {
-        at_commands::builder::CommandBuilder::create_query(buffer, true)
-            .named("+CCLK")
-            .finish()
-    }
-
-    fn parse_response(&self, data: &[u8]) -> Result<AtResponse, AtError> {
-        let (parsed,) = at_commands::parser::CommandParser::parse(data)
-            .expect_identifier(b"\r\n+CCLK: ")
-            .expect_raw_string()
-            .expect_identifier(b"\r\n\r\nOK")
-            .finish()?;
-        // 00/01/01,00:07:50+32  // +32 means east according to datasheet. Need to understand how to interpret
-        // these zone infos
-        let timestamp = NaiveDateTime::parse_from_str(&parsed[..17], "%y/%m/%d,%H:%M:%S").unwrap();
-        Ok(AtResponse::NTPTimestamp(timestamp.and_utc().timestamp()))
-    }
-}