From a9ca6bc28d26e4fd4757c7b52a291bb6d2b0bc67 Mon Sep 17 00:00:00 2001 From: coolneng Date: Tue, 25 Nov 2025 17:27:05 +0100 Subject: [PATCH] Move includes to cpp files --- include/config.h | 22 ++++++++-------- include/wlan.h | 1 - src/config.cpp | 43 ++++++++++++++++--------------- src/main.cpp | 3 ++- src/wlan.cpp | 66 ++++++++++++++++++++++++------------------------ 5 files changed, 67 insertions(+), 68 deletions(-) diff --git a/include/config.h b/include/config.h index df82916..9cd1630 100644 --- a/include/config.h +++ b/include/config.h @@ -1,21 +1,19 @@ #ifndef CONFIG_H_ #define CONFIG_H_ -#include "FS.h" -#include "LittleFS.h" #include typedef struct { - const char *ssid; - const char *psk; - const char *mqtt_host; - const char *mqtt_user; - const char *mqtt_password; - const char *topic; - const char *device_id; - int mqtt_port; - long sleep_time; - int connection_attempts; + const char *ssid; + const char *psk; + const char *mqtt_host; + const char *mqtt_user; + const char *mqtt_password; + const char *topic; + const char *device_id; + int mqtt_port; + long sleep_time; + int connection_attempts; } Config; void initialize_config(Config *config, JsonDocument json); diff --git a/include/wlan.h b/include/wlan.h index 9f5b6a9..e797786 100644 --- a/include/wlan.h +++ b/include/wlan.h @@ -2,7 +2,6 @@ #define WLAN_H #include "config.h" -#include #include void initial_connection(const char *ssid, const char *psk, diff --git a/src/config.cpp b/src/config.cpp index e91148f..db23343 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1,30 +1,31 @@ #include "config.h" +#include "LittleFS.h" void initialize_config(Config *config, JsonDocument json) { - config->ssid = strdup(json["ssid"]); - config->psk = strdup(json["psk"]); - config->mqtt_host = strdup(json["mqtt_host"]); - config->mqtt_user = strdup(json["mqtt_user"]); - config->mqtt_password = strdup(json["mqtt_password"]); - config->topic = strdup(json["mqtt_topic"]); - config->device_id = strdup(json["device_id"]); - config->mqtt_port = json["mqtt_port"]; - config->sleep_time = minutes_to_microseconds(json["sleep_time"]); - config->connection_attempts = json["connection_attempts"]; + config->ssid = strdup(json["ssid"]); + config->psk = strdup(json["psk"]); + config->mqtt_host = strdup(json["mqtt_host"]); + config->mqtt_user = strdup(json["mqtt_user"]); + config->mqtt_password = strdup(json["mqtt_password"]); + config->topic = strdup(json["mqtt_topic"]); + config->device_id = strdup(json["device_id"]); + config->mqtt_port = json["mqtt_port"]; + config->sleep_time = minutes_to_microseconds(json["sleep_time"]); + config->connection_attempts = json["connection_attempts"]; } bool load_config_file(const char *file_path, Config *config) { - if (!LittleFS.begin()) - return false; - File config_file = LittleFS.open(file_path, "r"); - if (!config_file) - return false; - JsonDocument json; - DeserializationError err = deserializeJson(json, config_file); - if (err) - return false; - initialize_config(config, json); - return true; + if (!LittleFS.begin()) + return false; + File config_file = LittleFS.open(file_path, "r"); + if (!config_file) + return false; + JsonDocument json; + DeserializationError err = deserializeJson(json, config_file); + if (err) + return false; + initialize_config(config, json); + return true; } long minutes_to_microseconds(int minutes) { return (minutes * 6e7); } diff --git a/src/main.cpp b/src/main.cpp index 4046910..1f32a04 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,7 @@ -#include "config.h" #include "wlan.h" #include +#include +#include #include #include diff --git a/src/wlan.cpp b/src/wlan.cpp index ce798cf..a7703fe 100644 --- a/src/wlan.cpp +++ b/src/wlan.cpp @@ -1,53 +1,53 @@ #include "wlan.h" -#include +#include void initial_connection(const char *ssid, const char *psk, const char *hostname) { - WiFi.hostname(hostname); - WiFi.begin(ssid, psk); - WiFi.persistent(true); - WiFi.setAutoConnect(true); - WiFi.setAutoReconnect(true); + WiFi.hostname(hostname); + WiFi.begin(ssid, psk); + WiFi.persistent(true); + WiFi.setAutoConnect(true); + WiFi.setAutoReconnect(true); } void connect_wlan(Config *config) { - if (WiFi.SSID() != config->ssid) - initial_connection(config->ssid, config->psk, config->device_id); - while (WiFi.status() != WL_CONNECTED) { - delay(1000); - Serial.print("."); - } - Serial.println("WiFi connected"); + if (WiFi.SSID() != config->ssid) + initial_connection(config->ssid, config->psk, config->device_id); + while (WiFi.status() != WL_CONNECTED) { + delay(1000); + Serial.print("."); + } + Serial.println("WiFi connected"); } void connect_mqtt(PubSubClient &client, Config *config) { - if (!client.connected()) - client.setServer(config->mqtt_host, config->mqtt_port); - if (client.connect(config->device_id, config->mqtt_user, - config->mqtt_password)) { - Serial.println("MQTT connected"); - client.subscribe(config->topic); - } + if (!client.connected()) + client.setServer(config->mqtt_host, config->mqtt_port); + if (client.connect(config->device_id, config->mqtt_user, + config->mqtt_password)) { + Serial.println("MQTT connected"); + client.subscribe(config->topic); + } } void disconnect_mqtt(PubSubClient &client, const char *topic) { - Serial.println("Disconnecting MQTT"); - client.unsubscribe(topic); - client.disconnect(); + Serial.println("Disconnecting MQTT"); + client.unsubscribe(topic); + client.disconnect(); } size_t construct_json(float *data, char *buffer, int buffer_size) { - JsonDocument json; - json["temperature"] = data[0]; - json["humidity"] = data[1]; - size_t payload_size = serializeJson(json, buffer, buffer_size); - return payload_size; + JsonDocument json; + json["temperature"] = data[0]; + json["humidity"] = data[1]; + size_t payload_size = serializeJson(json, buffer, buffer_size); + return payload_size; } void mqtt_transfer(PubSubClient &client, Config *config, float *data) { - char buffer[100]; - connect_mqtt(client, config); - size_t payload_size = construct_json(data, buffer, 100); - client.publish(config->topic, buffer, payload_size); - Serial.println("Data transferred successfully"); + char buffer[100]; + connect_mqtt(client, config); + size_t payload_size = construct_json(data, buffer, 100); + client.publish(config->topic, buffer, payload_size); + Serial.println("Data transferred successfully"); }