Skip to content

Commit

Permalink
Merge branch 'mega' into mega
Browse files Browse the repository at this point in the history
  • Loading branch information
@TD-er
TD-er authored Apr 15, 2024
2 parents 8ee3917 + b4e7d51 commit dd10784
Show file tree
Hide file tree
Showing 185 changed files with 7,318 additions and 1,602 deletions.
42 changes: 25 additions & 17 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,32 +145,40 @@ jobs:
id: date
run: |
echo "builddate=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
- name: Download all artifacts
- name: Download all successfully compiled artifacts
uses: actions/download-artifact@v4
with:
path: artifacts/Binaries/bin/
path: artifacts/bin/
pattern: Bin-*
merge-multiple: true
- name: Download dist and docs zip files
uses: actions/download-artifact@v4
with:
path: distribution/
name: Distribution
- name: Repackage for release upload
run: |
ls -R
sudo apt install zipmerge zip
cd artifacts/Binaries
find . -not -name '*ESP32*' -print | zip -@ ../../ESPEasy_ESP82xx.zip
cd artifacts
# ESP8266 and ESP8285
find . -not -name '*ESP32*' -print | zip -@ ../ESPEasy_ESP82xx.zip
# ESP32 and derived chips
# 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 ../..
mv artifacts/Distribution/ESPEasy_dist* .
cp ESPEasy_dist.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP82xx_binaries.zip
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 ..
# Add dist tools to each package, after removing some unneeded files
# Copy dist zip for ESP82xx use
cp distribution/ESPEasy_dist.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP82xx_binaries.zip
zip -d ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP82xx_binaries.zip "bin/blank_8MB.bin"
mv ESPEasy_dist.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip
# Move dist zip for ESP32 use
mv distribution/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: ESP32h2
Expand All @@ -183,8 +191,8 @@ jobs:
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
# Upload all separately supported CPU models and the docs 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"
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,distribution/*.zip"
body: ${{ needs.prepare-notes.outputs.notes }}
token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ ESPEasy_mega-20230822_max_ESP32s3_8M1M_LittleFS_OPI_PSRAM_CDC.bin | ESP32-S3 8MB
ESPEasy_mega-20230822_max_ESP32_16M1M.bin | ESP32 with 16MB flash | All available plugins |
ESPEasy_mega-20230822_max_ESP32_16M8M_LittleFS.bin | ESP32 with 16MB flash | All available plugins |

NB: Since 2023-05-10 the binary files for the different ESP32 variants (S2, C3, S3, 'Classic') are available in separate archives.
The binary files for the different ESP32 variants (S2, C3, S3, C2, C6, 'Classic') are available in separate archives.

To see what plugins are included in which collection set, you can find that on the [ESPEasy Plugin overview page](https://espeasy.readthedocs.io/en/latest/Plugin/_Plugin.html)

Expand Down
40 changes: 40 additions & 0 deletions boards/esp32c6cdc-16M.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"build": {
"arduino":{
"ldscript": "esp32c6_out.ld"
},
"core": "esp32",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_16M -DESP32C6 -DARDUINO_USB_CDC_ON_BOOT=1",
"f_cpu": "160000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
"mcu": "esp32c6",
"variant": "esp32c6",
"partitions": "boards/partitions/esp32_partition_app4096k_spiffs8124k.csv"
},
"connectivity": [
"wifi",
"bluetooth"
],
"debug": {
"default_tool": "esp-builtin",
"onboard_tools": [
"esp-builtin"
],
"openocd_target": "esp32c6.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Espressif Generic ESP32-C6 16M Flash, ESPEasy 4096k Code/OTA 8M FS",
"upload": {
"flash_size": "16MB",
"maximum_ram_size": 327680,
"maximum_size": 16777216,
"require_upload_port": true,
"speed": 460800
},
"url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c6/esp32-c6-devkitc-1/index.html",
"vendor": "Espressif"
}
40 changes: 40 additions & 0 deletions boards/esp32c6cdc-8M.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"build": {
"arduino":{
"ldscript": "esp32c6_out.ld"
},
"core": "esp32",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_8M -DESP32C6 -DARDUINO_USB_CDC_ON_BOOT=1",
"f_cpu": "160000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
"mcu": "esp32c6",
"variant": "esp32c6",
"partitions": "boards/partitions/esp32_partition_app3520k_spiffs1088k.csv"
},
"connectivity": [
"wifi",
"bluetooth"
],
"debug": {
"default_tool": "esp-builtin",
"onboard_tools": [
"esp-builtin"
],
"openocd_target": "esp32c6.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Espressif Generic ESP32-C6 >= 8M Flash, ESPEasy 3520k Code/OTA 1088k FS",
"upload": {
"flash_size": "8MB",
"maximum_ram_size": 327680,
"maximum_size": 8388608,
"require_upload_port": true,
"speed": 460800
},
"url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c6/esp32-c6-devkitc-1/index.html",
"vendor": "Espressif"
}
91 changes: 91 additions & 0 deletions dist/Release_notes.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,94 @@
-------------------------------------------------
Changes in release mega-20240414 (since mega-20240401)
-------------------------------------------------

Release date: Sun Apr 14 03:08:46 PM CEST 2024

TD-er (16):
[HWCDC] Revert to older ESP-IDF/Arduino build
[Time] Fix updating %sunrise% and %sunset% when no NTP available
[HWCDC] Fix bootloop on ESP32-C3/C6
[HWCDC] Cleanup unused test code
[ESP-IDF5.1] Move to newly network refactored code
[ESP-IDF5.x] Fix build issue
[ESP-IDF5.x] Fix building ESP32-solo1 builds
[Ethernet[ Fix crashes when using Ethernet + IPv6 on LittleFS builds
[Ethernet] Fix getting DNS from DHCP switch from WiFi to Ethernet
[ESP-IDF5.x] Fix LittleFS builds without Ethernet
[IMPROV] Fix provisioning WiFi via web flasher
[ESP-IDF5.1] Update to latest 2024.04.11 platform build
[SPI ETH] Fix SPI selection to actual SPI bus for Ethernet
[SPI Eth] Fix build on ESP32-C3
[HWCDC] Tweak HWCDC to be more stable
[Build] Revert unintended change of default PIO env.

Ton Huisman (2):
[Dist] Update Espressif Flash Download tool 3.9.6
[JSON] Add extra data in `/json` output


-------------------------------------------------
Changes in release mega-20240401 (since mega-20240331)
-------------------------------------------------

Release date: Mon Apr 1 12:13:54 AM CEST 2024

Ton Huisman (1):
[Bugfix] Release script fixes and simplifications


-------------------------------------------------
Changes in release mega-20240331 (since mega-20240229)
-------------------------------------------------

Release date: Sun Mar 31 03:40:08 PM CEST 2024

Ernest (ErNis) (1):
INA219 26V 8A range added

Jason2866 (1):
small refactor

TD-er (13):
[JL1101] Fix JL1101 Ethernet + update to latest ESP-IDF5.1 code
[PlatformIO] Fix installing pygit2
[ESP8266 WiFi] Initialize flags for AP capabilities
[ESP8266] Get rid of several union structs which may cause weird issues
[ESP8266] Remove use of union due to issues on ESP8266
[ESP-IDF5.1] Revert to older SDK code due to issues with HWCDC
[Build] Reduce build size regarding WiFi AP Candidate duplicate code
[HWCDC] Test for ESP32-C3/C6/S3 HWCDC issues
[CUL Reader] Cherry pick code from ESPEasy_NOW pull request
[CUL Reader] Fix not being able to set flags
[Save Settings] Fix issue where data may get corrupted saving task
[Display] Reduce ESP8266 'display' build size
[MQTT] Fix crash and disconnect sending to MQTT using formula

Ton Huisman (22):
[P087] Add serialproxy_test command and Get the parsed data
[P087] Fix typo
[P087] Documentation clarification
[P087] Apply log-string and code optimizations
[P087] Always process Global Match so values can be retrieved
[Bugfix] Release.yml shouldn't try to move a non-existing file
[Build] Add ESP32-C6 MAX builds (preliminary)
[Docs] Update ESP chip info
[Docs] Update ESP chip info
[P116] Add alternative model selections for ST7789
[Bugfix] Remove duplicate define in Custom-sample.h
[Build] Custom IR ESP32 configurations not using the pre_custom_esp32_IR.py Python script
[P116] Add alternative model selection for ST7735
[P029][C002] Add option Invert On/Off value
[Docs] Update P029 documentation with new option
[C002] Reduce .bin size (slightly)
[P116] Fine-tuning the rotation column-offset for ST7735 135x240 display
[P116] Documentation improvement.
[P095] Documentation improvement.
[P116] Update documentation for supported displays
[Build] Disable Notifiers in full binaries
[Build] Fix typo


-------------------------------------------------
Changes in release mega-20240229 (since mega-20231225)
-------------------------------------------------
Expand Down
Binary file removed dist/flash_download_tool_3.9.5/doc/Flash_Download_Tool__cn.pdf
View file
Binary file not shown.
Loading

0 comments on commit dd10784

Please sign in to comment.