From 523bdc3fcc1f7061a285f27af203af57ce16ce13 Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Fri, 13 Nov 2020 20:00:55 +0100
Subject: [PATCH] Add touch pointer

---
 src/hasp_gui.cpp                              |  2 +-
 src/hasp_http.cpp                             | 21 +++++--------------
 src/mouse_cursor_icon.c                       |  4 +++-
 .../esp8266/d1-mini-esp8266_ili9341.ini       |  1 +
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/hasp_gui.cpp b/src/hasp_gui.cpp
index 462604d6..fc4d761c 100644
--- a/src/hasp_gui.cpp
+++ b/src/hasp_gui.cpp
@@ -611,7 +611,7 @@ void guiSetup()
 #if defined(ARDUINO_ARCH_ESP32)
         LV_IMG_DECLARE(mouse_cursor_icon);              /*Declare the image file.*/
         cursor = lv_img_create(mouse_layer, NULL);      /*Create an image object for the cursor */
-        lv_img_set_src(cursor_obj, &mouse_cursor_icon); /*Set the image source*/
+        lv_img_set_src(cursor, &mouse_cursor_icon); /*Set the image source*/
 #else
         cursor = lv_obj_create(mouse_layer, NULL); // show cursor object on every page
         lv_obj_set_size(cursor, 9, 9);
diff --git a/src/hasp_http.cpp b/src/hasp_http.cpp
index 7d15742b..aaec33fe 100644
--- a/src/hasp_http.cpp
+++ b/src/hasp_http.cpp
@@ -294,23 +294,12 @@ void webHandleScreenshot()
 { // http://plate01/screenshot
     if(!httpIsAuthenticated(F("screenshot"))) return;
 
-    if(webServer.hasArg(F("a")) && webServer.arg(F("a")) == F("next")) {
-        uint8_t page = haspGetPage();
-        if(page + 1 >= HASP_NUM_PAGES) {
-            page = 0;
-        } else {
-            page++;
+    if(webServer.hasArg(F("a"))) {
+        if(webServer.arg(F("a")) == F("next")) {
+            dispatchPageNext();
+        } else if(webServer.arg(F("a")) == F("prev")) {
+            dispatchPagePrev();
         }
-        haspSetPage(page);
-    }
-    if(webServer.hasArg(F("a")) && webServer.arg(F("a")) == F("prev")) {
-        uint8_t page = haspGetPage();
-        if(page == 0) {
-            page = HASP_NUM_PAGES - 1;
-        } else {
-            page--;
-        }
-        haspSetPage(page);
     }
 
     if(webServer.hasArg(F("q"))) {
diff --git a/src/mouse_cursor_icon.c b/src/mouse_cursor_icon.c
index 0502c44c..14c089a4 100644
--- a/src/mouse_cursor_icon.c
+++ b/src/mouse_cursor_icon.c
@@ -1,5 +1,7 @@
+#include "Arduino.h"
 #include "lvgl.h"
-#if defined(ARDUINO_ARCH_ESP32)
+
+#if 1
 const uint8_t mouse_cursor_icon_map[] = {
 #if LV_COLOR_DEPTH == 1 || LV_COLOR_DEPTH == 8
     /*Pixel format: Alpha 8 bit, Red: 3 bit, Green: 3 bit, Blue: 2 bit*/
diff --git a/user_setups/esp8266/d1-mini-esp8266_ili9341.ini b/user_setups/esp8266/d1-mini-esp8266_ili9341.ini
index 1adc999a..cb381b01 100644
--- a/user_setups/esp8266/d1-mini-esp8266_ili9341.ini
+++ b/user_setups/esp8266/d1-mini-esp8266_ili9341.ini
@@ -10,6 +10,7 @@ platform = espressif8266@^2.6.2
 board = d1_mini
 ;upload_port = COM7      ; To change the port, use platform_override.ini
 ;monitor_port = COM7     ; To change the port, use platform_override.ini
+monitor_filters = esp8266_exception_decoder
 board_build.f_flash = 40000000L
 board_build.flash_mode = dout
 board_build.ldscript = eagle.flash.4m2m.ld  ; 2Mb Spiffs