moved embedded-mqtt crate to a module

16 files changed, 14 insertions, 65 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 9db673d..780e0e1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -159,7 +159,6 @@ dependencies = [
  "embassy-sync",
  "embassy-time",
  "embedded-io-async",
- "embedded-mqtt",
  "heapless 0.9.2",
  "rand",
  "serde",
@@ -289,13 +288,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "embedded-mqtt"
-version = "0.1.0"
-dependencies = [
- "embedded-io-async",
-]
-
-[[package]]
 name = "embedded-nal"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 2b46089..6fa49c4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,6 @@ defmt = ["dep:defmt", "embassy-net/defmt", "embassy-sync/defmt"]
 tracing = ["dep:tracing"]
 
 [dependencies]
-embedded-mqtt = { version = "0.1", path = "./embedded-mqtt" }
 embassy-net = { version = "0.7", features = ["medium-ip", "proto-ipv4", "tcp", "dns"] }
 heapless = "0.9"
 embassy-time = { version = "0.5" }
diff --git a/embedded-mqtt/Cargo.lock b/embedded-mqtt/Cargo.lock
deleted file mode 100644
index 8f52b7a..0000000
--- a/embedded-mqtt/Cargo.lock
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "embedded-io"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
-
-[[package]]
-name = "embedded-io-async"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f"
-dependencies = [
- "embedded-io",
-]
-
-[[package]]
-name = "embedded-mqtt"
-version = "0.1.0"
-dependencies = [
- "embedded-io-async",
-]
diff --git a/embedded-mqtt/Cargo.toml b/embedded-mqtt/Cargo.toml
deleted file mode 100644
index 405efab..0000000
--- a/embedded-mqtt/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "embedded-mqtt"
-version = "0.1.0"
-edition = "2024"
-authors = ["diogo464 <[email protected]>"]
-description = "mqtt client for embedded devices"
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/diogo464/embassy-ha"
-keywords = ["mqtt", "iot", "embedded"]
-categories = ["embedded", "network-programming"]
-
-[dependencies]
-embedded-io-async = "0.6"
diff --git a/embedded-mqtt/mqtt-wire-format.md b/mqtt-wire-format.md
index b4d4f65..b4d4f65 100644
--- a/embedded-mqtt/mqtt-wire-format.md
+++ b/mqtt-wire-format.md
diff --git a/src/lib.rs b/src/lib.rs
index 3e91272..714e186 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -28,6 +28,8 @@ use heapless::{
 };
 use serde::Serialize;
 
+mod mqtt;
+
 pub mod log;
 pub use log::Format;
 
@@ -215,7 +217,7 @@ pub struct DeviceResources {
     waker: AtomicWaker,
     entities: [RefCell<Option<EntityData>>; Self::ENTITY_LIMIT],
 
-    mqtt_resources: embedded_mqtt::ClientResources,
+    mqtt_resources: mqtt::ClientResources,
     publish_buffer: Vec<u8, 2048>,
     subscribe_buffer: Vec<u8, 128>,
     discovery_buffer: Vec<u8, 2048>,
@@ -422,7 +424,7 @@ pub struct Device<'a> {
     waker: &'a AtomicWaker,
     entities: &'a [RefCell<Option<EntityData>>],
 
-    mqtt_resources: &'a mut embedded_mqtt::ClientResources,
+    mqtt_resources: &'a mut mqtt::ClientResources,
     publish_buffer: &'a mut VecView<u8>,
     subscribe_buffer: &'a mut VecView<u8>,
     discovery_buffer: &'a mut VecView<u8>,
@@ -585,8 +587,8 @@ pub async fn run<T: Transport>(device: &mut Device<'_>, transport: &mut T) -> Re
     .expect("device availability buffer too small");
     let availability_topic = device.availability_topic_buffer.as_str();
 
-    let mut client = embedded_mqtt::Client::new(device.mqtt_resources, transport);
-    let connect_params = embedded_mqtt::ConnectParams {
+    let mut client = mqtt::Client::new(device.mqtt_resources, transport);
+    let connect_params = mqtt::ConnectParams {
         will_topic: Some(availability_topic),
         will_payload: Some(NOT_AVAILABLE_PAYLOAD.as_bytes()),
         will_retain: true,
@@ -744,7 +746,7 @@ pub async fn run<T: Transport>(device: &mut Device<'_>, transport: &mut T) -> Re
         client.publish_with(
             availability_topic,
             AVAILABLE_PAYLOAD.as_bytes(),
-            embedded_mqtt::PublishParams {
+            mqtt::PublishParams {
                 retain: true,
                 ..Default::default()
             },
@@ -858,7 +860,7 @@ pub async fn run<T: Transport>(device: &mut Device<'_>, transport: &mut T) -> Re
         .await
         {
             Ok(embassy_futures::select::Either::First(packet)) => match packet {
-                Ok(embedded_mqtt::Packet::Publish(publish)) => publish,
+                Ok(mqtt::Packet::Publish(publish)) => publish,
                 Err(err) => {
                     crate::log::error!(
                         "mqtt receive failed with: {:?}",
diff --git a/embedded-mqtt/src/connect_code.rs b/src/mqtt/connect_code.rs
index 148eff6..570ce0f 100644
--- a/embedded-mqtt/src/connect_code.rs
+++ b/src/mqtt/connect_code.rs
@@ -1,4 +1,4 @@
-use crate::protocol;
+use super::protocol;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum ConnectCode {
diff --git a/embedded-mqtt/src/field.rs b/src/mqtt/field.rs
index d921b27..9e67e63 100644
--- a/embedded-mqtt/src/field.rs
+++ b/src/mqtt/field.rs
@@ -1,6 +1,6 @@
 use core::{mem::MaybeUninit, ops::Deref};
 
-use crate::varint;
+use super::varint;
 
 const DEFAULT_FIELD_BUFFER_CAP: usize = 32;
 
diff --git a/embedded-mqtt/src/lib.rs b/src/mqtt/mod.rs
index ddf9d21..30e3a33 100644
--- a/embedded-mqtt/src/lib.rs
+++ b/src/mqtt/mod.rs
@@ -1,9 +1,3 @@
-//! mqtt client library for embedded devices.
-//!
-
-
-#![no_std]
-
 mod connect_code;
 mod field;
 mod packet_id;
@@ -20,7 +14,7 @@ pub use packet_id::PacketId;
 pub use qos::Qos;
 pub use transport::Transport;
 
-use crate::{field::FieldBuffer, transport::TransportExt as _};
+use self::{field::FieldBuffer, transport::TransportExt as _};
 
 const DEFAULT_CLIENT_RX_BUFFER_SIZE: usize = 512;
 const DEFAULT_CLIENT_TX_BUFFER_SIZE: usize = 512;
diff --git a/embedded-mqtt/src/packet_id.rs b/src/mqtt/packet_id.rs
index 4e0158f..4e0158f 100644
--- a/embedded-mqtt/src/packet_id.rs
+++ b/src/mqtt/packet_id.rs
diff --git a/embedded-mqtt/src/protocol.rs b/src/mqtt/protocol.rs
index bf77d78..bf77d78 100644
--- a/embedded-mqtt/src/protocol.rs
+++ b/src/mqtt/protocol.rs
diff --git a/embedded-mqtt/src/qos.rs b/src/mqtt/qos.rs
index 0d464b4..0d464b4 100644
--- a/embedded-mqtt/src/qos.rs
+++ b/src/mqtt/qos.rs
diff --git a/embedded-mqtt/src/rx.rs b/src/mqtt/rx.rs
index 2d2164f..e81171d 100644
--- a/embedded-mqtt/src/rx.rs
+++ b/src/mqtt/rx.rs
@@ -1,4 +1,4 @@
-use crate::{ConnectCode, PacketId, Qos, protocol, varint};
+use super::{ConnectCode, PacketId, Qos, protocol, varint};
 
 #[derive(Debug)]
 pub enum Error {
diff --git a/embedded-mqtt/src/transport.rs b/src/mqtt/transport.rs
index 5a6a016..780b0ba 100644
--- a/embedded-mqtt/src/transport.rs
+++ b/src/mqtt/transport.rs
@@ -1,4 +1,4 @@
-use crate::{field::Field, varint};
+use super::{field::Field, varint};
 
 pub trait Transport: embedded_io_async::Read + embedded_io_async::Write {}
 
diff --git a/embedded-mqtt/src/tx.rs b/src/mqtt/tx.rs
index ae3d641..cdf1c75 100644
--- a/embedded-mqtt/src/tx.rs
+++ b/src/mqtt/tx.rs
@@ -1,4 +1,4 @@
-use crate::{
+use super::{
     PacketId,
     field::{self, Field, FieldBuffer},
     protocol,
diff --git a/embedded-mqtt/src/varint.rs b/src/mqtt/varint.rs
index 63bdd06..63bdd06 100644
--- a/embedded-mqtt/src/varint.rs
+++ b/src/mqtt/varint.rs