gzipped www files

add Denmark to dayahead electricity prices; enable it also for 2.9" UC8151
bugfix: idlereq should not be queued, and only sent when queue is empty
2026-03-21 04:06:29 +01:00 · 2024-02-28 01:20:37 +01:00 · 2024-02-28 01:11:01 +01:00 · 2024-02-28 01:09:00 +01:00 · 2024-02-27 12:11:13 +01:00 · 2024-02-27 01:47:36 +01:00
34 changed files with 7535 additions and 6579 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 sdcc/sdcc

 ESP32_AP-Flasher/.vscode/extensions.json
+ARM_Tag_FW\Newton_M3_nRF52811\$PROJECT_DIR
--- a/ARM_Tag_FW/Newton_M3_nRF52811/Newton_M3_Universal-full-flash.bin
+++ b/ARM_Tag_FW/Newton_M3_nRF52811/Newton_M3_Universal-full-flash.bin
--- a/ARM_Tag_FW/Newton_M3_nRF52811/Newton_M3_Universal-full-flash.hex
+++ b/ARM_Tag_FW/Newton_M3_nRF52811/Newton_M3_Universal-full-flash.hex
--- a/ARM_Tag_FW/Newton_M3_nRF52811/Newton_M3_Universal-ota.bin
+++ b/ARM_Tag_FW/Newton_M3_nRF52811/Newton_M3_Universal-ota.bin
--- a/ARM_Tag_FW/Newton_M3_nRF52811/hal/Newton_M3_nRF52811/HAL_Newton_M3.h
+++ b/ARM_Tag_FW/Newton_M3_nRF52811/hal/Newton_M3_nRF52811/HAL_Newton_M3.h
@@ -105,6 +105,7 @@ struct tagSpecs {
    uint8_t buttonCount = 0;
    bool hasNFC = false;
    bool hasLED = false;
+    bool hasThirdColor = false;
    uint16_t macSuffix = 0x0000;
    uint8_t OEPLtype = 0;
    uint8_t solumType = 0;
--- a/ARM_Tag_FW/Newton_M3_nRF52811/hal/Newton_M3_nRF52811/tagtype_db.cpp
+++ b/ARM_Tag_FW/Newton_M3_nRF52811/hal/Newton_M3_nRF52811/tagtype_db.cpp
@@ -36,6 +36,13 @@ void identifyTagInfo() {
    CA FE BA DE 15 0B 12 04 00 10 01 E0 01 20 03 39 00 03 81 9D 00 00 4C FF FF FF FF FF FF FF FF FF		7.4 UC8179
    F3 22 BC 05 15 0A 0D 04 00 19 01 A0 02 C0 03 38 07 07 01 80 00 00 64 FF FF FF FF FF FF FF FF FF		9.7 SSD
    AD BA FE CA 15 0A 1B 04 00 19 01 A0 02 C0 03 38 07 07 01 80 00 00 64 FF FF FF FF FF FF FF FF FF		9.7 type 2
+    92 C3 80 05 15 08 19 04 00 12 01 18 03 10 01 04 07 07 01 80 00 00 63 FF FF FF FF FF FF FF FF FF     5.85 BWR
+    22 F0 BF 05 15 0A 14 04 00 12 00 18 03 10 01 04 07 07 01 80 00 00 24 FF FF FF FF FF FF FF FF FF     5.85 BW
+    99 78 B1 05 15 0A 06 04 00 0D 01 68 01 B8 00 38 07 07 01 80 00 00 43 FF FF FF FF FF FF FF FF FF     2.6"
+    72 92 1E 7E 15 0B 09 04 00 15 00 80 01 A8 00 38 00 01 01 9C 00 00 22 FF FF FF FF FF FF FF FF FF     2.9" FREEZER
+    31 50 53 06 16 02 19 04 00 12 01 C8 00 C8 00 04 00 07 01 9C 00 00 40 FF FF FF FF FF FF FF FF FF
+
+

            MAC    | calib  |	  |?????|Xres |Yres |  ???   |capab|    |type|

@@ -49,7 +56,7 @@ void identifyTagInfo() {
            0x12 - SSD (var1.6)
            0x15 - SSD (2.9 lite)
            0x19 - SSD (9.7)
-
+    0x0A -  Have third color?
    0x12 -  0x01 | (0x80 if it has a button)
    0x13 -  0x80 | (0x10 if it has a LED) | (0x0C ?? ) | (0x01 if it has a button)
    */
@@ -65,13 +72,21 @@ void identifyTagInfo() {
    capabilities[1] = getUICRByte(0x13);
    tag.solumType = getUICRByte(0x16);

+    if(getUICRByte(0x0A) == 0x01){
+        tag.hasThirdColor = true;
+    }
+
    switch (controllerType) {
        case 0x0F:
        case 0x12:
        case 0x15:
        case 0x19:
-            epd = new unissd;
-            break;
+            if(epdXRes == 792 && epdYRes == 272){
+                epd = new dualssd;
+            }else{
+                epd = new unissd;
+            }
+              break;
        case 0x0D:
            epd = new epdvar29;
            break;
@@ -105,6 +120,25 @@ void identifyTagInfo() {
    if (capabilities[1] & 0x01) tag.buttonCount++;
    if (capabilities[1] & 0x10) tag.hasLED = true;
    if (capabilities[0] & 0x01) tag.hasNFC = true;
+    
+    printf("TagType report:\n");
+    printf("Resolution: %d*%d Px\n", epd->Xres,epd->Yres);
+    printf("Nb of buttons: %d\n", tag.buttonCount);
+    if(tag.hasLED){
+        printf("This tag have a led: Yes\n");
+    }else{
+        printf("This tag have a led: No\n"); 
+    }
+    if(tag.hasNFC){
+        printf("This tag have NFC: Yes\n");
+    }else{
+        printf("This tag have NFC: No\n"); 
+    }
+    if(tag.hasThirdColor){
+        printf("This tag is Black and white only: No\n");
+    }else{
+        printf("This tag is Black and white only: Yes\n"); 
+    }

    // we'll calculate image slot size here
    uint32_t imageSize = epd->Xres * epd->Yres / 4;
@@ -115,6 +149,8 @@ void identifyTagInfo() {
            tag.macSuffix = 0xB0D0;
            epd->epdMirrorV = true;
            tag.OEPLtype = SOLUM_M3_BWR_16;
+            epd->effectiveXRes = epdXRes;
+            epd->effectiveYRes = epdYRes-1; //Yeah... I wonder why too....
            break;
        case STYPE_SIZE_022:
            tag.macSuffix = 0xB190;
@@ -122,6 +158,12 @@ void identifyTagInfo() {
            tag.OEPLtype = SOLUM_M3_BWR_22;
            epd->XOffset = 8;
            break;
+        case STYPE_SIZE_026:
+            tag.macSuffix = 0xB3D0;
+            epd->drawDirectionRight = true;
+            tag.OEPLtype = SOLUM_M3_BWR_22;
+            epd->XOffset = 8;
+            break;
        case STYPE_SIZE_029:
            tag.OEPLtype = SOLUM_M3_BWR_29;
            if (tag.buttonCount == 2) {
@@ -134,6 +176,12 @@ void identifyTagInfo() {
            epd->drawDirectionRight = true;
            epd->XOffset = 8;
            break;
+        case STYPE_SIZE_029_FREEZER:
+            tag.OEPLtype = SOLUM_M3_BW_29;
+            tag.macSuffix = 0x82D0;
+            epd->drawDirectionRight = true;
+            epd->XOffset = 8;
+            break;
        case STYPE_SIZE_042:
            tag.macSuffix = 0xB6D0;
            tag.OEPLtype = SOLUM_M3_BWR_42;
@@ -145,6 +193,16 @@ void identifyTagInfo() {
            //            epd->mirrorH = true;
            tag.OEPLtype = SOLUM_M3_BWR_43;
            break;
+        case STYPE_SIZE_058:
+            tag.macSuffix = 0xE3D0;
+            epd->epdMirrorV = true;
+            tag.OEPLtype = SOLUM_M3_BWR_58;
+            break;
+        case STYPE_SIZE_058_FREEZER:
+            tag.macSuffix = 0x84D0;
+            epd->epdMirrorV = true;
+            tag.OEPLtype = SOLUM_M3_BW_58;
+            break;
        case STYPE_SIZE_060:
            tag.macSuffix = 0xB890;
            tag.OEPLtype = SOLUM_M3_BWR_60;
--- a/ARM_Tag_FW/Newton_M3_nRF52811/platformio.ini
+++ b/ARM_Tag_FW/Newton_M3_nRF52811/platformio.ini
@@ -1,5 +1,5 @@
 [platformio]
-core_dir = $PROJECT_DIR/core
+core_dir = D:/Documents/GitHub/OpenEPaperLink/ARM_Tag_FW/Newton_M3_nRF52811/core

 [env]
 platform = nordicnrf52@9.6.0
--- a/ARM_Tag_FW/Newton_M3_nRF52811/src/epd_driver/dualssd.cpp
+++ b/ARM_Tag_FW/Newton_M3_nRF52811/src/epd_driver/dualssd.cpp
@@ -0,0 +1,220 @@
+#include <Arduino.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lut.h"
+#include "settings.h"
+#include "hal.h"
+#include "wdt.h"
+
+#include "drawing.h"
+#include "dualssd.h"
+
+#define CMD_DRV_OUTPUT_CTRL 0x01
+#define CMD_SOFT_START_CTRL 0x0C
+#define CMD_ENTER_SLEEP 0x10
+#define CMD_DATA_ENTRY_MODE 0x11
+#define CMD_SOFT_RESET 0x12
+#define CMD_SOFT_RESET2 0x13
+#define CMD_SETUP_VOLT_DETECT 0x15
+#define CMD_TEMP_SENSOR_CONTROL 0x18
+#define CMD_ACTIVATION 0x20
+#define CMD_DISP_UPDATE_CTRL 0x21
+#define CMD_DISP_UPDATE_CTRL2 0x22
+#define CMD_WRITE_FB_BW 0x24
+#define CMD_WRITE_FB_RED 0x26
+#define CMD_VCOM_GLITCH_CTRL 0x2B
+#define CMD_LOAD_OTP_LUT 0x31
+#define CMD_WRITE_LUT 0x32
+#define CMD_BORDER_WAVEFORM_CTRL 0x3C
+#define CMD_WINDOW_X_SIZE 0x44
+#define CMD_WINDOW_Y_SIZE 0x45
+#define CMD_WRITE_PATTERN_RED 0x46
+#define CMD_WRITE_PATTERN_BW 0x47
+#define CMD_XSTART_POS 0x4E
+#define CMD_YSTART_POS 0x4F
+#define CMD_ANALOG_BLK_CTRL 0x74
+#define CMD_DIGITAL_BLK_CTRL 0x7E
+
+#define SCREEN_CMD_CLOCK_ON 0x80
+#define SCREEN_CMD_CLOCK_OFF 0x01
+#define SCREEN_CMD_ANALOG_ON 0x40
+#define SCREEN_CMD_ANALOG_OFF 0x02
+#define SCREEN_CMD_LATCH_TEMPERATURE_VAL 0x20
+#define SCREEN_CMD_LOAD_LUT 0x10
+#define SCREEN_CMD_USE_MODE_2 0x08  // modified commands 0x10 and 0x04
+#define SCREEN_CMD_REFRESH 0xC7
+
+void dualssd::selectLUT(uint8_t lut) {
+    // implement alternative LUTs here. Currently just reset the watchdog to two minutes,
+    // to ensure it doesn't reset during the much longer bootup procedure
+    lut += 1;  // make the compiler a happy camper
+    wdt120s();
+    return;
+}
+
+void dualssd::epdEnterSleep() {
+    epdWrite(CMD_ENTER_SLEEP, 1, 0x01);
+}
+void dualssd::epdSetup() {
+    
+    printf("init epd...\n");
+    epdReset();
+    epdWrite(CMD_SOFT_RESET, 0);
+    delay(10);
+    switch (this->controllerType) {
+        case 0x0F:
+        case 0x12:
+        case 0x15:
+            /* 5.85 INIT SEQUENCE
+            0x11, 0x00
+            0x91, 0x01
+            0x44, 0x31, 0x00
+            0x45, 0x0F, 0x01, 0x00, 0x00
+            0x4E, 0x31
+            0x4F, 0x0F, 0x01
+            0xC4, 0x00, 0x31
+            0xC5, 0x0F, 0x01, 0x00, 0x00
+            0xCE, 0x00
+            0xCF, 0x0F, 0x01, 0x3C, 0x01
+            
+            */
+           /* 5.85 BW INIT SEQUENCE
+            0x11, 0x00
+            0x91, 0x01
+            0x44, 0x31, 0x00
+            0x45, 0x0F, 0x01, 0x00, 0x00
+            0x4E, 0x31
+            0x4F, 0x0F, 0x01
+            0xC4, 0x00, 0x31
+            0xC5, 0x0F, 0x01, 0x00, 0x00
+            0xCE, 0x00
+            0xCF, 0x0F, 0x01, 0x3C, 0x01
+            
+            */
+
+
+            epdWrite(0x11, 1, 0x00);
+            epdWrite(0x91, 1, 0x01);
+            if(tag.hasThirdColor){
+                epdWrite(0x21, 2, 0x08, 0x10);
+            }else{
+                epdWrite(0x21, 2, 0x48, 0x10);
+            }
+            //epdWrite(CMD_WINDOW_X_SIZE, 2, this->XOffset / 8, ((this->XOffset + this->effectiveXRes) / 8) - 1);
+            //epdWrite(CMD_WINDOW_Y_SIZE, 4, (this->YOffset + this->effectiveYRes) & 0xFF, (this->YOffset + this->effectiveYRes) >> 8, this->YOffset & 0xFF, this->YOffset >> 8);
+            epdWrite(0x44, 2, 0x31, 0x00);
+            epdWrite(0x45, 4, 0x0F, 0x01, 0x00, 0x00);
+            //epdWrite(0x4E, 2, this->XOffset / 8, ((this->XOffset + this->effectiveXRes) / 8) - 1);
+            //epdWrite(0x4F, 4, (this->YOffset + this->effectiveYRes) & 0xFF, (this->YOffset + this->effectiveYRes) >> 8, this->YOffset & 0xFF, this->YOffset >> 8);
+            epdWrite(0x4E, 1, 0x31);
+            epdWrite(0x4F, 2, 0x0F, 0x01);
+            epdWrite(0xC4, 2, 0x00, 0x31);
+            epdWrite(0xC5, 4, 0x0F, 0x01, 0x00, 0x00);
+            epdWrite(0xCE, 1, 0x00);
+            epdWrite(0xCF, 4, 0x0F, 0x01, 0x3C, 0x01);
+            epdWrite(0x3C, 1, 0x01);
+            break;
+    }
+}
+
+void dualssd::epdWriteDisplayData() {
+   
+    uint8_t *buf[2] = {0, 0};  // this will hold pointers to odd/even data lines
+    // Those dual SSD controller (SSD1683??) behave as 2 400pxx wide screens, that needs independent data transfers.
+    uint8_t c_increment = 1;
+    if(!tag.hasThirdColor){
+        c_increment = 2;
+    }
+    for (uint8_t c = 0; c < 4; c = c + c_increment) {
+        delay(10);
+        if (c == 0) epd_cmd(0x24);//BW
+        if (c == 1) epd_cmd(0x26);//RED
+        if (c == 2) epd_cmd(0xA4);//BW
+        if (c == 3) epd_cmd(0xA6);//RED
+
+        delay(10);
+        markData();
+        epdSelect();
+
+        for (uint16_t curY = 0; curY < epd->effectiveYRes; curY += 2) {
+            // Get 'even' screen line
+            buf[0] = (uint8_t *)calloc(epd->effectiveXRes / 8, 1);
+
+            if (epd->epdMirrorV) {
+                drawItem::renderDrawLine(buf[0], (epd->effectiveYRes - 1) - curY, c%2);
+            } else {
+                drawItem::renderDrawLine(buf[0], curY, c%2);
+            }
+
+            if (epd->epdMirrorH) drawItem::reverseBytes(buf[0], epd->effectiveXRes / 8);
+            // on the first pass, the second (buf[1]) buffer is unused, so we don't have to wait for it to flush to the display / free it
+            if (buf[1]) {
+                // wait for 'odd' display line to finish writing to the screen
+                epdSPIWait();
+                free(buf[1]);
+            }
+
+            // start transfer of even data line to the screen
+            if(c<2){
+                epdSPIAsyncWrite(buf[0] + (epd->effectiveXRes / 16), (epd->effectiveXRes / 16)+1);
+            }else{
+                epdSPIAsyncWrite(buf[0], (epd->effectiveXRes / 16)+1);
+            }
+
+            // Get 'odd' screen display line
+            buf[1] = (uint8_t *)calloc(epd->effectiveXRes / 8, 1);
+
+            if (epd->epdMirrorV) {
+                drawItem::renderDrawLine(buf[1], (epd->effectiveYRes - 1) - (curY + 1), c%2);
+            } else {
+                drawItem::renderDrawLine(buf[1], curY + 1, c%2);
+            }
+            if (epd->epdMirrorH) drawItem::reverseBytes(buf[1], epd->effectiveXRes / 8);
+
+            // wait until the 'even' data has finished writing
+            epdSPIWait();
+            free(buf[0]);
+
+            // start transfer of the 'odd' data line
+            if(c<2){
+                epdSPIAsyncWrite(buf[1]+(epd->effectiveXRes / 16), (epd->effectiveXRes / 16)+1);
+            }else{
+                
+                epdSPIAsyncWrite(buf[1], (epd->effectiveXRes / 16)+1);
+            }
+        }
+        // check if this was the first pass. If it was, we'll need to wait until the last display line finished writing
+        if (c == 0 || c==2) {
+            epdSPIWait();
+            epdDeselect();
+            free(buf[1]);
+            buf[1] = nullptr;
+        }
+    }
+    // flush the draw list, make sure items don't appear on subsequent screens
+    drawItem::flushDrawItems();
+
+    // wait until the last line of display has finished writing and clean our stuff up
+    epdSPIWait();
+    epdDeselect();
+    if (buf[1]) free(buf[1]);
+}
+
+
+void dualssd::draw() {
+    drawNoWait();
+    getVoltage();
+    epdBusyWaitFalling(120000);
+}
+void dualssd::drawNoWait() {
+    epdWriteDisplayData();
+    //epdWrite(CMD_DISP_UPDATE_CTRL2, 1, 0xF7);
+    epdWrite(CMD_ACTIVATION, 0);
+}
+void dualssd::epdWaitRdy() {
+    epdBusyWaitFalling(120000);
+}
--- a/ARM_Tag_FW/Newton_M3_nRF52811/src/epd_driver/dualssd.h
+++ b/ARM_Tag_FW/Newton_M3_nRF52811/src/epd_driver/dualssd.h
@@ -0,0 +1,23 @@
+#ifndef _EPD_DUALSSD_H_
+#define _EPD_DUALSSD_H_
+
+class dualssd : public epdInterface {
+   public:
+    void epdSetup();
+    void epdEnterSleep();
+    void draw();
+    void drawNoWait();
+    void epdWaitRdy();
+    void epdWriteDisplayData();
+    void selectLUT(uint8_t lut);
+
+   protected:
+   void commandReadBegin(uint8_t cmd);
+   void commandReadEnd();
+   uint8_t epdReadByte();
+   void setWindowX(uint16_t start, uint16_t end);
+   void setWindowY(uint16_t start, uint16_t end);
+   void setPosXY(uint16_t x, uint16_t y);
+};
+
+#endif
--- a/ARM_Tag_FW/Newton_M3_nRF52811/src/epd_driver/epd_interface.h
+++ b/ARM_Tag_FW/Newton_M3_nRF52811/src/epd_driver/epd_interface.h
@@ -21,6 +21,7 @@ void selectLUT(uint8_t lut);

 #include "uc_variant_043.h"
 #include "unissd.h"
+#include "dualssd.h"
 #include "uc_variant_029.h"
 #include "uc8159.h"
 #include "uc8179.h"
--- a/ARM_Tag_FW/Newton_M3_nRF52811/src/epd_driver/unissd.cpp
+++ b/ARM_Tag_FW/Newton_M3_nRF52811/src/epd_driver/unissd.cpp
@@ -76,13 +76,17 @@ void unissd::epdSetup() {
            // stock init 1.6"
            epdWrite(CMD_DRV_OUTPUT_CTRL, 3, this->effectiveYRes & 0xFF, this->effectiveYRes >> 8, 0x00);
            epdWrite(CMD_DATA_ENTRY_MODE, 1, 0x01);
-            epdWrite(CMD_WINDOW_X_SIZE, 2, this->XOffset / 8, ((this->XOffset + this->effectiveXRes) / 8) - 1);
+            epdWrite(CMD_WINDOW_X_SIZE, 2, this->XOffset / 8, ((this->XOffset + this->effectiveXRes) / 8)-1);
            epdWrite(CMD_WINDOW_Y_SIZE, 4, (this->YOffset + this->effectiveYRes) & 0xFF, (this->YOffset + this->effectiveYRes) >> 8, this->YOffset & 0xFF, this->YOffset >> 8);
            epdWrite(CMD_BORDER_WAVEFORM_CTRL, 1, 0x05);
            epdWrite(CMD_TEMP_SENSOR_CONTROL, 1, 0x80);
            // end stock init
            // added
-            epdWrite(CMD_DISP_UPDATE_CTRL, 2, 0x08, 0x00);  // fix reversed image with stock setup
+            if(tag.hasThirdColor){
+                epdWrite(CMD_DISP_UPDATE_CTRL, 2, 0x08, 0x00);  // fix reversed image with stock setup
+            }else{
+                epdWrite(CMD_DISP_UPDATE_CTRL, 2, 0x48, 0x00);  // fix reversed image with stock setup
+            }
            break;
        case 0x19:
            // stock init 9.7"
@@ -108,7 +112,11 @@ void unissd::epdSetup() {
 void unissd::epdWriteDisplayData() {
    // this display expects two entire framebuffers worth of data to be written, one for b/w and one for red
    uint8_t *buf[2] = {0, 0};  // this will hold pointers to odd/even data lines
-    for (uint8_t c = 0; c < 2; c++) {
+    uint8_t c_end = 2; //The loop must be executed 2 times if BWR, 1 time if BW
+    if(!tag.hasThirdColor){
+        c_end = 1;
+    }
+    for (uint8_t c = 0; c < c_end; c++) {
        switch (this->controllerType) {
            case 0x0F:
            case 0x12:
--- a/ARM_Tag_FW/Newton_M3_nRF52811/src/userinterface.cpp
+++ b/ARM_Tag_FW/Newton_M3_nRF52811/src/userinterface.cpp
@@ -26,12 +26,19 @@ bool lowBatteryShown = false;
 bool noAPShown = false;

 void addOverlay() {
+
    if (currentChannel == 0) {
-        drawMask(epd->Xres - 27, 5, 22, 22, COLOR_BLACK);
-        drawMask(epd->Xres - 27, 5, 22, 22, COLOR_RED);
-        drawRoundedRectangle(epd->Xres - 28, 4, 24, 24, COLOR_RED);
-        addBufferedImage(epd->Xres - 24, 8, COLOR_BLACK, rotation::ROTATE_0, ant, DRAW_NORMAL);
-        addBufferedImage(epd->Xres - 16, 15, COLOR_RED, rotation::ROTATE_0, cross, DRAW_NORMAL);
+        drawMask(epd->Xres - 28, 4, 24, 24, COLOR_BLACK);
+        if(tag.hasThirdColor){
+            drawMask(epd->Xres - 28, 4, 24, 24, COLOR_RED);
+            drawRoundedRectangle(epd->Xres - 28, 4, 24, 24, COLOR_RED);
+            addBufferedImage(epd->Xres - 24, 8, COLOR_BLACK, rotation::ROTATE_0, ant, DRAW_NORMAL);
+            addBufferedImage(epd->Xres - 16, 15, COLOR_RED, rotation::ROTATE_0, cross, DRAW_NORMAL);
+        }else{
+            drawRoundedRectangle(epd->Xres - 28, 4, 24, 24, COLOR_BLACK);
+            addBufferedImage(epd->Xres - 24, 8, COLOR_BLACK, rotation::ROTATE_0, ant, DRAW_NORMAL);
+            addBufferedImage(epd->Xres - 16, 15, COLOR_BLACK, rotation::ROTATE_0, cross, DRAW_NORMAL);
+        }
        noAPShown = true;
    } else {
        noAPShown = false;
@@ -39,8 +46,13 @@ void addOverlay() {

    if (lowBattery) {
        drawMask(epd->Xres - 27, epd->Yres - 26, 22, 22, COLOR_BLACK);
-        drawMask(epd->Xres - 27, epd->Yres - 26, 22, 22, COLOR_RED);
-        drawRoundedRectangle(epd->Xres - 28, epd->Yres - 26, 24, 24, COLOR_RED);
+        if(tag.hasThirdColor){
+            drawMask(epd->Xres - 27, epd->Yres - 26, 22, 22, COLOR_RED);
+            drawRoundedRectangle(epd->Xres - 28, epd->Yres - 26, 24, 24, COLOR_RED);
+        }else{
+            drawMask(epd->Xres - 27, epd->Yres - 26, 22, 22, COLOR_BLACK);
+            drawRoundedRectangle(epd->Xres - 28, epd->Yres - 26, 24, 24, COLOR_BLACK);
+        }
        addBufferedImage(epd->Xres - 24, epd->Yres - 19, COLOR_BLACK, rotation::ROTATE_0, battery, DRAW_NORMAL);
        lowBatteryShown = true;
    } else {
@@ -48,10 +60,16 @@ void addOverlay() {
    }
 #ifdef DEBUG_BUILD
    fontrender fr(&FreeSansBold18pt7b);
-    drawMask(15, epd->Yres - 53, 129, 33, COLOR_BLACK);
-    drawMask(15, epd->Yres - 53, 129, 33, COLOR_RED);
-    drawRoundedRectangle(15, epd->Yres - 53, 129, 33, COLOR_RED);
-    fr.epdPrintf(17, epd->Yres - 50, COLOR_RED, rotation::ROTATE_0, "DEBUG");
+    drawMask(15, epd->Yres - 53, 130, 33, COLOR_BLACK);
+    if(tag.hasThirdColor){
+        drawMask(15, epd->Yres - 53, 140, 35, COLOR_RED);
+        drawRoundedRectangle(15, epd->Yres - 53, 129, 33, COLOR_RED);
+        fr.epdPrintf(17, epd->Yres - 50, COLOR_RED, rotation::ROTATE_0, "DEBUG");
+    }else{
+        drawMask(15, epd->Yres - 53, 130, 33, COLOR_BLACK);
+        drawRoundedRectangle(15, epd->Yres - 53, 129, 33, COLOR_BLACK);
+        fr.epdPrintf(17, epd->Yres - 50, COLOR_BLACK, rotation::ROTATE_0, "DEBUG");
+    }
 #endif
 }

@@ -67,9 +85,9 @@ void showSplashScreen() {
        case STYPE_SIZE_016:
            fr.setFont(&FreeSans9pt7b);
            fr.epdPrintf(2, 2, COLOR_BLACK, rotation::ROTATE_0, "OpenEPaperLink");
-            fr.epdPrintf(10, 38, COLOR_RED, rotation::ROTATE_0, "Newton M3 2.2\"");
+            fr.epdPrintf(10, 38, COLOR_RED, rotation::ROTATE_0, "Newton M3 1.6\"");
            fr.epdPrintf(5, epd->Yres - 40, 0, rotation::ROTATE_0, "FW: %04X-%s", fwVersion, fwVersionSuffix);
-            fr.epdPrintf(2, epd->Yres - 20, 0, rotation::ROTATE_0, "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            fr.epdPrintf(2, epd->Yres - 20, 0, rotation::ROTATE_0, "%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            break;
        case STYPE_SIZE_022:
            fr.setFont(&FreeSansBold18pt7b);
@@ -81,6 +99,16 @@ void showSplashScreen() {
            fr.epdPrintf(5, epd->Yres - 20, 0, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            addQR(epd->Xres - 120, 42, 3, 3, "https://openepaperlink.eu/tag/0/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            break;
+        case STYPE_SIZE_026:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(2, 2, COLOR_BLACK, rotation::ROTATE_0, "OpenEPaperLink");
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, 38, COLOR_RED, rotation::ROTATE_0, "Newton M3 2.6\"");
+            // fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(5, epd->Yres - 40, 0, rotation::ROTATE_0, "FW: %04X-%s", fwVersion, fwVersionSuffix);
+            fr.epdPrintf(5, epd->Yres - 20, 0, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            addQR(epd->Xres - 120, 42, 3, 3, "https://openepaperlink.eu/tag/0/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            break;
        case STYPE_SIZE_029:
            fr.setFont(&FreeSansBold18pt7b);
            fr.epdPrintf(2, 2, COLOR_BLACK, rotation::ROTATE_0, "OpenEPaperLink");
@@ -91,6 +119,16 @@ void showSplashScreen() {
            fr.epdPrintf(5, epd->Yres - 20, 0, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            addQR(epd->Xres - 120, 42, 3, 3, "https://openepaperlink.eu/tag/0/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            break;
+        case STYPE_SIZE_029_FREEZER:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(2, 2, COLOR_BLACK, rotation::ROTATE_0, "OpenEPaperLink");
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, 38, COLOR_BLACK, rotation::ROTATE_0, "Newton M3 2.9\" Freezer");
+            // fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(epd->Xres - 17, 0, COLOR_BLACK, rotation::ROTATE_270, "FW: %04X-%s", fwVersion, fwVersionSuffix);
+            fr.epdPrintf(5, epd->Yres - 20, COLOR_BLACK, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            addQR(epd->Xres - 120, 42, 3, 3, "https://openepaperlink.eu/tag/0/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            break;
        case STYPE_SIZE_042:
            fr.setFont(&FreeSansBold18pt7b);
            fr.epdPrintf(2, 2, COLOR_BLACK, rotation::ROTATE_0, "OpenEPaperLink");
@@ -111,6 +149,26 @@ void showSplashScreen() {
            fr.epdPrintf(10, epd->Yres - 25, 0, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            addQR(epd->Xres - 120, 32, 3, 3, "https://openepaperlink.eu/tag/0/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            break;
+        case STYPE_SIZE_058:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(2, 2, COLOR_BLACK, rotation::ROTATE_0, "OpenEPaperLink");
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, 38, COLOR_RED, rotation::ROTATE_0, "Newton M3 5.85\"");
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(epd->Xres - 17, 0, 0, rotation::ROTATE_270, "FW: %04X-%s", fwVersion, fwVersionSuffix);
+            fr.epdPrintf(5, epd->Yres - 20, 0, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            addQR(epd->Xres - 120, 42, 3, 3, "https://openepaperlink.eu/tag/0/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            break;
+        case STYPE_SIZE_058_FREEZER:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(2, 2, COLOR_BLACK, rotation::ROTATE_0, "OpenEPaperLink");
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, 38, COLOR_BLACK, rotation::ROTATE_0, "Newton M3 5.85\" Freezer");
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(epd->Xres - 17, 0, COLOR_BLACK, rotation::ROTATE_270, "FW: %04X-%s", fwVersion, fwVersionSuffix);
+            fr.epdPrintf(5, epd->Yres - 20, COLOR_BLACK, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            addQR(epd->Xres - 120, 42, 3, 3, "https://openepaperlink.eu/tag/0/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            break;
        case STYPE_SIZE_060:
            fr.setFont(&FreeSansBold24pt7b);
            fr.epdPrintf(10, 10, COLOR_BLACK, rotation::ROTATE_0, "OpenEPaperLink");
@@ -147,10 +205,17 @@ void showSplashScreen() {
    }
 #ifdef DEBUGBLOCKS
    drawMask(15, epd->Yres - 53, 129, 33, COLOR_BLACK);
-    drawMask(15, epd->Yres - 53, 129, 33, COLOR_RED);
-    drawRoundedRectangle(15, epd->Yres - 53, 129, 33, COLOR_RED);
-    fr.setFont(&FreeSansBold18pt7b);
-    fr.epdPrintf(17, epd->Yres - 50, COLOR_RED, rotation::ROTATE_0, "DEBUG");
+    if(tag.hasThirdColor){
+        drawMask(15, epd->Yres - 53, 129, 33, COLOR_RED);
+        drawRoundedRectangle(15, epd->Yres - 53, 129, 33, COLOR_RED);
+        fr.setFont(&FreeSansBold18pt7b);
+        fr.epdPrintf(17, epd->Yres - 50, COLOR_RED, rotation::ROTATE_0, "DEBUG");
+    }else{
+        drawMask(15, epd->Yres - 53, 129, 33, COLOR_BLACK);
+        drawRoundedRectangle(15, epd->Yres - 53, 129, 33, COLOR_BLACK);
+        fr.setFont(&FreeSansBold18pt7b);
+        fr.epdPrintf(17, epd->Yres - 50, COLOR_BLACK, rotation::ROTATE_0, "DEBUG");
+    }
 #endif
    draw();
 }
@@ -198,6 +263,18 @@ void showAPFound() {
            fr.epdPrintf(10, epd->Yres - 25, 0, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            addQR(epd->Xres - 66, 47, 3, 2, "https://openepaperlink.eu/tag/1/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            break;
+        case STYPE_SIZE_026:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "AP Found");
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, 53, COLOR_RED, rotation::ROTATE_0, "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", APmac[7], APmac[6], APmac[5], APmac[4], APmac[3], APmac[2], APmac[1], APmac[0]);
+            fr.epdPrintf(10, 71, COLOR_RED, rotation::ROTATE_0, "RSSI: %ddBm    LQI: %d", mLastRSSI, mLastLqi);
+            fr.epdPrintf(10, 89, COLOR_RED, rotation::ROTATE_0, "Ch %d", currentChannel);
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, epd->Yres - 43, 0, rotation::ROTATE_0, "Battery: %d.%dV Temp: %d'C", batteryVoltage / 1000, batteryVoltage % 1000, temperature);
+            fr.epdPrintf(10, epd->Yres - 25, 0, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            addQR(epd->Xres - 66, 47, 3, 2, "https://openepaperlink.eu/tag/1/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            break;
        case STYPE_SIZE_029:
            fr.setFont(&FreeSansBold18pt7b);
            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "AP Found");
@@ -210,6 +287,18 @@ void showAPFound() {
            fr.epdPrintf(10, epd->Yres - 25, 0, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            addQR(epd->Xres - 66, 47, 3, 2, "https://openepaperlink.eu/tag/1/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            break;
+        case STYPE_SIZE_029_FREEZER:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "AP Found");
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, 53, COLOR_BLACK, rotation::ROTATE_0, "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", APmac[7], APmac[6], APmac[5], APmac[4], APmac[3], APmac[2], APmac[1], APmac[0]);
+            fr.epdPrintf(10, 71, COLOR_BLACK, rotation::ROTATE_0, "RSSI: %ddBm    LQI: %d", mLastRSSI, mLastLqi);
+            fr.epdPrintf(10, 89, COLOR_BLACK, rotation::ROTATE_0, "Ch %d", currentChannel);
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, epd->Yres - 43, 0, rotation::ROTATE_0, "Battery: %d.%dV Temp: %d'C", batteryVoltage / 1000, batteryVoltage % 1000, temperature);
+            fr.epdPrintf(10, epd->Yres - 25, 0, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            addQR(epd->Xres - 66, 47, 3, 2, "https://openepaperlink.eu/tag/1/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            break;
        case STYPE_SIZE_042:
            fr.setFont(&FreeSansBold18pt7b);
            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "AP Found");
@@ -235,6 +324,30 @@ void showAPFound() {
            fr.epdPrintf(10, epd->Yres - 25, 0, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            addQR(epd->Xres - 66, 47, 3, 2, "https://openepaperlink.eu/tag/1/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            break;
+        case STYPE_SIZE_058:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "AP Found");
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, 53, COLOR_RED, rotation::ROTATE_0, "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", APmac[7], APmac[6], APmac[5], APmac[4], APmac[3], APmac[2], APmac[1], APmac[0]);
+            fr.epdPrintf(10, 71, COLOR_RED, rotation::ROTATE_0, "RSSI: %ddBm    LQI: %d", mLastRSSI, mLastLqi);
+            fr.epdPrintf(10, 89, COLOR_RED, rotation::ROTATE_0, "Ch %d", currentChannel);
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, epd->Yres - 43, 0, rotation::ROTATE_0, "Battery: %d.%dV Temp: %d'C", batteryVoltage / 1000, batteryVoltage % 1000, temperature);
+            fr.epdPrintf(10, epd->Yres - 25, 0, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            addQR(epd->Xres - 120, 42, 3, 3, "https://openepaperlink.eu/tag/0/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            break;
+        case STYPE_SIZE_058_FREEZER:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "AP Found");
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, 53, COLOR_BLACK, rotation::ROTATE_0, "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", APmac[7], APmac[6], APmac[5], APmac[4], APmac[3], APmac[2], APmac[1], APmac[0]);
+            fr.epdPrintf(10, 71, COLOR_BLACK, rotation::ROTATE_0, "RSSI: %ddBm    LQI: %d", mLastRSSI, mLastLqi);
+            fr.epdPrintf(10, 89, COLOR_BLACK, rotation::ROTATE_0, "Ch %d", currentChannel);
+            fr.setFont(&FreeSans9pt7b);
+            fr.epdPrintf(10, epd->Yres - 43, COLOR_BLACK, rotation::ROTATE_0, "Battery: %d.%dV Temp: %d'C", batteryVoltage / 1000, batteryVoltage % 1000, temperature);
+            fr.epdPrintf(10, epd->Yres - 25, COLOR_BLACK, rotation::ROTATE_0, "MAC: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            addQR(epd->Xres - 120, 42, 3, 3, "https://openepaperlink.eu/tag/0/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            break;
        case STYPE_SIZE_060:
            fr.setFont(&FreeSansBold18pt7b);
            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "AP Found - Waiting for data");
@@ -296,6 +409,16 @@ void showNoAP() {
            fr.epdPrintf(10, 89, COLOR_BLACK, rotation::ROTATE_0, "I'll try again in a little while, but you");
            fr.epdPrintf(10, 109, COLOR_BLACK, rotation::ROTATE_0, "can force a retry now by pressing a button");
            break;
+        case STYPE_SIZE_026:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "No AP Found");
+            fr.setFont(&FreeSans9pt7b);
+            addQR(epd->Xres - 66, 47, 3, 2, "https://openepaperlink.eu/tag/1/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            fr.epdPrintf(10, 69, COLOR_BLACK, rotation::ROTATE_0, "Couldn't find an AP :(");
+            fr.epdPrintf(10, 89, COLOR_BLACK, rotation::ROTATE_0, "I'll try again in a little while, but you");
+            fr.epdPrintf(10, 109, COLOR_BLACK, rotation::ROTATE_0, "can force a retry now by scanning");
+            fr.epdPrintf(10, 129, COLOR_BLACK, rotation::ROTATE_0, "the NFC-wake area with your phone");
+            break;
        case STYPE_SIZE_029:
            fr.setFont(&FreeSansBold18pt7b);
            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "No AP Found");
@@ -305,6 +428,15 @@ void showNoAP() {
            fr.epdPrintf(10, 89, COLOR_BLACK, rotation::ROTATE_0, "I'll try again in a little while, but you");
            fr.epdPrintf(10, 109, COLOR_BLACK, rotation::ROTATE_0, "can force a retry now by pressing a button");
            break;
+        case STYPE_SIZE_029_FREEZER:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "No AP Found");
+            fr.setFont(&FreeSans9pt7b);
+            addQR(epd->Xres - 66, 47, 3, 2, "https://openepaperlink.eu/tag/1/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            fr.epdPrintf(10, 69, COLOR_BLACK, rotation::ROTATE_0, "Couldn't find an AP :(");
+            fr.epdPrintf(10, 89, COLOR_BLACK, rotation::ROTATE_0, "I'll try again in a little while, but you");
+            fr.epdPrintf(10, 109, COLOR_BLACK, rotation::ROTATE_0, "can force a retry now by pressing a button");
+            break;
        case STYPE_SIZE_042:
            fr.setFont(&FreeSansBold18pt7b);
            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "No AP Found");
@@ -328,6 +460,26 @@ void showNoAP() {
            fr.epdPrintf(152, 89, COLOR_BLACK, rotation::ROTATE_0, "can force a retry now by scanning");
            fr.epdPrintf(152, 109, COLOR_BLACK, rotation::ROTATE_0, "the NFC-wake area with your phone");
            break;
+        case STYPE_SIZE_058:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "No AP Found");
+            fr.setFont(&FreeSans9pt7b);
+            addQR(epd->Xres - 120, 42, 3, 3, "https://openepaperlink.eu/tag/0/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            fr.epdPrintf(10, 69, COLOR_BLACK, rotation::ROTATE_0, "Couldn't find an AP :(");
+            fr.epdPrintf(10, 89, COLOR_BLACK, rotation::ROTATE_0, "I'll try again in a little while, but you");
+            fr.epdPrintf(152, 109, COLOR_BLACK, rotation::ROTATE_0, "can force a retry now by scanning");
+            fr.epdPrintf(152, 129, COLOR_BLACK, rotation::ROTATE_0, "the NFC-wake area with your phone");
+            break;
+        case STYPE_SIZE_058_FREEZER:
+            fr.setFont(&FreeSansBold18pt7b);
+            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "No AP Found");
+            fr.setFont(&FreeSans9pt7b);
+            addQR(epd->Xres - 120, 42, 3, 3, "https://openepaperlink.eu/tag/0/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
+            fr.epdPrintf(10, 69, COLOR_BLACK, rotation::ROTATE_0, "Couldn't find an AP :(");
+            fr.epdPrintf(10, 89, COLOR_BLACK, rotation::ROTATE_0, "I'll try again in a little while, but you");
+            fr.epdPrintf(152, 109, COLOR_BLACK, rotation::ROTATE_0, "can force a retry now by scanning");
+            fr.epdPrintf(152, 129, COLOR_BLACK, rotation::ROTATE_0, "the NFC-wake area with your phone");
+            break;
        case STYPE_SIZE_060:
            fr.setFont(&FreeSansBold18pt7b);
            fr.epdPrintf(7, 7, COLOR_BLACK, rotation::ROTATE_0, "No AP Found          U_U");
@@ -357,7 +509,8 @@ void showNoAP() {
            addQR(epd->Xres - 66, 47, 3, 2, "https://openepaperlink.eu/tag/1/%02X/%02X%02X%02X%02X%02X%02X%02X%02X/", tag.OEPLtype, mSelfMac[7], mSelfMac[6], mSelfMac[5], mSelfMac[4], mSelfMac[3], mSelfMac[2], mSelfMac[1], mSelfMac[0]);
            fr.epdPrintf(10, 39, COLOR_BLACK, rotation::ROTATE_0, "Couldn't find an AP :(");
            fr.epdPrintf(10, 58, COLOR_BLACK, rotation::ROTATE_0, "I'll try again in a little while, but you");
-            fr.epdPrintf(10, 77, COLOR_BLACK, rotation::ROTATE_0, "can force a retry now by pressing a button");
+            fr.epdPrintf(10, 77, COLOR_BLACK, rotation::ROTATE_0, "can force a retry now by scanning");
+            fr.epdPrintf(10, 98, COLOR_BLACK, rotation::ROTATE_0, "the NFC-wake area with your phone");
            addFlashImage(200, 128, COLOR_BLACK, rotation::ROTATE_0, pandablack);
            addFlashImage(312, 274, COLOR_RED, rotation::ROTATE_0, pandared);
            break;
--- a/ARM_Tag_FW/common/drawing.cpp
+++ b/ARM_Tag_FW/common/drawing.cpp
@@ -291,17 +291,19 @@ void drawImageAtAddress(uint32_t addr, uint8_t lut) {
 void drawRoundedRectangle(uint16_t xpos, uint16_t ypos, uint16_t width, uint16_t height, bool color) {
    uint16_t widthBytes = width / 8;
    if (width % 8) widthBytes++;
-    uint32_t framebufferSize = (widthBytes + 1) * height;
+    uint32_t framebufferSize = widthBytes * height;
    uint8_t *framebuffer = (uint8_t *)calloc(framebufferSize + 4, 1);
    if (framebuffer == NULL) {
        return;
    }
-
-    ((uint16_t *)framebuffer)[0] = width + 1;
+    uint8_t frameBufferZerosize = width;
+    if((width % 8) != 0){
+        frameBufferZerosize++;
+    }
+    ((uint16_t *)framebuffer)[0] = frameBufferZerosize;
    ((uint16_t *)framebuffer)[1] = height;

    framebuffer += 4;
-
    uint16_t w = width - 1;
    uint16_t x = 1;
    while (w--) {
--- a/ESP32_AP-Flasher/data/languages.json
+++ b/ESP32_AP-Flasher/data/languages.json
@@ -61,5 +61,12 @@
    "days": [ "Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi" ],
    "months": [ "Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Aout", "Septembre", "Octobre", "Novembre", "Decembre" ],
    "date_format": [ "%d-%m-%Y", "%d-%m" ]
+  },
+    "9": {
+    "language": "sv",
+    "daysShort": [ "SÖ", "MÅ", "TI", "ON", "TO", "FR", "LÖ" ],
+    "days": [ "Söndag", "Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag" ],
+    "months": [ "Januari", "Februari", "Mars", "April", "Maj", "Juni", "Juli", "Augusti", "September", "Oktober", "November", "December" ],
+    "date_format": [ "%d-%m-%Y", "%d-%m" ]
  }
 }
--- a/ESP32_AP-Flasher/data/tagtypes/11.json
+++ b/ESP32_AP-Flasher/data/tagtypes/11.json
@@ -13,6 +13,6 @@
 	},
 	"shortlut": 0,
 	"options": ["button"],
-	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 14, 15, 16, 17, 18, 19, 20, 21],
+	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 14, 15, 16, 17, 18, 19, 20, 21, 27],
 	"usetemplate": 1		
 }
--- a/ESP32_AP-Flasher/data/www/content_cards.json.gz
+++ b/ESP32_AP-Flasher/data/www/content_cards.json.gz
--- a/ESP32_AP-Flasher/data/www/edit.html.gz
+++ b/ESP32_AP-Flasher/data/www/edit.html.gz
--- a/ESP32_AP-Flasher/data/www/flash.js.gz
+++ b/ESP32_AP-Flasher/data/www/flash.js.gz
--- 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.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/data/www/setup.js.gz
+++ b/ESP32_AP-Flasher/data/www/setup.js.gz
--- a/ESP32_AP-Flasher/src/contentmanager.cpp
+++ b/ESP32_AP-Flasher/src/contentmanager.cpp
@@ -82,7 +82,6 @@ void contentRunner() {
            if (minutesUntilNextUpdate > 1 && (wsClientCount() == 0 || config.stopsleep == 0)) {
                taginfo->pendingIdle = minutesUntilNextUpdate * 60;
                if (taginfo->isExternal == false) {
-                    Serial.printf("sleeping for %d more minutes\n", minutesUntilNextUpdate);
                    prepareIdleReq(taginfo->mac, minutesUntilNextUpdate);
                }
            }
@@ -1186,7 +1185,7 @@ bool getCalFeed(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, imgPa
        int temp = imageParams.height;
        imageParams.height = imageParams.width;
        imageParams.width = temp;
-        imageParams.rotatebuffer = 1 - imageParams.rotatebuffer;
+        imageParams.rotatebuffer = 1 - (imageParams.rotatebuffer%2);
        initSprite(spr, imageParams.width, imageParams.height, imageParams);
    } else {
        initSprite(spr, imageParams.width, imageParams.height, imageParams);
@@ -2085,7 +2084,7 @@ void rotateBuffer(uint8_t rotation, uint8_t &currentOrientation, TFT_eSprite &sp
            initSprite(spr, sprCpy.width(), sprCpy.height(), imageParams);
            sprCpy.pushToSprite(&spr, 0, 0);
            sprCpy.deleteSprite();
-            imageParams.rotatebuffer = 1 - imageParams.rotatebuffer;
+            imageParams.rotatebuffer = 1 - (imageParams.rotatebuffer%2);
        }
        currentOrientation = rotation;
    }
--- a/ESP32_AP-Flasher/src/makeimage.cpp
+++ b/ESP32_AP-Flasher/src/makeimage.cpp
@@ -88,10 +88,16 @@ uint32_t colorDistance(Color &c1, Color &c2, Error &e1) {
 void spr2color(TFT_eSprite &spr, imgParam &imageParams, uint8_t *buffer, size_t buffer_size, bool is_red) {
    uint8_t rotate = imageParams.rotate;
    long bufw = spr.width(), bufh = spr.height();
-    if (imageParams.rotatebuffer) {
+
+    if (imageParams.rotatebuffer % 2) {
+        //turn the image 90 or 270
        rotate = (rotate + 3) % 4;
+        rotate = (rotate + (imageParams.rotatebuffer - 1)) % 4;
        bufw = spr.height();
        bufh = spr.width();
+    } else {
+        // rotate 180
+        rotate = (rotate + (imageParams.rotatebuffer)) % 4;
    }

    memset(buffer, 0, buffer_size);
@@ -234,8 +240,8 @@ size_t prepareHeader(uint8_t headerbuf[], uint16_t bufw, uint16_t bufh, imgParam
    uint8_t headersize = 6;

    headerbuf[0] = headersize;
-    memcpy(headerbuf + (imageParams.rotatebuffer == 1 ? 3 : 1), &bufw, sizeof(uint16_t));
-    memcpy(headerbuf + (imageParams.rotatebuffer == 1 ? 1 : 3), &bufh, sizeof(uint16_t));
+    memcpy(headerbuf + (imageParams.rotatebuffer % 2 == 1 ? 3 : 1), &bufw, sizeof(uint16_t));
+    memcpy(headerbuf + (imageParams.rotatebuffer % 2 == 1 ? 1 : 3), &bufh, sizeof(uint16_t));

    if (imageParams.hasRed && imageParams.bpp > 1) {
        totalbytes = buffer_size * 2 + headersize;
@@ -258,7 +264,7 @@ size_t compressAndWrite(Miniz::tdefl_compressor *comp, const void *inbuf, size_t

    uint32_t t = millis();
    Miniz::tdefl_compressOEPL(comp, inbuf, &inbytes_compressed, zlibbuf, &outbytes_compressed, flush);
-    Serial.printf("zlib: compressed %d into %d bytes in %d ms\n", inbytes_compressed, outbytes_compressed, millis()-t);
+    Serial.printf("zlib: compressed %d into %d bytes in %d ms\n", inbytes_compressed, outbytes_compressed, millis() - t);

    f_out.write((const uint8_t *)zlibbuf, outbytes_compressed);
    return outbytes_compressed;
@@ -266,7 +272,7 @@ size_t compressAndWrite(Miniz::tdefl_compressor *comp, const void *inbuf, size_t

 void rewriteHeader(File &f_out) {
    // https://www.rfc-editor.org/rfc/rfc1950
-    const uint8_t cmf = 0x48; // 4096
+    const uint8_t cmf = 0x48;  // 4096
    // const uint8_t cmf = 0x58; // 8192
    uint8_t flg, flevel = 3;
    uint16_t header = cmf << 8 | (flevel << 6);
@@ -277,7 +283,6 @@ void rewriteHeader(File &f_out) {
    f_out.write(flg);
 }

-
 void spr2buffer(TFT_eSprite &spr, String &fileout, imgParam &imageParams) {
    long t = millis();

--- a/ESP32_AP-Flasher/src/newproto.cpp
+++ b/ESP32_AP-Flasher/src/newproto.cpp
@@ -74,15 +74,15 @@ void prepareCancelPending(const uint8_t dst[8]) {
 }

 void prepareIdleReq(const uint8_t* dst, uint16_t nextCheckin) {
-    if (nextCheckin > 0) {
+    if (nextCheckin > 0 && countQueueItem(dst) == 0) {
        struct pendingData pending = {0};
        memcpy(pending.targetMac, dst, 8);
        pending.availdatainfo.dataType = DATATYPE_NOUPDATE;
        pending.availdatainfo.nextCheckIn = nextCheckin;
        pending.attemptsLeft = 10 + config.maxsleep;

-        Serial.printf(">SDA %02X%02X%02X%02X%02X%02X%02X%02X NOP\n", dst[7], dst[6], dst[5], dst[4], dst[3], dst[2], dst[1], dst[0]);
-        queueDataAvail(&pending, true);
+        Serial.printf(">SDA %02X%02X%02X%02X%02X%02X%02X%02X sleeping %d minutes\n", dst[7], dst[6], dst[5], dst[4], dst[3], dst[2], dst[1], dst[0], nextCheckin);
+        sendDataAvail(&pending);
    }
 }

@@ -508,10 +508,16 @@ void processDataReq(struct espAvailDataReq* eadr, bool local, IPAddress remoteIP
    }
    char buffer[64];

+    char hexmac[17];
+    mac2hex(eadr->src, hexmac);
+
    tagRecord* taginfo = tagRecord::findByMAC(eadr->src);
    if (taginfo == nullptr) {
        if (config.lock == 1 || (config.lock == 2 && eadr->adr.wakeupReason != WAKEUP_REASON_FIRSTBOOT)) return;
-        if (eadr->adr.currentChannel > 0 && eadr->adr.currentChannel != apInfo.channel) return;
+        if (eadr->adr.currentChannel > 0 && eadr->adr.currentChannel != apInfo.channel) {
+            Serial.printf("Tag %s reports illegal channel %d\n", hexmac, eadr->adr.currentChannel);
+            return;
+        }
        taginfo = new tagRecord;
        memcpy(taginfo->mac, eadr->src, sizeof(taginfo->mac));
        taginfo->pendingCount = 0;
@@ -520,9 +526,6 @@ void processDataReq(struct espAvailDataReq* eadr, bool local, IPAddress remoteIP
    time_t now;
    time(&now);

-    char hexmac[17];
-    mac2hex(eadr->src, hexmac);
-
    if (!local) {
        if (taginfo->isExternal == false) {
            wsLog("moved AP from local to external " + String(hexmac));
--- a/ESP32_AP-Flasher/src/system.cpp
+++ b/ESP32_AP-Flasher/src/system.cpp
@@ -57,7 +57,10 @@ void logLine(const String& text) {
            contentFS->remove("/logold.txt");
            contentFS->rename("/log.txt", "/logold.txt");
            logFile = contentFS->open("/log.txt", "a");
-            if (!logFile) return;
+            if (!logFile) {
+                xSemaphoreGive(fsMutex);
+                return;
+            }
        }

        logFile.print(timeStr);
--- a/ESP32_AP-Flasher/wwwroot/content_cards.json
+++ b/ESP32_AP-Flasher/wwwroot/content_cards.json
@@ -350,6 +350,8 @@
          "AT": "Austria",
          "BE": "Belgium",
          "CZ": "Czech Republic",
+          "DK1": "Denmark DK1",
+          "DK2": "Denmark DK2",
          "EE": "Estonia",
          "FI": "Finland",
          "FR": "France",
@@ -409,7 +411,7 @@
      {
        "key": "interval",
        "name": "Interval",
-        "desc": "In case of an url, wow often (in minutes) the template is being fetched. Minimum is 3 minutes.",
+        "desc": "In case of an url, how often (in minutes) the template is being fetched. Minimum is 3 minutes.",
        "type": "int"
      }
    ]
--- a/ESP32_AP-Flasher/wwwroot/edit.html
+++ b/ESP32_AP-Flasher/wwwroot/edit.html
@@ -435,7 +435,8 @@
 								}

 								[canvas.width, canvas.height] = [tagTypes[hwtype].width, tagTypes[hwtype].height] || [0, 0];
-								if (tagTypes[hwtype].rotatebuffer) [canvas.width, canvas.height] = [canvas.height, canvas.width];
+								if (tagTypes[hwtype].rotatebuffer%2) [canvas.width, canvas.height] = [canvas.height, canvas.width];
+								if (tagTypes[hwtype].rotatebuffer>=2) canvas.style.transform='rotate(180deg)'; 
 								const ctx = canvas.getContext('2d');
 								const imageData = ctx.createImageData(canvas.width, canvas.height);
 								if (data.length == 0) canvas.style.display = 'none';
--- a/ESP32_AP-Flasher/wwwroot/flash.js
+++ b/ESP32_AP-Flasher/wwwroot/flash.js
@@ -127,7 +127,7 @@ const fetchAndPost = async (url, name, path) => {
        formData.append('path', path);
        formData.append('file', fileContent, name);

-        const uploadResponse = await fetch('/littlefs_put', {
+        const uploadResponse = await fetch('littlefs_put', {
            method: 'POST',
            body: formData
        });
@@ -146,7 +146,7 @@ const fetchAndPost = async (url, name, path) => {

 async function checkTagFW() {
    const fwfile = "/Tag_FW_Pack.bin";
-    const url = "/check_file?path=" + encodeURIComponent(fwfile);
+    const url = "check_file?path=" + encodeURIComponent(fwfile);
    const response = await fetch(url);
    if (response.ok) {
        const data = await response.json();
--- a/ESP32_AP-Flasher/wwwroot/index.html
+++ b/ESP32_AP-Flasher/wwwroot/index.html
@@ -330,6 +330,7 @@ options:
 						<option value="6">SK Slovenčina</option>
 						<option value="7">PL Polski</option>
 						<option value="8">ES Español</option>
+						<option value="9">SV Svenska</option>
 					</select>
 				</p>
 				<p title="Depending on the content, a tag can sleep for
--- a/ESP32_AP-Flasher/wwwroot/main.js
+++ b/ESP32_AP-Flasher/wwwroot/main.js
@@ -44,7 +44,7 @@ let getTagtypeBusy = false;

 const loadConfig = new Event("loadConfig");
 window.addEventListener("loadConfig", function () {
-	fetch("/get_ap_config")
+	fetch("get_ap_config")
 		.then(response => response.json())
 		.then(data => {
 			apConfig = data;
@@ -77,7 +77,7 @@ window.addEventListener("loadConfig", function () {
 window.addEventListener("load", function () {
 	window.dispatchEvent(loadConfig);
 	initTabs();
-	fetch('/content_cards.json')
+	fetch('content_cards.json')
 		.then(response => response.json())
 		.then(data => {
 			cardconfig = data;
@@ -133,7 +133,7 @@ function initTabs() {
 };

 function loadTags(pos) {
-	return fetch("/get_db?pos=" + pos)
+	return fetch("get_db?pos=" + pos)
 		.then(response => response.json())
 		.then(data => {
 			processTags(data.tags);
@@ -169,7 +169,7 @@ function formatUptime(seconds) {

 function connect() {
 	protocol = location.protocol == "https:" ? "wss://" : "ws://";
-	socket = new WebSocket(protocol + location.host + "/ws");
+	socket = new WebSocket(protocol + location.host + location.pathname + "ws");

 	socket.addEventListener("open", (event) => {
 		showMessage("websocket connected");
@@ -309,7 +309,7 @@ function processTags(tagArray) {
 						if (element.isexternal && element.contentMode == 12) {
 							loadImage(tagmac, 'http://' + tagDB[tagmac].apip + '/current/' + tagmac + '.raw?' + cachetag);
 						} else {
-							loadImage(tagmac, '/current/' + tagmac + '.raw?' + cachetag);
+							loadImage(tagmac, 'current/' + tagmac + '.raw?' + cachetag);
 						}
 					} else {
 						$('#tag' + tagmac + ' .tagimg').style.display = 'none'
@@ -497,7 +497,7 @@ $('#taglist').addEventListener("click", (event) => {
 function loadContentCard(mac) {
 	$('#cfgmac').innerHTML = mac;
 	$('#cfgmac').dataset.mac = mac;
-	fetch("/get_db?mac=" + mac)
+	fetch("get_db?mac=" + mac)
 		.then(response => response.json())
 		.then(data => {
 			const tagdata = data.tags[0];
@@ -570,7 +570,7 @@ $('#cfgsave').onclick = function () {
 	formData.append("lut", $('#cfglut').value);
 	formData.append("invert", $('#cfginvert').value);

-	fetch("/save_cfg", {
+	fetch("save_cfg", {
 		method: "POST",
 		body: formData
 	})
@@ -587,7 +587,7 @@ function sendCmd(mac, cmd) {
 	let formData = new FormData();
 	formData.append("mac", mac);
 	formData.append("cmd", cmd);
-	fetch("/tag_cmd", {
+	fetch("tag_cmd", {
 		method: "POST",
 		body: formData
 	})
@@ -655,7 +655,7 @@ $('#cfgautoupdate').onclick = async function () {
 		var fullFilename = name + "_" + version + ".bin";
 		var filepath = "/" + fullFilename;
 		var binurl = "https://raw.githubusercontent.com/" + repo + "/master/binaries/Tag/" + fullFilename;
-		var url = "/check_file?path=" + encodeURIComponent(filepath);
+		var url = "check_file?path=" + encodeURIComponent(filepath);
 		var response = await fetch(url);
 		if (response.ok) {
 			var data = await response.json();
@@ -666,7 +666,7 @@ $('#cfgautoupdate').onclick = async function () {
 					var formData2 = new FormData();
 					formData2.append('path', filepath);
 					formData2.append('file', fileContent, fullFilename);
-					var uploadResponse = await fetch('/littlefs_put', {
+					var uploadResponse = await fetch('littlefs_put', {
 						method: 'POST',
 						body: formData2
 					});
@@ -690,7 +690,7 @@ $('#cfgautoupdate').onclick = async function () {
 		else showMessage('Error: auto update failed', true);
 		formData.append("contentmode", 5);
 		formData.append("modecfgjson", JSON.stringify(obj));
-		fetch("/save_cfg", {
+		fetch("save_cfg", {
 			method: "POST",
 			body: formData
 		})
@@ -705,7 +705,7 @@ $('#rebootbutton').onclick = function (event) {
 	event.preventDefault();
 	if (!confirm('Reboot AP now?')) return;
 	socket.close();
-	fetch("/reboot", {
+	fetch("reboot", {
 		method: "POST"
 	});
 	alert('Rebooted. Webpage will reload.');
@@ -723,7 +723,7 @@ document.addEventListener("loadTab", function (event) {
 	switch (event.detail) {
 		case 'configtab':
 		case 'aptab':
-			fetch("/get_ap_config")
+			fetch("get_ap_config")
 				.then(response => response.json())
 				.then(data => {
 					if (data && 'alias' in data) {
@@ -778,7 +778,7 @@ $('#apcfgsave').onclick = function () {
 	formData.append('sleeptime1', $('#apcnight1').value);
 	formData.append('sleeptime2', $('#apcnight2').value);

-	fetch("/save_apcfg", {
+	fetch("save_apcfg", {
 		method: "POST",
 		body: formData
 	})
@@ -796,7 +796,7 @@ $('#uploadButton').onclick = function () {
 	if (file) {
 		const formData = new FormData();
 		formData.append('file', file);
-		fetch('/restore_db', {
+		fetch('restore_db', {
 			method: 'POST',
 			body: formData
 		})
@@ -834,7 +834,7 @@ $('#restoreFromLocal').onclick = function () {
 		const formData = new FormData();
 		formData.append('file', blob, 'tagResult.json');

-		fetch('/restore_db', {
+		fetch('restore_db', {
 			method: 'POST',
 			body: formData
 		})
@@ -938,7 +938,7 @@ function contentselected() {
 				case 'binfile':
 				case 'jsonfile':
 					input = document.createElement("select");
-					fetch('/edit?list=%2F&recursive=1')
+					fetch('edit?list=%2F&recursive=1')
 						.then(response => response.json())
 						.then(data => {
 							let files = data.filter(item => item.type === "file" && item.name.endsWith(".jpg"));
@@ -1133,7 +1133,8 @@ function processQueue() {
 			}

 			[canvas.width, canvas.height] = [tagTypes[hwtype].width, tagTypes[hwtype].height] || [0, 0];
-			if (tagTypes[hwtype].rotatebuffer) [canvas.width, canvas.height] = [canvas.height, canvas.width];
+			if (tagTypes[hwtype].rotatebuffer%2) [canvas.width, canvas.height] = [canvas.height, canvas.width];
+			if (tagTypes[hwtype].rotatebuffer>=2) canvas.style.transform='rotate(180deg)';
 			const ctx = canvas.getContext('2d');
 			const imageData = ctx.createImageData(canvas.width, canvas.height);
 			if (data.length == 0) {
@@ -1356,7 +1357,7 @@ async function getTagtype(hwtype) {
 	try {
 		getTagtypeBusy = true;
 		tagTypes[hwtype] = { busy: true };
-		const response = await fetch('/tagtypes/' + hwtype.toString(16).padStart(2, '0').toUpperCase() + '.json');
+		const response = await fetch('tagtypes/' + hwtype.toString(16).padStart(2, '0').toUpperCase() + '.json');
 		if (!response.ok) {
 			let data = { name: 'unknown id ' + hwtype.toString(16), width: 0, height: 0, bpp: 0, rotatebuffer: 0, colortable: [], busy: false };
 			tagTypes[hwtype] = data;
@@ -1447,7 +1448,7 @@ function dropUpload() {
 						formData.append('file', blob, 'image.jpg');

 						try {
-							const response = await fetch('/imgupload', {
+							const response = await fetch('imgupload', {
 								method: 'POST',
 								body: formData,
 							});
@@ -1477,7 +1478,7 @@ function dropUpload() {
 				const formData = new FormData();
 				formData.append('mac', mac);
 				formData.append('json', jsonContent);
-				fetch('/jsonupload', {
+				fetch('jsonupload', {
 					method: 'POST',
 					body: formData,
 				})
@@ -1609,7 +1610,7 @@ function populateAPCard(msg) {

 function populateAPInfo(apip) {
 	let apid = apip.replace(/\./g, "-");
-	fetch('http://' + apip + '/sysinfo')
+	fetch('sysinfo')
 		.then(response => {
 			if (response.status != 200) {
 				$('#ap' + apid + ' .apswversion').innerHTML = "Error fetching sysinfo: " + response.status;
--- a/ESP32_AP-Flasher/wwwroot/ota.js
+++ b/ESP32_AP-Flasher/wwwroot/ota.js
@@ -10,7 +10,7 @@ let buttonState = false;

 export async function initUpdate() {

-    const response = await fetch("/version.txt");
+    const response = await fetch("version.txt");
    let filesystemversion = await response.text();
    if (!filesystemversion) filesystemversion = "unknown";
    $('#repo').value = repo;
@@ -30,7 +30,7 @@ export async function initUpdate() {
    $('#selectRepo').style.display = 'inline-block';
    $('#repoWarning').style.display = 'none';

-    const sysinfoPromise = fetch("/sysinfo")
+    const sysinfoPromise = fetch("sysinfo")
        .then(response => {
            if (response.status != 200) {
                print("Error fetching sysinfo: " + response.status, "red");
@@ -181,7 +181,7 @@ export async function updateWebpage(fileUrl, tagname, showReload) {
                    if (updateactions) {
                        await fetchAndPost(updateactions.url, updateactions.name, updateactions.path);
                        try {
-                            const response = await fetch("/update_actions", {
+                            const response = await fetch("update_actions", {
                                method: "POST",
                                body: ''
                            });
@@ -200,7 +200,7 @@ export async function updateWebpage(fileUrl, tagname, showReload) {
                    for (const file of files) {
                        try {
                            if (file.name != "update_actions.json") {
-                                const url = "/check_file?path=" + encodeURIComponent(file.path);
+                                const url = "check_file?path=" + encodeURIComponent(file.path);
                                const response = await fetch(url);
                                if (response.ok) {
                                    const data = await response.json();
@@ -290,7 +290,7 @@ export async function updateESP(fileUrl, showConfirm) {
                console.log(`URL for "${file.name}": ${binurl}`);

                try {
-                    const response = await fetch('/update_ota', {
+                    const response = await fetch('update_ota', {
                        method: 'POST',
                        headers: {
                            'Content-Type': 'application/x-www-form-urlencoded'
@@ -342,7 +342,7 @@ $('#rollbackBtn').onclick = function () {

    print("Rolling back...");

-    fetch("/rollback", {
+    fetch("rollback", {
        method: "POST",
        body: ''
    })
@@ -365,7 +365,7 @@ $('#updateC6Btn').onclick = function () {
    const formData = new FormData();
    formData.append('download', isChecked ? '1' : '0'); // Convert to '1' or '0'

-    fetch("/update_c6", {
+    fetch("update_c6", {
        method: "POST",
        body: formData
    })
@@ -443,7 +443,7 @@ $('#confirmSelectRepo').onclick = function (event) {
    let formData = new FormData();
    formData.append("repo", repo);
    formData.append("env", $('#environment').value);
-    fetch("/save_apcfg", {
+    fetch("save_apcfg", {
        method: "POST",
        body: formData
    })
@@ -478,7 +478,7 @@ export function print(line, color = "white") {

 export function reboot() {
    print("Rebooting now... Reloading webpage in 5 seconds...", "yellow");
-    fetch("/reboot", { method: "POST" });
+    fetch("reboot", { method: "POST" });
    setTimeout(() => {
        location.reload();
    }, 5000);
@@ -520,7 +520,7 @@ const fetchAndPost = async (url, name, path) => {
        formData.append('path', path);
        formData.append('file', fileContent, name);

-        const uploadResponse = await fetch('/littlefs_put', {
+        const uploadResponse = await fetch('littlefs_put', {
            method: 'POST',
            body: formData
        });
@@ -544,7 +544,7 @@ const writeVersion = async (content, name, path) => {
        const blob = new Blob([content]);
        formData.append('file', blob, name);

-        const uploadResponse = await fetch('/littlefs_put', {
+        const uploadResponse = await fetch('littlefs_put', {
            method: 'POST',
            body: formData
        });
--- a/ESP32_AP-Flasher/wwwroot/setup.js
+++ b/ESP32_AP-Flasher/wwwroot/setup.js
@@ -1,7 +1,7 @@
 const $ = document.querySelector.bind(document);

 window.addEventListener("load", function () {
-    fetch("/get_wifi_config")
+    fetch("get_wifi_config")
        .then(response => response.json())
        .then(data => {
            $('#ssid').value = data.ssid || "";
@@ -25,7 +25,7 @@ $('#listssid').addEventListener('click', () => {
 });

 function getSsidList() {
-    fetch("/get_ssid_list")
+    fetch("get_ssid_list")
        .then(response => response.json())
        .then(data => {
            if (data.scanstatus < 0) {
@@ -64,7 +64,7 @@ $('#connect').addEventListener('click', () => {
        dns: $('#dns').value
    };

-    fetch('/save_wifi_config', {
+    fetch('save_wifi_config', {
        method: 'POST',
        headers: {
            'Content-Type': 'application/json'
--- a/oepl-definitions.h
+++ b/oepl-definitions.h
@@ -38,8 +38,11 @@
 #define SOLUM_M3_BWY_26 0x3A
 #define SOLUM_M3_BWR_29 0x33	// the 'standard' SSD1619 version
 #define SOLUM_M3_BWY_29 0x3B
+#define SOLUM_M3_BW_29 0x40
 #define SOLUM_M3_BWR_42 0x34
 #define SOLUM_M3_BWY_42 0x3C
+#define SOLUM_M3_BWR_58 0x41
+#define SOLUM_M3_BW_58 0x42
 #define SOLUM_M3_BWR_60 0x35
 #define SOLUM_M3_BWY_60 0x3D
 #define SOLUM_M3_BWR_75 0x36
@@ -47,6 +50,7 @@
 #define SOLUM_M3_BWR_116 0x37
 #define SOLUM_M3_BWY_116 0x3F

+
 // M3 Tags overflow
 #define SOLUM_M3_BW_29 0x40
 #define SOLUM_M3_BWR_58 0x41
@@ -75,9 +79,13 @@
 // Solum types - customer data byte 16 in M3 (nRF) UICR
 #define STYPE_SIZE_016 0x40
 #define STYPE_SIZE_022 0x41
+#define STYPE_SIZE_026 0x43
 #define STYPE_SIZE_029 0x42
+#define STYPE_SIZE_029_FREEZER 0x22
 #define STYPE_SIZE_042 0x46
 #define STYPE_SIZE_043 0x47
+#define STYPE_SIZE_058 0x63
+#define STYPE_SIZE_058_FREEZER 0x24
 #define STYPE_SIZE_060 0x48
 #define STYPE_SIZE_075 0x4C
 #define STYPE_SIZE_097 0x64
Author	SHA1	Message	Date
Nic Limper	ebd1adc0d5	gzipped www files	2024-02-28 01:20:37 +01:00
Nic Limper	f4cb642142	add Denmark to dayahead electricity prices; enable it also for 2.9" UC8151	2024-02-28 01:11:01 +01:00
Nic Limper	9b2d76a6b6	bugfix: idlereq should not be queued, and only sent when queue is empty	2024-02-28 01:09:00 +01:00
leXorNet	ac979a3c52	Added Swedish content language (#245 )	2024-02-27 12:11:13 +01:00
Jan-Henrik Bruhn	a606c4c1aa	Use relative paths for fetch calls and websocket (#243 ) This allows the OEPL Frontend to be put behind a reverse proxy like Home Assistant Ingress to proxy it behind a relative path.	2024-02-27 01:47:36 +01:00
Jelmer	c22fe0d91b	Merge pull request #241 from TheRealMrSteel/patch-1 Update content_cards.json	2024-02-27 00:37:42 +01:00
Jelmer	b29907a725	Merge pull request #242 from VstudioLAB/M3_58-26-29FREEZER M3 58 26 29 freezer	2024-02-27 00:36:03 +01:00
Jelmer	8da475901d	Support for rotating generated images based on tagtype profile	2024-02-27 00:32:09 +01:00
Vstudio LAB	e4ed0b13db	Delete ARM_Tag_FW/Newton_M3_nRF52811/$PROJECT_DIR directory	2024-02-26 22:55:48 +01:00
VstudioLAB	0ffd0fbf0e	Update .gitignore	2024-02-26 22:49:03 +01:00
Steel	1cba70b9cc	Update content_cards.json typo in id19	2024-02-26 22:47:50 +01:00
VstudioLAB	6b67f6df2b	updates	2024-02-26 22:24:48 +01:00
VstudioLAB	f83667bcce	Added support for the 2.6 BWR	2024-02-15 13:25:58 +01:00
VstudioLAB	bee51a23b6	5.85" Initial support and general preparation for BW only compatibility.	2024-02-15 00:09:25 +01:00
VstudioLAB	a787ac6ddf	M3 5.85" cleanning	2024-02-14 22:09:50 +01:00
VstudioLAB	5561f82bf6	Original commit (5.85" BWR only) First commit of that branch. At the moment, only the M3 5.85" is added, but not finished.	2024-02-14 21:39:36 +01:00
VstudioLAB	b07eeb31ce	initial commit	2024-02-14 00:56:38 +01:00