From b9fe72de5cf03132cc88d90ab91f5b526742e99d Mon Sep 17 00:00:00 2001
From: Nic Limper <nic@xs4all.nl>
Date: Mon, 26 Feb 2024 20:58:46 +0100
Subject: [PATCH] small bugfixes

---
 ESP32_AP-Flasher/data/tagtypes/26.json | 1 +
 ESP32_AP-Flasher/platformio.ini        | 2 --
 ESP32_AP-Flasher/src/main.cpp          | 2 ++
 ESP32_AP-Flasher/src/newproto.cpp      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ESP32_AP-Flasher/data/tagtypes/26.json b/ESP32_AP-Flasher/data/tagtypes/26.json
index 8b4210b3..db676511 100644
--- a/ESP32_AP-Flasher/data/tagtypes/26.json
+++ b/ESP32_AP-Flasher/data/tagtypes/26.json
@@ -11,6 +11,7 @@
 	},
 	"shortlut": 1,
 	"zlib_compression": "27",
+	"highlight_color": 5,
 	"options": [],
 	"contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20],
 	"template": {
diff --git a/ESP32_AP-Flasher/platformio.ini b/ESP32_AP-Flasher/platformio.ini
index fc1de726..fb95ac22 100644
--- a/ESP32_AP-Flasher/platformio.ini
+++ b/ESP32_AP-Flasher/platformio.ini
@@ -59,7 +59,6 @@ build_flags =
 	-D BOARD_HAS_PSRAM
 	-D SAVE_SPACE
 	-D POWER_NO_SOFT_POWER
-	-D SAVE_SPACE
 	-D FLASHER_AP_SS=11
 	-D FLASHER_AP_CLK=9
 	-D FLASHER_AP_MOSI=10
@@ -199,7 +198,6 @@ build_flags =
 	-D FLASHER_AP_TXD=17
 	-D FLASHER_AP_RXD=16
 	-D FLASHER_LED=22
-	-D SAVE_SPACE
 build_src_filter = 
 	+<*>-<usbflasher.cpp>-<swd.cpp>-<espflasher.cpp>-<ips_display.cpp>-<webflasher.cpp>
 ; ----------------------------------------------------------------------------------------
diff --git a/ESP32_AP-Flasher/src/main.cpp b/ESP32_AP-Flasher/src/main.cpp
index 8ea93c83..28008ae0 100644
--- a/ESP32_AP-Flasher/src/main.cpp
+++ b/ESP32_AP-Flasher/src/main.cpp
@@ -147,6 +147,8 @@ void setup() {
 #ifdef HAS_USB
     // We'll need to start the 'usbflasher' task for boards with a second (USB) port. This can be used as a 'flasher' interface, using a python script on the host
     xTaskCreate(usbFlasherTask, "usbflasher", 10000, NULL, 5, NULL);
+#else
+    pinMode(0, INPUT_PULLUP);
 #endif
 
 #ifdef HAS_EXT_FLASHER
diff --git a/ESP32_AP-Flasher/src/newproto.cpp b/ESP32_AP-Flasher/src/newproto.cpp
index 3c813ffe..5891d680 100644
--- a/ESP32_AP-Flasher/src/newproto.cpp
+++ b/ESP32_AP-Flasher/src/newproto.cpp
@@ -573,7 +573,7 @@ void processDataReq(struct espAvailDataReq* eadr, bool local, IPAddress remoteIP
         taginfo->temperature = eadr->adr.temperature;
         taginfo->batteryMv = eadr->adr.batteryMv;
         taginfo->hwType = eadr->adr.hwType;
-        if (eadr->adr.wakeupReason > 0) taginfo->wakeupReason = eadr->adr.wakeupReason;
+        taginfo->wakeupReason = eadr->adr.wakeupReason;
         taginfo->capabilities = eadr->adr.capabilities;
         taginfo->currentChannel = eadr->adr.currentChannel;
         taginfo->tagSoftwareVersion = eadr->adr.tagSoftwareVersion;