From 6156145bd671e8d61c6981806c2edd8112361f46 Mon Sep 17 00:00:00 2001 From: lumapu Date: Tue, 8 Aug 2023 01:25:55 +0200 Subject: [PATCH] 0.7.27 * added compile option for ethernet #886 * fix ePaper configuration, missing `Busy`-Pin #1075 --- .github/workflows/compile_development.yml | 2 +- scripts/getVersion.py | 5 +++++ src/CHANGES.md | 9 +++++++-- src/app.h | 6 +++--- src/defines.h | 2 +- src/platformio.ini | 14 ++++++-------- src/web/html/setup.html | 14 +++++++------- 7 files changed, 30 insertions(+), 22 deletions(-) diff --git a/.github/workflows/compile_development.yml b/.github/workflows/compile_development.yml index 4913d726..847495eb 100644 --- a/.github/workflows/compile_development.yml +++ b/.github/workflows/compile_development.yml @@ -47,7 +47,7 @@ jobs: run: python convert.py - name: Run PlatformIO - run: pio run -d src --environment esp8266-release --environment esp8266-release-prometheus --environment esp8285-release --environment esp32-wroom32-release --environment esp32-wroom32-release-prometheus --environment opendtufusionv1-release + run: pio run -d src --environment esp8266-release --environment esp8266-release-prometheus --environment esp8285-release --environment esp32-wroom32-release --environment esp32-wroom32-release-prometheus --environment esp32-wroom32-ethernet-release --environment opendtufusionv1-release - name: Copy boot_app0.bin run: cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin src/.pio/build/opendtufusionv1-release/ota.bin diff --git a/scripts/getVersion.py b/scripts/getVersion.py index e8393ae1..a6da7853 100644 --- a/scripts/getVersion.py +++ b/scripts/getVersion.py @@ -79,6 +79,11 @@ def readVersion(path, infile): dst = path + "firmware/" + versionout os.rename(src, dst) + versionout = version[:-1] + "_" + sha + "esp32_ethernet.bin" + src = path + ".pio/build/esp32-wroom32-ethernet-release/firmware.bin" + dst = path + "firmware/" + versionout + os.rename(src, dst) + versionout = version[:-1] + "_" + sha + "_esp32s3.bin" src = path + ".pio/build/opendtufusionv1-release/firmware.bin" dst = path + "firmware/s3/" + versionout diff --git a/src/CHANGES.md b/src/CHANGES.md index a25a800c..aa7b3f44 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,3 +1,8 @@ -Changelog v0.7.26 +# Development Changes -* fix MqTT `last_success` +## 0.7.27 - 2023-08-08 +* added compile option for ethernet #886 +* fix ePaper configuration, missing `Busy`-Pin #1075 + +## 0.7.26 +* last Release diff --git a/src/app.h b/src/app.h index d4235d76..728215d7 100644 --- a/src/app.h +++ b/src/app.h @@ -24,13 +24,13 @@ #include "utils/crc.h" #include "utils/dbg.h" #include "utils/scheduler.h" -//#include "utils/improv.h" #include "web/RestApi.h" #include "web/web.h" #if defined(ETHERNET) -#include "eth/ahoyeth.h" + #include "eth/ahoyeth.h" #else /* defined(ETHERNET) */ -#include "wifi/ahoywifi.h" + #include "wifi/ahoywifi.h" + #include "utils/improv.h" #endif /* defined(ETHERNET) */ #include // position is relevant since version 1.4.7 of this library diff --git a/src/defines.h b/src/defines.h index a6d4bfa9..24d069a4 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 7 -#define VERSION_PATCH 26 +#define VERSION_PATCH 27 //------------------------------------- typedef struct { diff --git a/src/platformio.ini b/src/platformio.ini index e87b1d59..8abf8e81 100644 --- a/src/platformio.ini +++ b/src/platformio.ini @@ -155,23 +155,21 @@ board = esp32dev lib_deps = khoih-prog/AsyncWebServer_ESP32_W5500 khoih-prog/AsyncUDP_ESP32_W5500 - nrf24/RF24 @ ^1.4.5 + nrf24/RF24 @ ^1.4.7 paulstoffregen/Time @ ^1.6.1 - https://github.com/bertmelis/espMqttClient#v1.4.2 - bblanchon/ArduinoJson @ ^6.21.2 + https://github.com/bertmelis/espMqttClient#v1.4.4 + bblanchon/ArduinoJson @ ^6.21.3 https://github.com/JChristensen/Timezone @ ^1.2.4 olikraus/U8g2 @ ^2.34.17 - zinggjm/GxEPD2 @ ^1.5.0 -build_flags = -D ETHERNET + zinggjm/GxEPD2 @ ^1.5.2 +build_flags = + -D ETHERNET -DRELEASE -DLOG_LOCAL_LEVEL=ESP_LOG_INFO -DDEBUG_LEVEL=DBG_INFO -std=gnu++17 build_unflags = -std=gnu++11 monitor_filters = - ;default ; Remove typical terminal control codes from input - ;time ; Add timestamp with milliseconds for each new line - ;log2file ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory esp32_exception_decoder [env:opendtufusionv1-release] diff --git a/src/web/html/setup.html b/src/web/html/setup.html index ebd11b32..fc855055 100644 --- a/src/web/html/setup.html +++ b/src/web/html/setup.html @@ -870,13 +870,13 @@ // It depends on fix pin array (see var pins) // var pins = [['clock', 'disp_clk'], ['data', 'disp_data'], ['cs', 'disp_cs'], ['dc', 'disp_dc'], ['reset', 'disp_rst']]; const pinMap = new Map([ - [0, [0,0,0,0,0]], //none - [1, [1,1,0,0,0]], //SSD1306_128X64 - [2, [1,1,0,0,0]], //SH1106_128X64 - [3, [1,1,1,1,0]], //PCD8544_84X48 /nokia5110 - [4, [1,1,0,0,0]], //SSD1306_128X32 - [5, [1,1,0,0,0]], //SSD1306_64X48 - [10, [1,1,1,1,1]] //ePaper + [0, [0,0,0,0,0,0]], //none + [1, [1,1,0,0,0,0]], //SSD1306_128X64 + [2, [1,1,0,0,0,0]], //SH1106_128X64 + [3, [1,1,1,1,0,0]], //PCD8544_84X48 /nokia5110 + [4, [1,1,0,0,0,0]], //SSD1306_128X32 + [5, [1,1,0,0,0,0]], //SSD1306_64X48 + [10, [1,1,1,1,1,1]] //ePaper ]) for(var i = 0; i < pins.length; i++) { var cl = document.getElementById("row_" + pins[i][1]).classList;