Merge c11e1809db into 72dd5bd88d

src/input/TouchScreenCST226SE.h

@@ -13,10 +13,7 @@ class TouchScreenCST226SE : public TouchScreenBase
 {
   public:
     TouchScreenCST226SE(uint16_t width, uint16_t height);
-    // TouchScreenCST226SE(uint16_t width, uint16_t height, bool (*getTouch)(int16_t *, int16_t *));
     void init(void);
-
-    // bool (*_getTouch)(int16_t *, int16_t *);
     virtual bool getTouch(int16_t &x, int16_t &y);
     virtual void onEvent(const TouchEvent &event);
 
@@ -24,7 +21,6 @@ class TouchScreenCST226SE : public TouchScreenBase
     static TouchScreenCST226SE *instance;
     TouchDrvCSTXXX touch;
     uint8_t i2cAddress = 0;
-
     static constexpr uint8_t PossibleAddresses[2] = {CST226SE_ADDR, CST226SE_ADDR_ALT};
 };
 

variants/tbeam/variant.h

@@ -53,7 +53,9 @@
 
 #define HAS_CST226SE 1
 #define HAS_TOUCHSCREEN 1
-// #define TOUCH_IRQ 35
+// #define TOUCH_IRQ 35 // broken in this version of the lib 0.3.1
+#define CANNED_MESSAGE_MODULE_ENABLE 1
+#define USE_VIRTUAL_KEYBOARD 1
 
 #define ST7796_NSS 25
 #define ST7796_RS 13  // DC