wip: add device id in answer payload

Author: j-g00da

mqtt_example/src/main.rs

@@ -26,7 +26,8 @@ fn main() -> anyhow::Result<()> {
     let nvs = EspDefaultNvsPartition::take()?;
     let peripherals = Peripherals::take()?;
 
-    let wifi = wifi::configure(&event_loop, &nvs, peripherals.modem)?;
+    let mut wifi = wifi::configure(&event_loop, &nvs, peripherals.modem)?;
+    let device_id = wifi::get_mac(&mut wifi);
     std::mem::forget(wifi);
 
     let (mut mqtt_client, mqtt_connection) = mqtt::configure()?;
@@ -91,8 +92,7 @@ fn main() -> anyhow::Result<()> {
                     if question_id.is_empty() {
                         continue;
                     }
-                    // TODO: add device id (from MAC?)
-                    let payload = format!("{}|{}", question_id, data);
+                    let payload = format!("{}|{}|{}", device_id, question_id, data);
                     mqtt_client.enqueue("answer", QoS::AtLeastOnce, false, payload.as_bytes())?;
 
                     display.clear();

mqtt_example/src/wifi.rs

@@ -4,7 +4,7 @@ use embedded_svc::wifi::{ClientConfiguration, Configuration};
 use esp_idf_svc::eventloop::EspSystemEventLoop;
 use esp_idf_svc::hal::modem::Modem;
 use esp_idf_svc::nvs::EspDefaultNvsPartition;
-use esp_idf_svc::wifi::{BlockingWifi, EspWifi};
+use esp_idf_svc::wifi::{BlockingWifi, EspWifi, WifiDeviceId};
 use log::info;
 
 pub fn configure(
@@ -28,3 +28,8 @@ pub fn configure(
     info!("[WIFI] Connected");
     Ok(wifi)
 }
+
+pub fn get_mac(wifi: &mut BlockingWifi<EspWifi>) -> String {
+    let mac_bytes = wifi.wifi_mut().get_mac(WifiDeviceId::Sta).unwrap();
+    mac_bytes.map(|b| format!("{:X}", b)).join(":")
+}