inclease versino number

Cargo.lock

@@ -280,8 +280,8 @@ dependencies = [
 
 [[package]]
 name = "mqtt-client"
-version = "1.0.0"
+version = "2.0.1"
-source = "git+https://gitea.finnvanreenen.nl/LailaTheElf/mqttClient.git?tag=v1.0.0#f0b34311457b26a0a3b3a7027845b407a3ca47ee"
+source = "git+https://gitea.finnvanreenen.nl/LailaTheElf/mqttClient.git?tag=v2.0.1#e7a46b82a51556ef177c0bf1cb914c4385aefcb9"
 dependencies = [
  "crossbeam",
  "rumqttc",
@@ -289,7 +289,7 @@ dependencies = [
 
 [[package]]
 name = "mqttAutomation"
-version = "1.1.2"
+version = "1.1.3"
 dependencies = [
  "crossbeam",
  "json",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mqttAutomation"
-version = "1.1.2"
+version = "1.1.3"
 edition = "2021"
 
 [dependencies]
@@ -9,4 +9,4 @@ json = "0.12.4"
 rumqttc = "0.24.0"
 serde = { version = "1.0.217", features = ["derive"] }
 serde_yaml = "0.9.34"
-mqtt-client = { tag = "v1.0.0", git = "https://gitea.finnvanreenen.nl/LailaTheElf/mqttClient.git" }
+mqtt-client = { tag = "v2.0.1", git = "https://gitea.finnvanreenen.nl/LailaTheElf/mqttClient.git" }

src/main.rs

@@ -1,6 +1,6 @@
 use std::fs;
 
-use crossbeam::channel::Sender;
+use mqtt_client::{MqttMessage, Sender, Receiver};
 use serde::Deserialize;
 
 use mqtt_client::mqtt_client;
@@ -107,7 +107,9 @@ impl Automation {
         }
         self.tx({ mqtt_client::MqttMessage {
             topic: String::from("/cool/devices/lamp-01/set"),
-            payload: payload
+            payload: payload,
+            retain: false,
+            qos: mqtt_client::QoS::AtMostOnce,
         }});
     }
 }
@@ -133,33 +135,40 @@ impl mqtt_client::MqttTool for Automation {
         }
     }
 
-    fn rx(&mut self, message: mqtt_client::MqttMessage) {
+    fn run(&mut self, rx: Receiver<MqttMessage>) {
-        println!("INFO : mqtt_automation: {}: {}", message.topic, message.payload);
-        if message.topic.eq("clock/time/hour") {
 
-            if message.payload.eq("7") && (self.clock_dow >= 1 && self.clock_dow <= 7) {
+        let message = rx.recv();
-                self.lamp01_set(true);
+        match message {
-            }
+            Err(e) => println!("ERROR: publisher: failed to receve an message ({})", e),
+            Ok(message) => {
+                println!("INFO : mqtt_automation: {}: {}", message.topic, message.payload);
+                if message.topic.eq("clock/time/hour") {
 
-        } else if message.topic.eq("/cool/devices/KNMITemp/values") {
+                    if message.payload.eq("7") && (self.clock_dow < 5) {
-    
+                        self.lamp01_set(true);
-            match json_parser::get_u32(json_parser::Json::Text(message.payload), Vec::from([String::from("gr")])) {
-                Ok(gr) => {
-                    if gr > 30 {
-                        self.lamp01_set(false);
                     }
-                },
+
-                Err(e) => print!("ERROR: mqtt_automation: KNMITemp: {}", e.to_string())
+                } else if message.topic.eq("/cool/devices/KNMITemp/values") {
+
+                    match json_parser::get_u32(json_parser::Json::Text(message.payload), Vec::from([String::from("gr")])) {
+                        Ok(gr) => {
+                            if gr > 30 {
+                                self.lamp01_set(false);
+                            }
+                        },
+                        Err(e) => print!("ERROR: mqtt_automation: KNMITemp: {}", e.to_string())
+                    }
+
+                }
+                else if message.topic.eq("clock/date/dow") {
+
+                    match message.payload.parse::<u8>() {
+                        Err(e) => println!("ERROR: mqtt_automation: clock/date/dow has invalid payload ({:?})", e),
+                        Ok(n) => self.clock_dow = n
+                    }
+
+                }
             }
-    
-        }
-        else if message.topic.eq("clock/date/dow") {
-
-            match message.payload.parse::<u8>() {
-                Err(e) => println!("ERROR: mqtt_automation: clock/date/dow has invalid payload ({:?})", e),
-                Ok(n) => self.clock_dow = n
-            }
-
         }
     }
 }