bugfix date display

Update build-test.yml
don't build all small variations. Just the minor platforms, the rest will work.
2026-03-21 17:06:25 +01:00 · 2023-08-12 21:17:08 +02:00 · 2023-08-12 21:11:33 +02:00 · 2023-08-12 20:58:25 +02:00 · 2023-08-12 20:19:01 +02:00 · 2023-08-12 17:16:45 +00:00
9 changed files with 81 additions and 62 deletions
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -32,11 +32,11 @@ jobs:
          pio run --environment OpenEPaperLink_Mini_AP
          pio run --target buildfs --environment OpenEPaperLink_Mini_AP
        
-      - name: Build OpenEPaperLink_Nano_AP
-        run: |
-          cd ESP32_AP-Flasher
-          pio run --environment OpenEPaperLink_Nano_AP
-          pio run --target buildfs --environment OpenEPaperLink_Nano_AP
+#      - name: Build OpenEPaperLink_Nano_AP
+#        run: |
+#          cd ESP32_AP-Flasher
+#          pio run --environment OpenEPaperLink_Nano_AP
+#          pio run --target buildfs --environment OpenEPaperLink_Nano_AP
          
      - name: Build OpenEPaperLink_AP_and_Flasher
        run: |
@@ -44,17 +44,17 @@ jobs:
          pio run --environment OpenEPaperLink_AP_and_Flasher
          pio run --target buildfs --environment OpenEPaperLink_AP_and_Flasher
          
-      - name: Build Wemos_d1_mini32_AP
-        run: |
-          cd ESP32_AP-Flasher
-          pio run --environment Wemos_d1_mini32_AP
-          pio run --target buildfs --environment Wemos_d1_mini32_AP
+#      - name: Build Wemos_d1_mini32_AP
+#        run: |
+#          cd ESP32_AP-Flasher
+#          pio run --environment Wemos_d1_mini32_AP
+#          pio run --target buildfs --environment Wemos_d1_mini32_AP
          
-      - name: Build M5Stack_Core_ONE_AP
-        run: |
-          cd ESP32_AP-Flasher
-          pio run --environment M5Stack_Core_ONE_AP
-          pio run --target buildfs --environment M5Stack_Core_ONE_AP
+#      - name: Build M5Stack_Core_ONE_AP
+#        run: |
+#          cd ESP32_AP-Flasher
+#          pio run --environment M5Stack_Core_ONE_AP
+#          pio run --target buildfs --environment M5Stack_Core_ONE_AP
          
      - name: Build ESP32_S3_16_8_YELLOW_AP]
        run: |
@@ -62,20 +62,20 @@ jobs:
          pio run --environment ESP32_S3_16_8_YELLOW_AP
          pio run --target buildfs --environment ESP32_S3_16_8_YELLOW_AP
          
-      - name: Build Sonoff_zb_bridge_P_AP
-        run: |
-          cd ESP32_AP-Flasher
-          pio run --environment Sonoff_zb_bridge_P_AP
-          pio run --target buildfs --environment Sonoff_zb_bridge_P_AP
+#      - name: Build Sonoff_zb_bridge_P_AP
+#        run: |
+#          cd ESP32_AP-Flasher
+#          pio run --environment Sonoff_zb_bridge_P_AP
+#          pio run --target buildfs --environment Sonoff_zb_bridge_P_AP
          
-      - name: Build OpenEPaperLink_CC1352P
-        run: |
-          cd ESP32_AP-Flasher
-          pio run --environment OpenEPaperLink_CC1352P
-          pio run --target buildfs --environment OpenEPaperLink_CC1352P
+#      - name: Build OpenEPaperLink_CC1352P
+#        run: |
+#          cd ESP32_AP-Flasher
+#          pio run --environment OpenEPaperLink_CC1352P
+#          pio run --target buildfs --environment OpenEPaperLink_CC1352P
          
-      - name: OutdoorAP
-        run: |
-          cd ESP32_AP-Flasher
-          pio run --environment OutdoorAP
-          pio run --target buildfs --environment OutdoorAP
+#      - name: OutdoorAP
+#        run: |
+#          cd ESP32_AP-Flasher
+#          pio run --environment OutdoorAP
+#          pio run --target buildfs --environment OutdoorAP
--- 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: |
--- a/ESP32_AP-Flasher/data/www/index.html.gz
+++ b/ESP32_AP-Flasher/data/www/index.html.gz
--- a/ESP32_AP-Flasher/data/www/main.css.gz
+++ b/ESP32_AP-Flasher/data/www/main.css.gz
--- a/ESP32_AP-Flasher/data/www/main.js.gz
+++ b/ESP32_AP-Flasher/data/www/main.js.gz
--- a/ESP32_AP-Flasher/data/www/ota.js.gz
+++ b/ESP32_AP-Flasher/data/www/ota.js.gz
--- a/ESP32_AP-Flasher/src/contentmanager.cpp
+++ b/ESP32_AP-Flasher/src/contentmanager.cpp
@@ -533,7 +533,7 @@ void drawDate(String &filename, tagRecord *&taginfo, imgParam &imageParams) {
        drawString(spr, String(timeinfo.tm_mday) + " " + languageMonth[getCurrentLanguage()][timeinfo.tm_mon], date[0], date[1], date[2], TC_DATUM);
    } else {
        const auto &month = loc["month"];
-        const auto &day = loc["month"];
+        const auto &day = loc["day"];
        drawString(spr, languageDays[getCurrentLanguage()][timeinfo.tm_wday], weekday[0], weekday[1], weekday[2], TC_DATUM, TFT_BLACK);
        drawString(spr, String(languageMonth[getCurrentLanguage()][timeinfo.tm_mon]), month[0], month[1], month[2], TC_DATUM);
        drawString(spr, String(timeinfo.tm_mday), day[0], day[1], day[2], TC_DATUM, TFT_RED);
--- 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));
--- 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,
Author	SHA1	Message	Date
Nic Limper	3989ecc3a3	bugfix date display	2023-08-12 21:17:08 +02:00
Nic Limper	cb0f029900	Update build-test.yml don't build all small variations. Just the minor platforms, the rest will work.	2023-08-12 21:11:33 +02:00
Nic Limper	443714e9dc	build fixes	2023-08-12 20:58:25 +02:00
Nic Limper	f3f163fa00	Revert "Ziped web files" This reverts commit `8848cfc0f8`.	2023-08-12 20:19:01 +02:00
Bot	8848cfc0f8	Ziped web files	2023-08-12 17:16:45 +00:00