From a3954ea3e8c827255d7f89ef6ede28921925ec10 Mon Sep 17 00:00:00 2001 From: Priec Date: Sat, 4 Oct 2025 23:00:56 +0200 Subject: [PATCH] talking to the broker properly now --- final/.cargo/config.toml | 1 + final/.env_temp | 2 ++ final/Cargo.lock | 60 ++++++++++++++++++++++++---------------- final/Cargo.toml | 6 ++-- final/src/bin/main.rs | 6 ++-- 5 files changed, 47 insertions(+), 28 deletions(-) diff --git a/final/.cargo/config.toml b/final/.cargo/config.toml index a50cb3d..a8791c1 100644 --- a/final/.cargo/config.toml +++ b/final/.cargo/config.toml @@ -7,6 +7,7 @@ ESP_LOG="info" [build] rustflags = [ "-C", "link-arg=-nostartfiles", + "-C", "link-arg=-Tdefmt.x", "-Z", "stack-protector=all", ] diff --git a/final/.env_temp b/final/.env_temp index b23f039..cdce368 100644 --- a/final/.env_temp +++ b/final/.env_temp @@ -1,2 +1,4 @@ SSID = "nazov_wifi_siete" PASSWORD = "heslo_od_wifi" +BROKER_IP= "5.196.78.28" +BROKER_PORT= "1883" diff --git a/final/Cargo.lock b/final/Cargo.lock index 95e485a..cd7084b 100644 --- a/final/Cargo.lock +++ b/final/Cargo.lock @@ -205,6 +205,16 @@ dependencies = [ "thiserror", ] +[[package]] +name = "defmt-rtt" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2cac3b8a5644a9e02b75085ebad3b6deafdbdbdec04bb25086523828aa4dfd1" +dependencies = [ + "critical-section", + "defmt 1.0.1", +] + [[package]] name = "delegate" version = "0.13.4" @@ -1167,6 +1177,32 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "projekt_final" +version = "0.1.0" +dependencies = [ + "critical-section", + "defmt 1.0.1", + "defmt-rtt", + "dotenvy", + "embassy-executor", + "embassy-net", + "embassy-time 0.5.0", + "embedded-io", + "embedded-io-async", + "esp-alloc", + "esp-backtrace", + "esp-bootloader-esp-idf", + "esp-hal", + "esp-hal-embassy", + "esp-println", + "esp-wifi", + "log", + "rust-mqtt", + "smoltcp", + "static_cell", +] + [[package]] name = "quote" version = "1.0.41" @@ -1379,30 +1415,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "test1" -version = "0.1.0" -dependencies = [ - "critical-section", - "dotenvy", - "embassy-executor", - "embassy-net", - "embassy-time 0.5.0", - "embedded-io", - "embedded-io-async", - "esp-alloc", - "esp-backtrace", - "esp-bootloader-esp-idf", - "esp-hal", - "esp-hal-embassy", - "esp-println", - "esp-wifi", - "log", - "rust-mqtt", - "smoltcp", - "static_cell", -] - [[package]] name = "thiserror" version = "2.0.17" diff --git a/final/Cargo.toml b/final/Cargo.toml index 42a7a02..d6aa66a 100644 --- a/final/Cargo.toml +++ b/final/Cargo.toml @@ -1,11 +1,11 @@ [package] edition = "2021" -name = "test1" +name = "projekt_final" rust-version = "1.86" version = "0.1.0" [[bin]] -name = "test1" +name = "projekt_final" path = "./src/bin/main.rs" [dependencies] @@ -67,6 +67,8 @@ smoltcp = { version = "0.12.0", default-features = false, features = [ ] } static_cell = "2.1.1" rust-mqtt = { version = "0.3.0", default-features = false, features = ["no_std"] } +defmt = "1.0.1" +defmt-rtt = "1.0.0" [build-dependencies] dotenvy = "0.15.7" diff --git a/final/src/bin/main.rs b/final/src/bin/main.rs index 53504aa..c523ae0 100644 --- a/final/src/bin/main.rs +++ b/final/src/bin/main.rs @@ -17,6 +17,8 @@ use esp_wifi::{ wifi::{ClientConfiguration, Configuration, WifiController, WifiDevice, WifiEvent, WifiState}, }; use log::info; +use projekt_final::mqtt::client::mqtt_task; +use defmt_rtt as _; extern crate alloc; @@ -89,8 +91,8 @@ async fn main(spawner: Spawner) -> ! { Timer::after(Duration::from_millis(500)).await; } - // Stack is ready - Add rust-mqtt task here - // spawner.spawn(mqtt_task(stack)).ok(); + spawner.spawn(mqtt_task(stack)).expect("failed to spawn MQTT task"); + info!("MQTT task started"); loop { Timer::after(Duration::from_secs(60)).await;