From f4e408d1c58f2c6747e5bae0657e3aa492feca17 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Tue, 26 Apr 2022 14:45:26 +0200 Subject: [PATCH] Allow HASP_LOG_LEVEL as override --- include/hasp_conf.h | 2 ++ include/hasp_macro.h | 4 ++-- include/lv_conf.h | 2 ++ platformio.ini | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/hasp_conf.h b/include/hasp_conf.h index f092b4eb..8db58887 100644 --- a/include/hasp_conf.h +++ b/include/hasp_conf.h @@ -4,6 +4,8 @@ #ifndef HASP_CONF_H #define HASP_CONF_H +#include "ArduinoLog.h" + #ifdef USE_CONFIG_OVERRIDE #include "user_config_override.h" #endif diff --git a/include/hasp_macro.h b/include/hasp_macro.h index 035df82a..2fe5aad7 100644 --- a/include/hasp_macro.h +++ b/include/hasp_macro.h @@ -4,6 +4,8 @@ #ifndef HASP_MACRO_H #define HASP_MACRO_H +#include "ArduinoLog.h" + #ifdef USE_CONFIG_OVERRIDE #include "user_config_override.h" #endif @@ -12,8 +14,6 @@ #define LOG_OUTPUT(x, ...) printf(__VA_ARGS__) #else -#include "ArduinoLog.h" - #ifndef HASP_LOG_LEVEL #define HASP_LOG_LEVEL LOG_LEVEL_TRACE #endif diff --git a/include/lv_conf.h b/include/lv_conf.h index c7ea9aad..1d9e364d 100644 --- a/include/lv_conf.h +++ b/include/lv_conf.h @@ -1,3 +1,5 @@ +#include "ArduinoLog.h" + #ifdef USE_CONFIG_OVERRIDE #include "user_config_override.h" #endif diff --git a/platformio.ini b/platformio.ini index 744d3008..1a168c21 100644 --- a/platformio.ini +++ b/platformio.ini @@ -68,7 +68,6 @@ build_flags = -D HASP_VER_MIN=6 ;-D HASP_VER_REV=3 -D HASP_VER_REV=3-dev - -D HASP_LOG_LEVEL=7 ${override.build_flags} ; -- Shared library dependencies in all environments