Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-15 11:38:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

further imp and tests

Browse source
This commit is contained in:
SGE 2023-12-15 13:28:19 +01:00
parent a83aa991ec
commit b012f935eb
2 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
esphome/components/icnt86/icnt86.cpp
View file

@ -6,9 +6,6 @@ namespace icnt86 {
static const char *const TAG = "icnt86"; static const char *const TAG = "icnt86";
uint8_t old_X = 0;
uint8_t old_Y = 0;
#define UBYTE uint8_t #define UBYTE uint8_t
#define UWORD uint16_t #define UWORD uint16_t
#define UDOUBLE uint32_t #define UDOUBLE uint32_t
@ -44,8 +41,8 @@ void ICNT86Touchscreen::setup() {
void ICNT86Touchscreen::loop() { void ICNT86Touchscreen::loop() {
if (!this->store_.touch) { if (!this->store_.touch) {
for (auto *listener : this->touch_listeners_) for (auto *listener : this->touch_listeners_)
listener->release(); listener->release();
return; return;
} }
ESP_LOGD(TAG, "touch"); ESP_LOGD(TAG, "touch");
@ -61,20 +58,10 @@ void ICNT86Touchscreen::loop() {
uint8_t touch_count = buf[0]; uint8_t touch_count = buf[0];
ESP_LOGD(TAG, "Touch count: %d", touch_count); ESP_LOGD(TAG, "Touch count: %d", touch_count);
if (buf[0] == 0x00) { // No new touch if (buf[0] == 0x00 || (touch_count > 5 || touch_count < 1)) { // No new touch
this->ICNT_Write_(0x1001, mask, 1); this->reset_touch_sensor_();
delay(1);
for (auto *listener : this->touch_listeners_)
listener->release();
return; return;
} else { } else {
if (touch_count > 5 || touch_count < 1) {
this->ICNT_Write_(0x1001, mask, 1);
touch_count = 0;
for (auto *listener : this->touch_listeners_)
listener->release();
return;
}
this->ICNT_Read_(0x1002, buf, touch_count * 7); this->ICNT_Read_(0x1002, buf, touch_count * 7);
this->ICNT_Write_(0x1001, mask, 1); this->ICNT_Write_(0x1001, mask, 1);
@ -84,34 +71,30 @@ void ICNT86Touchscreen::loop() {
UWORD P = buf[5 + 7 * i]; UWORD P = buf[5 + 7 * i];
UWORD TouchEvenid = buf[6 + 7 * i]; UWORD TouchEvenid = buf[6 + 7 * i];
if (old_X == X || old_Y == Y) {
continue;
}
TouchPoint tp; TouchPoint tp;
switch (this->rotation_) { switch (this->rotation_) {
case ROTATE_0_DEGREES: case ROTATE_0_DEGREES:
// Origin is top right, so mirror X by default // Origin is top right, so mirror X by default
tp.x = this->display_width_ - X; tp.x = Y;
tp.y = Y; tp.y = X;
break; break;
case ROTATE_90_DEGREES: case ROTATE_90_DEGREES:
tp.x = X; tp.x = X;
tp.y = Y; tp.y = Y;
break; break;
case ROTATE_180_DEGREES: case ROTATE_180_DEGREES:
tp.x = Y; tp.x = this->display_width_ - Y;
tp.y = this->display_height_ - Y; tp.y = this->display_height_ - X;
break; break;
case ROTATE_270_DEGREES: case ROTATE_270_DEGREES:
tp.x = this->display_height_ - Y; tp.x = this->display_height_ - X;
tp.y = this->display_width_ - X; tp.y = this->display_width_ - Y;
break; break;
} }
tp.id = TouchEvenid; tp.id = TouchEvenid;
tp.state = P; tp.state = P;
ESP_LOGD(TAG, "Touch x: %d, y: %d, p: %d", X, Y, P); ESP_LOGD(TAG, "Touch x: %d, y: %d, p: %d", tp.x, tp.y, P);
this->defer([this, tp]() { this->send_touch_(tp); }); this->defer([this, tp]() { this->send_touch_(tp); });
} }
@ -142,6 +125,14 @@ void ICNT86Touchscreen::dump_config() {
LOG_PIN(" Reset Pin: ", this->reset_pin_); LOG_PIN(" Reset Pin: ", this->reset_pin_);
} }
void ICNT86Touchscreen::reset_touch_sensor_() {
this->ICNT_Write_(0x1001, mask, 1);
touch_count = 0;
for (auto *listener : this->touch_listeners_)
listener->release();
return;
}
void ICNT86Touchscreen::ICNT_Read_(UWORD Reg, char *Data, UBYTE len) { this->I2C_Read_Byte_(Reg, Data, len); } void ICNT86Touchscreen::ICNT_Read_(UWORD Reg, char *Data, UBYTE len) { this->I2C_Read_Byte_(Reg, Data, len); }
void ICNT86Touchscreen::ICNT_Write_(UWORD Reg, char *Data, UBYTE len) { this->I2C_Write_Byte_(Reg, Data, len); } void ICNT86Touchscreen::ICNT_Write_(UWORD Reg, char *Data, UBYTE len) { this->I2C_Write_Byte_(Reg, Data, len); }

4
esphome/components/icnt86/icnt86.h
View file

@ -17,7 +17,6 @@ using namespace touchscreen;
struct ICNT86TouchscreenStore { struct ICNT86TouchscreenStore {
volatile bool touch; volatile bool touch;
ISRInternalGPIOPin pin; ISRInternalGPIOPin pin;
static void gpio_intr(ICNT86TouchscreenStore *store); static void gpio_intr(ICNT86TouchscreenStore *store);
}; };
@ -38,11 +37,14 @@ class ICNT86Touchscreen : public Touchscreen, public Component, public i2c::I2CD
void ICNT_Write_(UWORD Reg, char *Data, UBYTE len); void ICNT_Write_(UWORD Reg, char *Data, UBYTE len);
void I2C_Read_Byte_(UWORD Reg, char *Data, UBYTE len); void I2C_Read_Byte_(UWORD Reg, char *Data, UBYTE len);
void ICNT_ReadVersion_(); void ICNT_ReadVersion_();
void reset_touch_sensor_();
ICNT86TouchscreenStore store_; ICNT86TouchscreenStore store_;
InternalGPIOPin *interrupt_pin_; InternalGPIOPin *interrupt_pin_;
GPIOPin *reset_pin_{nullptr}; GPIOPin *reset_pin_{nullptr};
}; };
} // namespace icnt86 } // namespace icnt86