From 240795a2d0ff9c60721e2672432f89694576e08d Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Mon, 17 Feb 2025 11:49:39 +0100 Subject: [PATCH] feat: update version to v1.2.0 and modify build scripts in platformio.ini; remove unused includes in scale.cpp and website.cpp --- platformio.ini | 22 +++++++++++++++------- src/scale.cpp | 1 - src/website.cpp | 1 - 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/platformio.ini b/platformio.ini index 72184ab..10a9fdc 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [common] -version = "1.1.0" +version = "1.2.0" [env:esp32dev] platform = espressif32 @@ -29,6 +29,7 @@ lib_deps = bblanchon/ArduinoJson @ ^7.3.0 knolleary/PubSubClient @ ^2.8 digitaldragon/SSLClient @ ^1.3.2 + jandrassy/ArduinoOTA @ ^1.1.0 ; Enable SPIFFS upload board_build.filesystem = spiffs @@ -48,9 +49,16 @@ build_flags = '-D VERSION="${common.version}"' extra_scripts = - pre:scripts/pre_build.py - pre:scripts/combine_html.py - pre:scripts/pre_spiffs.py - pre:scripts/gzip_files.py - pre:scripts/extra_script.py - #post:scripts/update_changelog.py + scripts/extra_script.py + pre:scripts/pre_build.py ; wird zuerst ausgeführt + pre:scripts/pre_spiffs.py ; wird als zweites ausgeführt + pre:scripts/combine_html.py ; wird als drittes ausgeführt + scripts/gzip_files.py + +; Remove or comment out the targets line +;targets = buildfs, build + +; Add a custom target to build both +[platformio] +default_envs = esp32dev + diff --git a/src/scale.cpp b/src/scale.cpp index b52ce28..b01399d 100644 --- a/src/scale.cpp +++ b/src/scale.cpp @@ -5,7 +5,6 @@ #include "HX711.h" #include #include "display.h" -#include "nfc.h" #include "esp_task_wdt.h" HX711 scale; diff --git a/src/website.cpp b/src/website.cpp index 7b86092..388fd4a 100644 --- a/src/website.cpp +++ b/src/website.cpp @@ -3,7 +3,6 @@ #include "api.h" #include #include -//#include #include "bambu.h" #include "nfc.h" #include "scale.h"