Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-09-14 10:35:30 +00:00
Code Issues Releases Activity

Merge branch 'mega' of https://github.com/letscontrolit/ESPEasy into feature/TAR-archive-upload-and-download

Browse Source
This commit is contained in:
Ton Huisman
2024-01-03 22:08:46 +01:00
parent efb9009958 45b7130d43
commit 89571df011
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/release.yml
+8 -4
View File
@@ -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 }}
dist/Release_notes.txt
Vendored
+2 -2
View File
@@ -4526,7 +4526,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
@@ -4534,7 +4534,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.
docs/source/Reference/Safety.rst
+2 -2
View File
@@ -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.
docs/source/conf.py
+1 -1
View File
@@ -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
src/src/CustomBuild/define_plugin_sets.h
+5 -5
View File
@@ -710,7 +710,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
@@ -784,7 +784,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
@@ -1495,7 +1495,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
@@ -1648,7 +1648,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)
@@ -2577,7 +2577,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