C3MA/PlantCtrl
6
0
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

fixup! refactor: create mqtt module with core MQTT statics and tasks

Browse Source 
fix: add missing crate::bail import and move mk_static! macro before usage
This commit is contained in:
ju6ge
2026-05-05 22:22:29 +02:00
parent a84a325852
commit f70ce6a108
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rust/src/mqtt.rs
View File

@@ -1,3 +1,4 @@
use crate::bail;
use crate::config::NetworkConfig; use crate::config::NetworkConfig;
use crate::fat_error::{ContextExt, FatError, FatResult}; use crate::fat_error::{ContextExt, FatError, FatResult};
use crate::hal::PlantHal; use crate::hal::PlantHal;
@@ -135,6 +136,15 @@ async fn publish_inner(subtopic: &str, message: &str) -> FatResult<()> {
} }
} }
macro_rules! mk_static {
($t:ty,$val:expr) => {{
static STATIC_CELL: static_cell::StaticCell<$t> = static_cell::StaticCell::new();
#[deny(unused_attributes)]
let x = STATIC_CELL.uninit().write(($val));
x
}};
}
pub async fn mqtt_init( pub async fn mqtt_init(
network_config: &'static NetworkConfig, network_config: &'static NetworkConfig,
stack: Stack<'static>, stack: Stack<'static>,
@@ -239,15 +249,6 @@ pub async fn mqtt_init(
Ok(()) Ok(())
} }
macro_rules! mk_static {
($t:ty,$val:expr) => {{
static STATIC_CELL: static_cell::StaticCell<$t> = static_cell::StaticCell::new();
#[deny(unused_attributes)]
let x = STATIC_CELL.uninit().write(($val));
x
}};
}
#[embassy_executor::task] #[embassy_executor::task]
async fn mqtt_runner( async fn mqtt_runner(
task: McutieTask<'static, String, PublishDisplay<'static, String, &'static str>, 2>, task: McutieTask<'static, String, PublishDisplay<'static, String, &'static str>, 2>,