diff --git a/src/drv/touch/hasp_drv_gt911.cpp b/src/drv/touch/hasp_drv_gt911.cpp index 1d2ee59f..eebba5b1 100644 --- a/src/drv/touch/hasp_drv_gt911.cpp +++ b/src/drv/touch/hasp_drv_gt911.cpp @@ -19,11 +19,11 @@ void GT911_setXY(int8_t contacts, GTPoint * points) GT911_num_touches = contacts; GT911_points = points; - LOG_VERBOSE(TAG_GUI, F("Contacts: %d"), contacts); - for(int i = 0; i < contacts; i++) { - LOG_VERBOSE(TAG_GUI, F("C%d: #%d %d,%d s:%d"), i, points[i].trackId, points[i].x, points[i].y, points[i].area); - yield(); - } + // LOG_VERBOSE(TAG_GUI, F("Contacts: %d"), contacts); + // for(int i = 0; i < contacts; i++) { + // LOG_VERBOSE(TAG_GUI, F("C%d: #%d %d,%d s:%d"), i, points[i].trackId, points[i].x, points[i].y, points[i].area); + // yield(); + // } } // Read touch points from global variable diff --git a/src/hasp/hasp.cpp b/src/hasp/hasp.cpp index dfb09fb1..cbc06149 100644 --- a/src/hasp/hasp.cpp +++ b/src/hasp/hasp.cpp @@ -377,7 +377,7 @@ void haspSetup(void) haspFonts[1] = LV_FONT_DEFAULT; } else { // defaultFont = haspFonts[0]; - haspFonts[1] = hasp_font; // save it + haspFonts[0] = hasp_font; // save it } #endif #endif diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp index 2782dcdb..9946f969 100644 --- a/src/hasp_debug.cpp +++ b/src/hasp_debug.cpp @@ -70,7 +70,7 @@ static void debugPrintTimestamp(int level, Print* _logOutput) // strftime(buffer, sizeof(buffer), "[%H:%M:%S.", timeinfo); // Literal String #ifdef ARDUINO - _logOutput->printf(PSTR("%03lu]"), curTime.tv_usec / 1000); + _logOutput->printf(PSTR("%s.%03lu]"), buffer, curTime.tv_usec / 1000); #else debug_print(_logOutput, PSTR("%s.%03lu]"), buffer, curTime.tv_usec / 1000); #endif diff --git a/src/sys/net/hasp_network.cpp b/src/sys/net/hasp_network.cpp index 3adfced0..ae69d02e 100644 --- a/src/sys/net/hasp_network.cpp +++ b/src/sys/net/hasp_network.cpp @@ -3,8 +3,12 @@ #include #include +#ifdef USE_CONFIG_OVERRIDE +#include "user_config_override.h" +#endif +#ifndef MYTZ #define MYTZ "EST5EDT,M3.2.0/2,M11.1.0" - +#endif #include #include "ArduinoLog.h" @@ -20,6 +24,7 @@ void networkStart(void) { #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266) + LOG_WARNING(TAG_MAIN, F("TIMEZONE: %s"), MYTZ); configTzTime(MYTZ, "pool.ntp.org", "time.nist.gov", NULL); // literal string #endif diff --git a/user_setups/esp32/ttgo-esp32-lilygo-pi.ini b/user_setups/esp32/ttgo-esp32-lilygo-pi.ini index 396c61a7..d6bffca3 100644 --- a/user_setups/esp32/ttgo-esp32-lilygo-pi.ini +++ b/user_setups/esp32/ttgo-esp32-lilygo-pi.ini @@ -35,7 +35,7 @@ build_flags = -D TFT_RST=-1 ; RST -D TFT_BCKL=12 ; None, configurable via web UI (e.g. 21) -D TOUCH_DRIVER=911 ; GT911 Capacitive I2C touch panel driver - -D TOUCH_IRQ=39 + -D TOUCH_IRQ=34 -D TOUCH_RST=-1 -D TOUCH_SDA=21 -D TOUCH_SCL=22