Merge branch 'master' into mga_gps

ublox-rs · Sep 11, 2022 · e24ae2f · e24ae2f
2 parents 90244c6 + 8578d28
commit e24ae2f
Show file tree

Hide file tree

Showing 12 changed files with 1,307 additions and 29 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Install MSRV
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.49.0
+        toolchain: 1.57.0
         override: true
         components: rustfmt, clippy
     - name: Build

diff --git a/README.md b/README.md
@@ -21,15 +21,15 @@ Constructing Packets
 
 Constructing packets happens using the `Builder` variant of the packet, for example:
 ```
-use ublox::{CfgPrtUartBuilder, UartPortId};
+use ublox::{CfgPrtUartBuilder, UartPortId, UartMode, DataBits, Parity, StopBits, InProtoMask, OutProtoMask};
 let packet: [u8; 28] = CfgPrtUartBuilder {
    portid: UartPortId::Uart1,
    reserved0: 0,
    tx_ready: 0,
-   mode: 0x8d0,
+   mode: UartMode::new(DataBits::Eight, Parity::None, StopBits::One),
    baud_rate: 9600,
-   in_proto_mask: 0x07,
-   out_proto_mask: 0x01,
+   in_proto_mask: InProtoMask::all(),
+   out_proto_mask: OutProtoMask::UBLOX,
    flags: 0,
    reserved5: 0,
 }.into_packet_bytes();

diff --git a/ublox/Cargo.toml b/ublox/Cargo.toml
@@ -18,6 +18,7 @@ chrono = { version = "0.4.19", default-features = false, features = [] }
 bitflags = "1.2.1"
 ublox_derive = { path = "../ublox_derive", version = "0.0.4" }
 num-traits = { version = "0.2.12", default-features = false }
+serde = { version = "1.0", optional = true, default-features = false, features = ["derive"] }
 
 [build-dependencies]
 

diff --git a/ublox/src/lib.rs b/ublox/src/lib.rs
@@ -9,16 +9,16 @@
 //!
 //! Constructing packets happens using the `Builder` variant of the packet, for example:
 //! ```
-//! use ublox::{CfgPrtUartBuilder, UartPortId};
+//! use ublox::{CfgPrtUartBuilder, UartPortId, UartMode, DataBits, Parity, StopBits, InProtoMask, OutProtoMask};
 //!
 //! let packet: [u8; 28] = CfgPrtUartBuilder {
 //!    portid: UartPortId::Uart1,
 //!    reserved0: 0,
 //!    tx_ready: 0,
-//!    mode: 0x8d0,
+//!    mode: UartMode::new(DataBits::Eight, Parity::None, StopBits::One),
 //!    baud_rate: 9600,
-//!    in_proto_mask: 0x07,
-//!    out_proto_mask: 0x01,
+//!    in_proto_mask: InProtoMask::all(),
+//!    out_proto_mask: OutProtoMask::UBLOX,
 //!    flags: 0,
 //!    reserved5: 0,
 //! }.into_packet_bytes();
@@ -69,6 +69,10 @@
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
+#[cfg(feature = "serde")]
+#[macro_use]
+extern crate serde;
+
 pub use crate::{
     error::{DateTimeError, MemWriterError, ParserError},
     parser::{FixedLinearBuffer, Parser, ParserIter, UnderlyingBuffer},

diff --git a/ublox/src/ubx_packets.rs b/ublox/src/ubx_packets.rs
@@ -1,3 +1,4 @@
+pub mod cfg_val;
 mod packets;
 mod types;