From 2a382cfa08207b819ad158eae5dce69fd73b92e9 Mon Sep 17 00:00:00 2001 From: chromoxdor <33860956+chromoxdor@users.noreply.github.com> Date: Sat, 9 Dec 2023 11:40:44 +0100 Subject: [PATCH 1/4] add %sysec_d% and fix typo --- dist/Release_notes.txt | 4 ++-- docs/source/Reference/Safety.rst | 4 ++-- docs/source/Reference/SystemVariable.rst | 4 ++++ src/src/CustomBuild/define_plugin_sets.h | 10 +++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dist/Release_notes.txt b/dist/Release_notes.txt index 8289ad983..18168e48f 100644 --- a/dist/Release_notes.txt +++ b/dist/Release_notes.txt @@ -4308,7 +4308,7 @@ TD-er (106): [WiFi] Process Station event Auth Changed [Controller] Debug log on remove duplicate queued message [GPIO] Fix warning of unused variable - [Build] Remove HWL8012 from "energy" build + [Build] Remove HLW8012 from "energy" build [Energy build] Add P093 Mitsubishi Heat Pump [Cleanup] Remove ICACHE_RAM_ATTR on wifi event function [Build] LittleFS can only be built on 'beta' builds @@ -4316,7 +4316,7 @@ TD-er (106): [Cleanup] Reduce IRAM usage in Dallas bit read/write code [Build] Fix normal_beta_ESP8266_16M_LittleFS build [Cleanup] Remove unneeded ICACHE_RAM_ATTR on DHCP timeout callback - [Build] Remove P076 HWL8012 from "testing" builds due to build size + [Build] Remove P076 HLW8012 from "testing" builds due to build size [Build] Disable test_ESP8266_4M1M_VCC_MDNS_SD as it does not fit in IRAM [Build] Set normal_IRext_no_rx_ESP8266_4M2M to LIMIT_BUILD_SIZE [GPS] Fix running out of memory when no GPS data is received. diff --git a/docs/source/Reference/Safety.rst b/docs/source/Reference/Safety.rst index cc4c291ed..fbdf0323c 100644 --- a/docs/source/Reference/Safety.rst +++ b/docs/source/Reference/Safety.rst @@ -23,12 +23,12 @@ So these have the same hole on the side used on the TH10/16 to connect sensors. This hole may seem like an invitation to connect some external sensor to these devices, but don't be tempted to do so. -HWL8012 & CSE7766 +HLW8012 & CSE7766 ================= Some ESP8266 and ESP32 powered devices have an energy monitoring sensor on board. Well known examples are the Sonoff POW, POW r2, POW R3xx(D) and Shelly PLUG S, but there are many others. -Almost all use either the HWL8012 or CSE7766 chip. +Almost all use either the HLW8012 or CSE7766 chip. These chips are not isolated from mains power, which means all electronics connected to them does also have a direct connection to mains power lines. diff --git a/docs/source/Reference/SystemVariable.rst b/docs/source/Reference/SystemVariable.rst index c32b51bbe..7ee9176a2 100644 --- a/docs/source/Reference/SystemVariable.rst +++ b/docs/source/Reference/SystemVariable.rst @@ -139,6 +139,10 @@ More uses of these system variables can be seen in the rules section and formula - 5 (05) - Current second (ss). ``%syssec%`` omits leading zeros. - Yes + * - ``%syssec_d%`` + - 43200 + - Current second of the day. + - Yes * - ``%sysday%`` (``%sysday_0%``) - 7 (07) - Current day of month (DD). ``%sysday%`` omits leading zeros. diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index bcff52e2d..808ebb516 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -696,7 +696,7 @@ To create/register a plugin, you have to : #define CONTROLLER_SET_STABLE #define PLUGIN_SET_ONLY_SWITCH #define NOTIFIER_SET_STABLE - #define USES_P076 // HWL8012 in POW r1 + #define USES_P076 // HLW8012 in POW r1 // Needs CSE7766 Energy sensor, via Serial RXD 4800 baud 8E1 (GPIO1), TXD (GPIO3) #define USES_P077 // CSE7766 in POW R2 #define USES_P081 // Cron @@ -770,7 +770,7 @@ To create/register a plugin, you have to : #define PLUGIN_SET_ONLY_SWITCH #define CONTROLLER_SET_STABLE #define NOTIFIER_SET_STABLE - #define USES_P076 // HWL8012 in POW r1 + #define USES_P076 // HLW8012 in POW r1 #define USES_P077 // CSE7766 in POW R2 #define USES_P081 // Cron #endif @@ -1481,7 +1481,7 @@ To create/register a plugin, you have to : #define USES_P066 // VEML6040 #define USES_P075 // Nextion - //#define USES_P076 // HWL8012 in POW r1 + //#define USES_P076 // HLW8012 in POW r1 // Needs CSE7766 Energy sensor, via Serial RXD 4800 baud 8E1 (GPIO1), TXD (GPIO3) //#define USES_P077 // CSE7766 in POW R2 //#define USES_P078 // Eastron Modbus Energy meters @@ -1634,7 +1634,7 @@ To create/register a plugin, you have to : #define USES_P027 // INA219 #endif #ifndef USES_P076 - #define USES_P076 // HWL8012 in POW r1 + #define USES_P076 // HLW8012 in POW r1 #endif #ifndef USES_P077 // Needs CSE7766 Energy sensor, via Serial RXD 4800 baud 8E1 (GPIO1), TXD (GPIO3) @@ -2556,7 +2556,7 @@ To create/register a plugin, you have to : #define FEATURE_BLYNK 0 #if !defined(PLUGIN_SET_COLLECTION) && !defined(PLUGIN_SET_SONOFF_POW) #ifdef USES_P076 - #undef USES_P076 // HWL8012 in POW r1 + #undef USES_P076 // HLW8012 in POW r1 #endif #ifdef USES_P093 #undef USES_P093 // Mitsubishi Heat Pump From 3ba43d96804d839194aebc7939593f18610c29e7 Mon Sep 17 00:00:00 2001 From: chromoxdor <33860956+chromoxdor@users.noreply.github.com> Date: Sat, 9 Dec 2023 11:44:30 +0100 Subject: [PATCH 2/4] remove change since ton already did it :) --- docs/source/Reference/SystemVariable.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/source/Reference/SystemVariable.rst b/docs/source/Reference/SystemVariable.rst index 7ee9176a2..c32b51bbe 100644 --- a/docs/source/Reference/SystemVariable.rst +++ b/docs/source/Reference/SystemVariable.rst @@ -139,10 +139,6 @@ More uses of these system variables can be seen in the rules section and formula - 5 (05) - Current second (ss). ``%syssec%`` omits leading zeros. - Yes - * - ``%syssec_d%`` - - 43200 - - Current second of the day. - - Yes * - ``%sysday%`` (``%sysday_0%``) - 7 (07) - Current day of month (DD). ``%sysday%`` omits leading zeros. From 77006965175db6220c17364ebb06697808091c98 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Fri, 29 Dec 2023 10:19:35 +0100 Subject: [PATCH 3/4] [Release] Add ESP32-C2 and ESP32-C6 downloads --- .github/workflows/release.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 347b17134..50aeae272 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -153,10 +153,12 @@ jobs: mv *.* bin find . -not -name '*ESP32*' -print | zip -@ ../../ESPEasy_ESP82xx.zip # ESP32 and derived chips - # TODO if/when available: ESP32c2 ESP32c6 ESP32h2 + # TODO if/when available: ESP32h2 find . -name '*ESP32s2*' -print | zip -@ ../../ESPEasy_ESP32s2.zip find . -name '*ESP32c3*' -print | zip -@ ../../ESPEasy_ESP32c3.zip find . -name '*ESP32s3*' -print | zip -@ ../../ESPEasy_ESP32s3.zip + find . -name '*ESP32c2*' -print | zip -@ ../../ESPEasy_ESP32c2.zip + find . -name '*ESP32c6*' -print | zip -@ ../../ESPEasy_ESP32c6.zip find . -name '*ESP32solo1*' -print | zip -@ ../../ESPEasy_ESP32solo1.zip find . -name '*ESP32_*' -print | zip -@ ../../ESPEasy_ESP32.zip cd ../.. @@ -166,16 +168,18 @@ jobs: mv ESPEasy_dist.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip zip -d ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip "bin/blank_1MB.bin" "bin/blank_2MB.bin" "bin/ESPEasy_2step_UploaderMega_1024.bin" zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP82xx_binaries.zip ESPEasy_ESP82xx.zip - # TODO if/when available: ESP32c2 ESP32c6 ESP32h2 + # TODO if/when available: ESP32h2 zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32s2_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32s2.zip zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c3_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32c3.zip zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32s3_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32s3.zip + zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c2_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32c2.zip + zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c6_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32c6.zip zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32solo1_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32solo1.zip zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32.zip - uses: ncipollo/release-action@v1 with: # Include all separately supported CPU models - # TODO if/when available: ESP32c2 ESP32c6 ESP32h2 - artifacts: "ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP82xx_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32solo1_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32s2_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c3_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32s3_binaries.zip,artifacts/Distribution/*.zip" + # TODO if/when available: ESP32h2 + artifacts: "ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP82xx_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32solo1_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32s2_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c3_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32s3_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c2_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c6_binaries.zip,artifacts/Distribution/*.zip" body: ${{ needs.prepare-notes.outputs.notes }} token: ${{ secrets.GITHUB_TOKEN }} From 072be688cb80a228b1efe03299874d71961bbc1a Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Tue, 2 Jan 2024 23:43:07 +0100 Subject: [PATCH 4/4] [Docs] Update copyright year to 2024 --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 20f1bd87d..d413c1aa0 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -21,7 +21,7 @@ import sphinx_bootstrap_theme # -- Project information ----------------------------------------------------- project = u'ESP Easy' -copyright = u'2018-2023, ESP Easy' +copyright = u'2018-2024, ESP Easy' author = u'Grovkillen, TD-er & Friends' # The short X.Y version