From a3fa04db62fe2bac764f967e1dbf4b9595936765 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Thu, 27 May 2021 15:33:29 +0200 Subject: [PATCH] Move tft driver to drv/tft --- src/drv/{ => tft}/tft_driver.h | 0 src/drv/{ => tft}/tft_driver_sdl2.cpp | 2 +- src/drv/{ => tft}/tft_driver_sdl2.h | 0 src/drv/{ => tft}/tft_driver_tftespi.cpp | 0 src/drv/{ => tft}/tft_driver_tftespi.h | 0 src/hasp/hasp_dispatch.cpp | 5 ++++- 6 files changed, 5 insertions(+), 2 deletions(-) rename src/drv/{ => tft}/tft_driver.h (100%) rename src/drv/{ => tft}/tft_driver_sdl2.cpp (98%) rename src/drv/{ => tft}/tft_driver_sdl2.h (100%) rename src/drv/{ => tft}/tft_driver_tftespi.cpp (100%) rename src/drv/{ => tft}/tft_driver_tftespi.h (100%) diff --git a/src/drv/tft_driver.h b/src/drv/tft/tft_driver.h similarity index 100% rename from src/drv/tft_driver.h rename to src/drv/tft/tft_driver.h diff --git a/src/drv/tft_driver_sdl2.cpp b/src/drv/tft/tft_driver_sdl2.cpp similarity index 98% rename from src/drv/tft_driver_sdl2.cpp rename to src/drv/tft/tft_driver_sdl2.cpp index 7023ca7c..ac849c54 100644 --- a/src/drv/tft_driver_sdl2.cpp +++ b/src/drv/tft/tft_driver_sdl2.cpp @@ -9,7 +9,7 @@ #include "display/monitor.h" #include "indev/mouse.h" -#include "drv/tft_driver.h" +#include "drv/tft/tft_driver.h" #include "tft_driver_sdl2.h" #include "dev/device.h" diff --git a/src/drv/tft_driver_sdl2.h b/src/drv/tft/tft_driver_sdl2.h similarity index 100% rename from src/drv/tft_driver_sdl2.h rename to src/drv/tft/tft_driver_sdl2.h diff --git a/src/drv/tft_driver_tftespi.cpp b/src/drv/tft/tft_driver_tftespi.cpp similarity index 100% rename from src/drv/tft_driver_tftespi.cpp rename to src/drv/tft/tft_driver_tftespi.cpp diff --git a/src/drv/tft_driver_tftespi.h b/src/drv/tft/tft_driver_tftespi.h similarity index 100% rename from src/drv/tft_driver_tftespi.h rename to src/drv/tft/tft_driver_tftespi.h diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp index 85bb0db6..363f29a9 100644 --- a/src/hasp/hasp_dispatch.cpp +++ b/src/hasp/hasp_dispatch.cpp @@ -5,7 +5,7 @@ #include "hasplib.h" #include "dev/device.h" -#include "drv/tft_driver.h" +#include "drv/tft/tft_driver.h" //#include "hasp_gui.h" @@ -824,6 +824,9 @@ void dispatch_reboot(bool saveConfig) #if HASP_USE_MQTT > 0 && defined(ARDUINO) mqttStop(); // Stop the MQTT Client first #endif +#if HASP_USE_TELNET > 0 + telnetStop(); +#endif #if HASP_USE_CONFIG > 0 debugStop(); #endif