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

Update GT911 driver

Browse Source
This commit is contained in:
fvanroie 2021-10-13 17:55:58 +02:00
parent 0217063690
commit ac6179f87e
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/drv/touch/touch_driver_gt911.h
View File

@ -13,6 +13,7 @@
#include "ArduinoLog.h" #include "ArduinoLog.h"
#include "touch_driver.h" // base class #include "touch_driver.h" // base class
#include "touch_helper.h" // i2c scanner
#include "../../hasp/hasp.h" // for hasp_sleep_state #include "../../hasp/hasp.h" // for hasp_sleep_state
extern uint8_t hasp_sleep_state; extern uint8_t hasp_sleep_state;
@ -42,7 +43,7 @@ IRAM_ATTR bool touch_read(lv_indev_drv_t* indev_driver, lv_indev_data_t* data)
// LOG_VERBOSE(TAG_GUI, F("Contacts: %d"), GT911_num_touches); // LOG_VERBOSE(TAG_GUI, F("Contacts: %d"), GT911_num_touches);
static GTPoint points[5]; static GTPoint points[5];
if(touch.readInput((uint8_t*)&points)>0) { if(touch.readInput((uint8_t*)&points) > 0) {
if(hasp_sleep_state != HASP_SLEEP_OFF) hasp_update_sleep_state(); // update Idle if(hasp_sleep_state != HASP_SLEEP_OFF) hasp_update_sleep_state(); // update Idle
@ -51,7 +52,7 @@ IRAM_ATTR bool touch_read(lv_indev_drv_t* indev_driver, lv_indev_data_t* data)
data->state = LV_INDEV_STATE_PR; data->state = LV_INDEV_STATE_PR;
} else { } else {
data->state = LV_INDEV_STATE_REL; data->state = LV_INDEV_STATE_REL;
} }
touch.loop(); // reset IRQ touch.loop(); // reset IRQ
@ -73,30 +74,16 @@ class TouchGt911 : public BaseTouch {
void init(int w, int h) void init(int w, int h)
{ {
Wire.begin(TOUCH_SDA, TOUCH_SCL, I2C_TOUCH_FREQUENCY); Wire.begin(TOUCH_SDA, TOUCH_SCL, I2C_TOUCH_FREQUENCY);
delay(300); // delay(300); // already happens in touch.begin()
touch_scan(Wire);
touch.setHandler(GT911_setXY); touch.setHandler(GT911_setXY);
if(touch.begin(INT_PIN, RST_PIN)) { if(touch.begin(INT_PIN, RST_PIN)) {
LOG_VERBOSE(TAG_DRVR, F("Goodix GT911 reset OK")); LOG_INFO(TAG_DRVR, F("GT911 " D_SERVICE_STARTED));
} else { } else {
LOG_WARNING(TAG_DRVR, F("Goodix GT911 reset failed")); LOG_WARNING(TAG_DRVR, F("GT911 " D_SERVICE_START_FAILED));
} }
Serial.print("Check ACK on addr request on 0x");
// Serial.print(touch.i2cAddr, HEX);
// Wire.beginTransmission(touch.i2cAddr);
int error;
// = Wire.endTransmission();
if(error == 0) {
// Serial.println(": SUCCESS");
} else {
// Serial.print(": ERROR #");
// Serial.println(error);
}
LOG_INFO(TAG_DRVR, F("Goodix GT911 touch driver started"));
} }
}; };

8
src/drv/touch/touch_helper.h
View File

@ -16,7 +16,7 @@ void touch_scan(TwoWire& i2c)
byte error, address; byte error, address;
int nDevices; int nDevices;
LOG_VERBOSE(TAG_DRVR, F("Scanning...")); LOG_VERBOSE(TAG_DRVR, F("Scanning I2C..."));
nDevices = 0; nDevices = 0;
for(address = 1; address < 127; address++) { for(address = 1; address < 127; address++) {
@ -27,12 +27,12 @@ void touch_scan(TwoWire& i2c)
error = i2c.endTransmission(); error = i2c.endTransmission();
if(error == 0) { if(error == 0) {
snprintf_P(buffer, sizeof(buffer), PSTR("I2C device found at address 0x%02x"), address); snprintf_P(buffer, sizeof(buffer), PSTR(D_BULLET " Found device 0x%02x"), address);
LOG_VERBOSE(TAG_DRVR, buffer, address); LOG_VERBOSE(TAG_DRVR, buffer, address);
nDevices++; nDevices++;
} else if(error == 4) { } else if(error == 4) {
snprintf_P(buffer, sizeof(buffer), PSTR("Unknown error at address 0x%02x"), address); snprintf_P(buffer, sizeof(buffer), PSTR(D_BULLET "Unknown error at address 0x%02x"), address);
LOG_VERBOSE(TAG_DRVR, buffer, address); LOG_WARNING(TAG_DRVR, buffer, address);
} }
} }
if(nDevices == 0) if(nDevices == 0)