thor/esphome-dev
1
0
Fork 0
mirror of https://github.com/Threnklyn/esphome-dev.git synced 2026-06-07 13:24:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Create base touchscreen component and refactor ektf2232 (#3083)

Browse Source 
Co-authored-by: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
This commit is contained in:
Jesse Hills
2022-01-26 16:26:46 +13:00
committed by GitHub
parent 3a62455948
commit ef832becf1
16 changed files with 224 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/ektf2232/ektf2232.h
+3 -34
View File
@@ -1,6 +1,7 @@
#pragma once
#include "esphome/components/i2c/i2c.h"
#include "esphome/components/touchscreen/touchscreen.h"
#include "esphome/core/automation.h"
#include "esphome/core/component.h"
#include "esphome/core/hal.h"
@@ -15,25 +16,9 @@ struct EKTF2232TouchscreenStore {
static void gpio_intr(EKTF2232TouchscreenStore *store);
};
struct TouchPoint {
uint16_t x;
uint16_t y;
};
using namespace touchscreen;
class TouchListener {
public:
virtual void touch(TouchPoint tp) = 0;
virtual void release();
};
enum EKTF2232Rotation : uint8_t {
ROTATE_0_DEGREES = 0,
ROTATE_90_DEGREES,
ROTATE_180_DEGREES,
ROTATE_270_DEGREES,
};
class EKTF2232Touchscreen : public Component, public i2c::I2CDevice {
class EKTF2232Touchscreen : public Touchscreen, public Component, public i2c::I2CDevice {
public:
void setup() override;
void loop() override;
@@ -42,19 +27,9 @@ class EKTF2232Touchscreen : public Component, public i2c::I2CDevice {
void set_interrupt_pin(InternalGPIOPin *pin) { this->interrupt_pin_ = pin; }
void set_rts_pin(GPIOPin *pin) { this->rts_pin_ = pin; }
void set_display_details(uint16_t width, uint16_t height, EKTF2232Rotation rotation) {
this->display_width_ = width;
this->display_height_ = height;
this->rotation_ = rotation;
}
void set_power_state(bool enable);
bool get_power_state();
Trigger<TouchPoint> *get_touch_trigger() const { return this->touch_trigger_; }
void register_listener(TouchListener *listener) { this->touch_listeners_.push_back(listener); }
protected:
void hard_reset_();
bool soft_reset_();
@@ -64,12 +39,6 @@ class EKTF2232Touchscreen : public Component, public i2c::I2CDevice {
EKTF2232TouchscreenStore store_;
uint16_t x_resolution_;
uint16_t y_resolution_;
uint16_t display_width_;
uint16_t display_height_;
EKTF2232Rotation rotation_;
Trigger<TouchPoint> *touch_trigger_ = new Trigger<TouchPoint>();
std::vector<TouchListener *> touch_listeners_;
};
} // namespace ektf2232