From b0d3a2204a437a77876cf70fd55097471c028090 Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 27 May 2024 22:15:08 +0200 Subject: [PATCH] update to use external Modules --- pio_local.ini_example | 4 +++- platformio.ini | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pio_local.ini_example b/pio_local.ini_example index f38c988f1..60f8c9c88 100644 --- a/pio_local.ini_example +++ b/pio_local.ini_example @@ -12,7 +12,7 @@ ; -DEMSESP_EN_ONLY ; only EN translated entity names ; -DEMSESP_PINGTEST ; send log message every 1/2 second ; my_build_flags = -DEMSESP_TEST -; my_build_flags = -DEMSESP_DEBUG -DEMSESP_TEST +my_build_flags = -DEMSESP_DEBUG -DEMSESP_TEST ; my_build_flags = -DEMSESP_DEBUG -DEMSESP_TEST -DEMSESP_PINGTEST [platformio] @@ -35,6 +35,8 @@ custom_emsesp_ip = 10.10.10.173 custom_username = admin custom_password = admin ; uncomment this next line if using the github repo +; use with +; rm -rf .pio/libdeps/native/EMS-ESP-Modules; pio run -e native -t clean; pio run -e native -t exec lib_deps = file://../../modules/EMS-ESP-Modules [env:native] diff --git a/platformio.ini b/platformio.ini index 7a5084f3c..aa1f83723 100644 --- a/platformio.ini +++ b/platformio.ini @@ -27,6 +27,7 @@ build_flags = -D ARDUINOJSON_ENABLE_STD_STRING=1 -D ARDUINOJSON_USE_DOUBLE=0 -D ARDUINOTRACE_ENABLE=0 + -D ARDUINOJSON_VERSION_NAMESPACE=arduinojson -D CONFIG_ETH_ENABLED -D CONFIG_UART_ISR_IN_IRAM -D CONFIG_ASYNC_TCP_STACK_SIZE=5120 @@ -68,7 +69,9 @@ monitor_filters = direct upload_speed = 921600 build_type = release lib_ldf_mode = chain+ -lib_deps = https://github.com/emsesp/EMS-ESP-Modules.git +lib_deps = + https://github.com/emsesp/EMS-ESP-Modules.git + bblanchon/ArduinoJson@^7.0.4 check_tool = cppcheck, clangtidy check_severity = high, medium check_flags = @@ -212,6 +215,7 @@ platform = native build_flags = -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0 -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_TEST + -DARDUINOJSON_VERSION_NAMESPACE=arduinojson -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.7.0-dev.0\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\" -std=gnu++14 -Og -ggdb build_src_flags =