From b42ee565b9c6df8a7f11af1f37faca332d16bfe9 Mon Sep 17 00:00:00 2001 From: Eric Duminil <eric.duminil@gmail.com> Date: Tue, 15 Feb 2022 17:21:07 +0100 Subject: [PATCH] Include IotWebConf in src/lib --- ampel-firmware/src/lib/IotWebConf/src/IotWebConf.h | 6 +++--- .../src/lib/IotWebConf/src/IotWebConfParameter.cpp | 2 +- ampel-firmware/src/lib/IotWebConf/src/IotWebConfParameter.h | 4 ++-- .../src/lib/IotWebConf/src/IotWebConfTParameter.h | 4 ++-- .../src/lib/IotWebConf/src/IotWebConfTParameterBuilder.h | 2 +- ampel-firmware/web_config.cpp | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ampel-firmware/src/lib/IotWebConf/src/IotWebConf.h b/ampel-firmware/src/lib/IotWebConf/src/IotWebConf.h index ae7739c..ddf708b 100644 --- a/ampel-firmware/src/lib/IotWebConf/src/IotWebConf.h +++ b/ampel-firmware/src/lib/IotWebConf/src/IotWebConf.h @@ -13,9 +13,9 @@ #define IotWebConf_h #include <Arduino.h> -#include <IotWebConfParameter.h> -#include <IotWebConfSettings.h> -#include <IotWebConfWebServerWrapper.h> +#include "IotWebConfParameter.h" +#include "IotWebConfSettings.h" +#include "IotWebConfWebServerWrapper.h" #ifdef ESP8266 # include <ESP8266WiFi.h> diff --git a/ampel-firmware/src/lib/IotWebConf/src/IotWebConfParameter.cpp b/ampel-firmware/src/lib/IotWebConf/src/IotWebConfParameter.cpp index 83aa153..be9d99b 100644 --- a/ampel-firmware/src/lib/IotWebConf/src/IotWebConfParameter.cpp +++ b/ampel-firmware/src/lib/IotWebConf/src/IotWebConfParameter.cpp @@ -9,7 +9,7 @@ * of the MIT license. See the LICENSE file for details. */ -#include <IotWebConfParameter.h> +#include "IotWebConfParameter.h" namespace iotwebconf { diff --git a/ampel-firmware/src/lib/IotWebConf/src/IotWebConfParameter.h b/ampel-firmware/src/lib/IotWebConf/src/IotWebConfParameter.h index 1f83691..4ad7b95 100644 --- a/ampel-firmware/src/lib/IotWebConf/src/IotWebConfParameter.h +++ b/ampel-firmware/src/lib/IotWebConf/src/IotWebConfParameter.h @@ -14,8 +14,8 @@ #include <Arduino.h> #include <functional> -#include <IotWebConfSettings.h> -#include <IotWebConfWebServerWrapper.h> +#include "IotWebConfSettings.h" +#include "IotWebConfWebServerWrapper.h" #ifdef IOTWEBCONF_ENABLE_JSON # include <ArduinoJson.h> diff --git a/ampel-firmware/src/lib/IotWebConf/src/IotWebConfTParameter.h b/ampel-firmware/src/lib/IotWebConf/src/IotWebConfTParameter.h index 9bd42e3..65796d5 100644 --- a/ampel-firmware/src/lib/IotWebConf/src/IotWebConfTParameter.h +++ b/ampel-firmware/src/lib/IotWebConf/src/IotWebConfTParameter.h @@ -15,7 +15,7 @@ // TODO: This file is a mess. Help wanted to organize thing! -#include <IotWebConfParameter.h> +#include "IotWebConfParameter.h" #include <Arduino.h> #include <IPAddress.h> #include <errno.h> @@ -946,6 +946,6 @@ protected: } // end namespace -#include <IotWebConfTParameterBuilder.h> +#include "IotWebConfTParameterBuilder.h" #endif diff --git a/ampel-firmware/src/lib/IotWebConf/src/IotWebConfTParameterBuilder.h b/ampel-firmware/src/lib/IotWebConf/src/IotWebConfTParameterBuilder.h index ce546dd..68ff77a 100644 --- a/ampel-firmware/src/lib/IotWebConf/src/IotWebConfTParameterBuilder.h +++ b/ampel-firmware/src/lib/IotWebConf/src/IotWebConfTParameterBuilder.h @@ -13,7 +13,7 @@ #ifndef IotWebConfTParameterBuilder_h #define IotWebConfTParameterBuilder_h -#include <IotWebConfTParameter.h> +#include "IotWebConfTParameter.h" namespace iotwebconf { diff --git a/ampel-firmware/web_config.cpp b/ampel-firmware/web_config.cpp index 744cb0d..1d4672d 100644 --- a/ampel-firmware/web_config.cpp +++ b/ampel-firmware/web_config.cpp @@ -11,9 +11,9 @@ #include "util.h" #include "sensor_console.h" -#include <IotWebConf.h> -#include <IotWebConfTParameter.h> -#include <IotWebConfOptionalGroup.h> +#include "src/lib/IotWebConf/src/IotWebConf.h" +#include "src/lib/IotWebConf/src/IotWebConfTParameter.h" +#include "src/lib/IotWebConf/src/IotWebConfOptionalGroup.h" //TODO: Check memory consumption. Disable DEBUG info? //TODO: Convert all strings to F-strings -- GitLab