From a3aea102cb21c29e4441ac3b8f3e1363c46c54b7 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Tue, 1 Jun 2021 00:20:53 +0200 Subject: [PATCH] Move touchdriver to old --- src/drv/{ => old}/hasp_drv_touch.cpp | 2 +- src/drv/{ => old}/hasp_drv_touch.h | 0 src/hasp_gui.cpp | 4 ++-- src/main_arduino.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/drv/{ => old}/hasp_drv_touch.cpp (99%) rename src/drv/{ => old}/hasp_drv_touch.h (100%) diff --git a/src/drv/hasp_drv_touch.cpp b/src/drv/old/hasp_drv_touch.cpp similarity index 99% rename from src/drv/hasp_drv_touch.cpp rename to src/drv/old/hasp_drv_touch.cpp index c3283ba1..6d159601 100644 --- a/src/drv/hasp_drv_touch.cpp +++ b/src/drv/old/hasp_drv_touch.cpp @@ -31,7 +31,7 @@ //#include "ft6x36.h" #endif -#include "../hasp/hasp.h" // for hasp_sleep_state +#include "../../hasp/hasp.h" // for hasp_sleep_state extern uint8_t hasp_sleep_state; static uint8_t drv_touch_rotation; diff --git a/src/drv/hasp_drv_touch.h b/src/drv/old/hasp_drv_touch.h similarity index 100% rename from src/drv/hasp_drv_touch.h rename to src/drv/old/hasp_drv_touch.h diff --git a/src/hasp_gui.cpp b/src/hasp_gui.cpp index 95132eba..7ea9e513 100644 --- a/src/hasp_gui.cpp +++ b/src/hasp_gui.cpp @@ -15,7 +15,7 @@ #include "drv/touch/touch_driver.h" //#include "drv/hasp_drv_display.h" -// #include "drv/hasp_drv_touch.h" +// #include "drv/old/hasp_drv_touch.h" // #include "drv/old/hasp_drv_tft_espi.h" #include "hasp_debug.h" @@ -209,7 +209,7 @@ void guiSetup() disp_drv.hor_res = tft_width; disp_drv.ver_res = tft_height; - lv_disp_rot_t rotation[] = {LV_DISP_ROT_NONE, LV_DISP_ROT_270, LV_DISP_ROT_180, LV_DISP_ROT_90}; + lv_disp_rot_t rotation[] = {LV_DISP_ROT_NONE, LV_DISP_ROT_90, LV_DISP_ROT_180, LV_DISP_ROT_270}; lv_disp_t* display = lv_disp_drv_register(&disp_drv); lv_disp_set_rotation(display, rotation[(4 + gui_settings.rotation - TFT_ROTATION) % 4]); diff --git a/src/main_arduino.cpp b/src/main_arduino.cpp index b334e5ec..b8639b3b 100644 --- a/src/main_arduino.cpp +++ b/src/main_arduino.cpp @@ -7,7 +7,7 @@ #include "hasp_oobe.h" #include "sys/net/hasp_network.h" #include "dev/device.h" -// #include "drv/hasp_drv_touch.h" +// #include "drv/old/hasp_drv_touch.h" #include "ArduinoLog.h" #if HASP_USE_CONFIG > 0