Merge branch 'master' into pmtiles

Author: mverch67

.trunk/trunk.yaml

@@ -6,7 +6,7 @@ cli:
 plugins:
   sources:
     - id: trunk
-      ref: v1.7.1
+      ref: v1.7.2
       uri: https://github.com/trunk-io/plugins
 # Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
 runtimes:
@@ -17,15 +17,15 @@ runtimes:
 # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
 lint:
   enabled:
-    - [email protected].4
+    - [email protected].5
     - [email protected]
     - [email protected]
-    - [email protected].461
+    - [email protected].466
     - [email protected]
-    - trivy@0.64.1
+    - trivy@0.65.0
     #- [email protected]
-    - taplo@0.9.3
-    - [email protected].7
+    - taplo@0.10.0
+    - [email protected].10
     - [email protected]
     - [email protected]
     - [email protected]
@@ -34,7 +34,7 @@ lint:
     - [email protected]
     - [email protected]
     - [email protected]
-    - shellcheck@0.10.0
+    - shellcheck@0.11.0
     - [email protected]
     - git-diff-check
     - [email protected]

include/graphics/view/TFT/TFTView_320x240.h

@@ -398,6 +398,7 @@ class TFTView_320x240 : public MeshtasticView
     bool packetLogEnabled;                                // display received packets
     bool detectorRunning;                                 // meshDetector is active
     bool formatSD;                                        // offer to format SD card
+    uint16_t buttonSize;                                  // size of group/chat buttons in pixels
     uint16_t statisticTableRows;                          // number of rows in statistics table
     uint16_t packetCounter;                               // number of packets in packet log
     time_t lastrun60, lastrun10, lastrun5, lastrun1;      // timers for task loop

include/input/I2CKeyboardInputDriver.h

@@ -1,15 +1,94 @@
 #pragma once
 
 #include "input/InputDriver.h"
+#include <list>
+#include <memory>
+#include <string>
 
 class I2CKeyboardInputDriver : public InputDriver
 {
   public:
     I2CKeyboardInputDriver(void);
     virtual void init(void) override;
-    virtual void task_handler(void) override;
-    virtual ~I2CKeyboardInputDriver(void);
+    virtual void task_handler(void) override{};
+    virtual void readKeyboard(uint8_t address, lv_indev_t *indev, lv_indev_data_t *data) = 0;
+    virtual ~I2CKeyboardInputDriver(void) {}
+
+    struct KeyboardDefinition {
+        I2CKeyboardInputDriver *driver; // Pointer to the driver instance
+        std::string name;               // Name of the keyboard
+        uint8_t address;                // I2C address of the keyboard
+    };
+
+    using KeyboardList = std::list<std::unique_ptr<KeyboardDefinition>>;
+    static KeyboardList &getI2CKeyboardList(void) { return i2cKeyboardList; }
+
+  protected:
+    bool registerI2CKeyboard(I2CKeyboardInputDriver *driver, std::string name, uint8_t address);
 
   private:
     static void keyboard_read(lv_indev_t *indev, lv_indev_data_t *data);
-};
+
+    static KeyboardList i2cKeyboardList; // list of registered I2C keyboards
+};
+
+class TDeckKeyboardInputDriver : public I2CKeyboardInputDriver
+{
+  public:
+    TDeckKeyboardInputDriver(uint8_t address);
+    void readKeyboard(uint8_t address, lv_indev_t *indev, lv_indev_data_t *data) override;
+    virtual ~TDeckKeyboardInputDriver(void) {}
+};
+
+class TCA8418KeyboardInputDriver : public I2CKeyboardInputDriver
+{
+  public:
+    TCA8418KeyboardInputDriver(uint8_t address);
+    void init(void) override;
+    void readKeyboard(uint8_t address, lv_indev_t *indev, lv_indev_data_t *data) override;
+    virtual ~TCA8418KeyboardInputDriver(void) {}
+};
+
+class TLoraPagerKeyboardInputDriver : public TCA8418KeyboardInputDriver
+{
+  public:
+    TLoraPagerKeyboardInputDriver(uint8_t address);
+    void init(void) override;
+    void readKeyboard(uint8_t address, lv_indev_t *indev, lv_indev_data_t *data) override;
+    virtual ~TLoraPagerKeyboardInputDriver(void) {}
+};
+
+class TDeckProKeyboardInputDriver : public TCA8418KeyboardInputDriver
+{
+  public:
+    TDeckProKeyboardInputDriver(uint8_t address);
+    void init(void) override;
+    void readKeyboard(uint8_t address, lv_indev_t *indev, lv_indev_data_t *data) override;
+    virtual ~TDeckProKeyboardInputDriver(void) {}
+};
+
+class BBQ10KeyboardInputDriver : public I2CKeyboardInputDriver
+{
+  public:
+    BBQ10KeyboardInputDriver(uint8_t address);
+    void init(void) override;
+    void readKeyboard(uint8_t address, lv_indev_t *indev, lv_indev_data_t *data) override;
+    virtual ~BBQ10KeyboardInputDriver(void) {}
+};
+
+class CardKBInputDriver : public I2CKeyboardInputDriver
+{
+  public:
+    CardKBInputDriver(uint8_t address);
+    void readKeyboard(uint8_t address, lv_indev_t *indev, lv_indev_data_t *data) override;
+    virtual ~CardKBInputDriver(void) {}
+};
+
+class MPR121KeyboardInputDriver : public I2CKeyboardInputDriver
+{
+  public:
+    MPR121KeyboardInputDriver(uint8_t address);
+    void init(void) override;
+    void readKeyboard(uint8_t address, lv_indev_t *indev, lv_indev_data_t *data) override;
+    virtual ~MPR121KeyboardInputDriver(void) {}
+};

include/input/I2CKeyboardScanner.h

@@ -0,0 +1,17 @@
+#pragma once
+
+class I2CKeyboardInputDriver;
+
+/**
+ * @brief This class is used to scan I2C connected keyboards and creates
+ *        the corresponding input device (factory).
+ *        It is used by the T-Deck, T-Deck Pro, T-Lora Pager, and other
+ *        I2C connected keyboards.
+ */
+class I2CKeyboardScanner
+{
+  public:
+    I2CKeyboardScanner(void);
+    virtual I2CKeyboardInputDriver *scan(void);
+    virtual ~I2CKeyboardScanner(void) {}
+};