diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ddbddd92..344e5b11 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,17 +21,17 @@ jobs: with: python-version: '3.9' - - name: Zip web files - run: | - cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_AP-Flasher - python gzip_wwwfiles.py +# - name: Zip web files +# run: | +# cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_AP-Flasher +# python gzip_wwwfiles.py - - name: Commit zipped files - run: | - git config --global user.name 'Bot' - git config --global user.email "bot@openepaperlink.de" - git commit -am "Ziped web files" - git push origin HEAD:master +# - name: Commit zipped files +# run: | +# git config --global user.name 'Bot' +# git config --global user.email "bot@openepaperlink.de" +# git commit -am "Zipped web files" +# git push origin HEAD:master - name: Install PlatformIO Core run: pip install --upgrade platformio @@ -150,6 +150,24 @@ jobs: cd /home/runner/work/OpenEPaperLink/OpenEPaperLink cp OpenEPaperLink_AP_and_Flasher/firmware.bin espbinaries/OpenEPaperLink_AP_and_Flasher.bin cp OpenEPaperLink_AP_and_Flasher/merged-firmware.bin espbinaries/OpenEPaperLink_AP_and_Flasher_full.bin + + - name: Build firmware for ESP32_S3_16_8_YELLOW_AP + run: | + cd ESP32_AP-Flasher + export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA" + pio run --environment ESP32_S3_16_8_YELLOW_AP + pio run --target buildfs --environment ESP32_S3_16_8_YELLOW_AP + mkdir /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_YELLOW_AP + cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_YELLOW_AP/boot_app0.bin + cp .pio/build/ESP32_S3_16_8_YELLOW_AP/firmware.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_YELLOW_AP/firmware.bin + cp .pio/build/ESP32_S3_16_8_YELLOW_AP/bootloader.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_YELLOW_AP/bootloader.bin + cp .pio/build/ESP32_S3_16_8_YELLOW_AP/partitions.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_YELLOW_AP/partitions.bin + cp .pio/build/ESP32_S3_16_8_YELLOW_AP/littlefs.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_YELLOW_AP/littlefs.bin + cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_YELLOW_AP + esptool.py --chip esp32-s3 merge_bin -o merged-firmware.bin --flash_mode dio --flash_freq 80m --flash_size 16MB 0x0000 bootloader.bin 0x8000 partitions.bin 0xe000 boot_app0.bin 0x10000 firmware.bin 0x00910000 littlefs.bin + cd /home/runner/work/OpenEPaperLink/OpenEPaperLink + cp ESP32_S3_16_8_YELLOW_AP/firmware.bin espbinaries/ESP32_S3_16_8_YELLOW_AP.bin + cp ESP32_S3_16_8_YELLOW_AP/merged-firmware.bin espbinaries/ESP32_S3_16_8_YELLOW_AP_full.bin - name: generate release json file run: | diff --git a/ESP32_AP-Flasher/data/www/index.html.gz b/ESP32_AP-Flasher/data/www/index.html.gz index 2413d5ee..b2b482e6 100644 Binary files a/ESP32_AP-Flasher/data/www/index.html.gz and b/ESP32_AP-Flasher/data/www/index.html.gz differ diff --git a/ESP32_AP-Flasher/data/www/main.css.gz b/ESP32_AP-Flasher/data/www/main.css.gz index 7547caaa..c4b1b69d 100644 Binary files a/ESP32_AP-Flasher/data/www/main.css.gz and b/ESP32_AP-Flasher/data/www/main.css.gz differ diff --git a/ESP32_AP-Flasher/data/www/main.js.gz b/ESP32_AP-Flasher/data/www/main.js.gz index 48ecbdfd..b8e864e8 100644 Binary files a/ESP32_AP-Flasher/data/www/main.js.gz and b/ESP32_AP-Flasher/data/www/main.js.gz differ diff --git a/ESP32_AP-Flasher/data/www/ota.js.gz b/ESP32_AP-Flasher/data/www/ota.js.gz index eae7ec69..5fe1d66e 100644 Binary files a/ESP32_AP-Flasher/data/www/ota.js.gz and b/ESP32_AP-Flasher/data/www/ota.js.gz differ diff --git a/ESP32_AP-Flasher/src/makeimage.cpp b/ESP32_AP-Flasher/src/makeimage.cpp index e7692f33..d85f7873 100644 --- a/ESP32_AP-Flasher/src/makeimage.cpp +++ b/ESP32_AP-Flasher/src/makeimage.cpp @@ -165,34 +165,34 @@ void spr2color(TFT_eSprite &spr, imgParam &imageParams, uint8_t *buffer, size_t color.b + error_bufferold[x].b - palette[best_color_index].b}; // Burkes Dithering - error_buffernew[x].r += error.r / 4.0f; - error_buffernew[x].g += error.g / 4.0f; - error_buffernew[x].b += error.b / 4.0f; + error_buffernew[x].r += error.r >> 2; + error_buffernew[x].g += error.g >> 2; + error_buffernew[x].b += error.b >> 2; if (x > 0) { - error_buffernew[x - 1].r += error.r / 8.0f; - error_buffernew[x - 1].g += error.g / 8.0f; - error_buffernew[x - 1].b += error.b / 8.0f; + error_buffernew[x - 1].r += error.r >> 3; + error_buffernew[x - 1].g += error.g >> 3; + error_buffernew[x - 1].b += error.b >> 3; } if (x > 1) { - error_buffernew[x - 2].r += error.r / 16.0f; - error_buffernew[x - 2].g += error.g / 16.0f; - error_buffernew[x - 2].b += error.b / 16.0f; + error_buffernew[x - 2].r += error.r >> 4; + error_buffernew[x - 2].g += error.g >> 4; + error_buffernew[x - 2].b += error.b >> 4; } - error_buffernew[x + 1].r += error.r / 8.0f; - error_buffernew[x + 1].g += error.g / 8.0f; - error_buffernew[x + 1].b += error.b / 8.0f; + error_buffernew[x + 1].r += error.r >> 3; + error_buffernew[x + 1].g += error.g >> 3; + error_buffernew[x + 1].b += error.b >> 3; - error_bufferold[x + 1].r += error.r / 4.0f; - error_bufferold[x + 1].g += error.g / 4.0f; - error_bufferold[x + 1].b += error.b / 4.0f; + error_bufferold[x + 1].r += error.r >> 2; + error_bufferold[x + 1].g += error.g >> 2; + error_bufferold[x + 1].b += error.b >> 2; - error_buffernew[x + 2].r += error.r / 16.0f; - error_buffernew[x + 2].g += error.g / 16.0f; - error_buffernew[x + 2].b += error.b / 16.0f; + error_buffernew[x + 2].r += error.r >> 4; + error_buffernew[x + 2].g += error.g >> 4; + error_buffernew[x + 2].b += error.b >> 4; - error_bufferold[x + 2].r += error.r / 8.0f; - error_bufferold[x + 2].g += error.g / 8.0f; - error_bufferold[x + 2].b += error.b / 8.0f; + error_bufferold[x + 2].r += error.r >> 3; + error_bufferold[x + 2].g += error.g >> 3; + error_bufferold[x + 2].b += error.b >> 3; } } memcpy(error_bufferold, error_buffernew, bufw * sizeof(Error)); diff --git a/genfilelist.py b/genfilelist.py index 83437ec7..51d1ed2c 100644 --- a/genfilelist.py +++ b/genfilelist.py @@ -56,6 +56,7 @@ tagota = generate_file_hashes2(rp + "/binaries",tag) files1 = generate_file_hashes(rp + "/ESP32_AP-Flasher/data/www","/www/",tag) files1.extend(generate_file_hashes(rp + "/ESP32_AP-Flasher/data","/",tag)) files1.extend(generate_file_hashes(rp + "/ESP32_AP-Flasher/data/fonts","/fonts/",tag)) +files1.extend(generate_file_hashes(rp + "/ESP32_AP-Flasher/data/tagtypes","/tagtypes/",tag)) jsonarray = { "releaseid": tag,