jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 13:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.4.0-dev' of http://github.com/fvanroie/hasp-lvgl into 0.4.0-dev

Browse Source
This commit is contained in:
fvanroie 2021-03-17 13:34:47 +01:00
commit 94e7c290a0
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drv/touch/hasp_drv_gt911.cpp
View File

@ -19,11 +19,11 @@ void GT911_setXY(int8_t contacts, GTPoint * points)
GT911_num_touches = contacts; GT911_num_touches = contacts;
GT911_points = points; GT911_points = points;
LOG_VERBOSE(TAG_GUI, F("Contacts: %d"), contacts); // LOG_VERBOSE(TAG_GUI, F("Contacts: %d"), contacts);
for(int i = 0; i < contacts; i++) { // 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); // 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(); // yield();
} // }
} }
// Read touch points from global variable // Read touch points from global variable

2
src/hasp/hasp.cpp
View File

@ -377,7 +377,7 @@ void haspSetup(void)
haspFonts[1] = LV_FONT_DEFAULT; haspFonts[1] = LV_FONT_DEFAULT;
} else { } else {
// defaultFont = haspFonts[0]; // defaultFont = haspFonts[0];
haspFonts[1] = hasp_font; // save it haspFonts[0] = hasp_font; // save it
} }
#endif #endif
#endif #endif

2
src/hasp_debug.cpp
View File

@ -70,7 +70,7 @@ static void debugPrintTimestamp(int level, Print* _logOutput)
// strftime(buffer, sizeof(buffer), "[%H:%M:%S.", timeinfo); // Literal String // strftime(buffer, sizeof(buffer), "[%H:%M:%S.", timeinfo); // Literal String
#ifdef ARDUINO #ifdef ARDUINO
_logOutput->printf(PSTR("%03lu]"), curTime.tv_usec / 1000); _logOutput->printf(PSTR("%s.%03lu]"), buffer, curTime.tv_usec / 1000);
#else #else
debug_print(_logOutput, PSTR("%s.%03lu]"), buffer, curTime.tv_usec / 1000); debug_print(_logOutput, PSTR("%s.%03lu]"), buffer, curTime.tv_usec / 1000);
#endif #endif

7
src/sys/net/hasp_network.cpp
View File

@ -3,8 +3,12 @@
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
#ifdef USE_CONFIG_OVERRIDE
#include "user_config_override.h"
#endif
#ifndef MYTZ
#define MYTZ "EST5EDT,M3.2.0/2,M11.1.0" #define MYTZ "EST5EDT,M3.2.0/2,M11.1.0"
#endif
#include <Arduino.h> #include <Arduino.h>
#include "ArduinoLog.h" #include "ArduinoLog.h"
@ -20,6 +24,7 @@
void networkStart(void) void networkStart(void)
{ {
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266) #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 configTzTime(MYTZ, "pool.ntp.org", "time.nist.gov", NULL); // literal string
#endif #endif

2
user_setups/esp32/ttgo-esp32-lilygo-pi.ini
View File

@ -35,7 +35,7 @@ build_flags =
-D TFT_RST=-1 ; RST -D TFT_RST=-1 ; RST
-D TFT_BCKL=12 ; None, configurable via web UI (e.g. 21) -D TFT_BCKL=12 ; None, configurable via web UI (e.g. 21)
-D TOUCH_DRIVER=911 ; GT911 Capacitive I2C touch panel driver -D TOUCH_DRIVER=911 ; GT911 Capacitive I2C touch panel driver
-D TOUCH_IRQ=39 -D TOUCH_IRQ=34
-D TOUCH_RST=-1 -D TOUCH_RST=-1
-D TOUCH_SDA=21 -D TOUCH_SDA=21
-D TOUCH_SCL=22 -D TOUCH_SCL=22