From 05d8284af399c09f4fbc4e1db9e68fcba1095353 Mon Sep 17 00:00:00 2001 From: Roland Jax <roland.jax@liwest.at> Date: Mon, 3 Mar 2025 11:35:37 +0100 Subject: [PATCH 1/2] typo --- include/schedule.hpp | 2 +- src/schedule.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/schedule.hpp b/include/schedule.hpp index b00a861..037cc84 100644 --- a/include/schedule.hpp +++ b/include/schedule.hpp @@ -61,7 +61,7 @@ class Schedule { static void errorCallback(const std::string &str); - void processActive(const std::vector<uint8_t>(master), + void processActive(const std::vector<uint8_t> &master, const std::vector<uint8_t> &slave); void processPassive(const std::vector<uint8_t> &master, const std::vector<uint8_t> &slave); diff --git a/src/schedule.cpp b/src/schedule.cpp index 9cc46fe..42db477 100644 --- a/src/schedule.cpp +++ b/src/schedule.cpp @@ -245,7 +245,7 @@ void Schedule::errorCallback(const std::string &str) { mqttClient.publish(topic.c_str(), 0, false, payload.c_str()); } -void Schedule::processActive(const std::vector<uint8_t>(master), +void Schedule::processActive(const std::vector<uint8_t> &master, const std::vector<uint8_t> &slave) { if (send) publishSend(sendCommand, slave); From 8a1ff560836e0046e249171de8f0d6db20735be9 Mon Sep 17 00:00:00 2001 From: Roland Jax <roland.jax@liwest.at> Date: Mon, 3 Mar 2025 11:38:24 +0100 Subject: [PATCH 2/2] includes --- include/schedule.hpp | 4 ++-- include/store.hpp | 4 ++-- src/store.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/schedule.hpp b/include/schedule.hpp index 037cc84..dfb96a4 100644 --- a/include/schedule.hpp +++ b/include/schedule.hpp @@ -1,13 +1,13 @@ #pragma once +#include <Datatypes.h> +#include <EbusHandler.h> #include <WiFiClient.h> #include <deque> #include <string> #include <vector> -#include "Datatypes.h" -#include "EbusHandler.h" #include "store.hpp" // This class sends time-controlled active commands to the ebus. All valid diff --git a/include/store.hpp b/include/store.hpp index 7a4685d..5131ea3 100644 --- a/include/store.hpp +++ b/include/store.hpp @@ -1,11 +1,11 @@ #pragma once +#include <Datatypes.h> + #include <deque> #include <string> #include <vector> -#include "Datatypes.h" - // Implements the storage of active and passive commands. New commands can be // added and removed via mqtt. It provides functions for saving, loading and // deleting commands in the nvs memory. Commands stored in the nvs are loaded at diff --git a/src/store.cpp b/src/store.cpp index 498b986..934a8e5 100644 --- a/src/store.cpp +++ b/src/store.cpp @@ -2,8 +2,8 @@ #include <ArduinoJson.h> #include <Preferences.h> +#include <Sequence.h> -#include "Sequence.h" #include "mqtt.hpp" Store store;