Merge branch 'master' into raspi-portduino

2023-08-17 10:06:34 +02:00
parent 00ea6ef5ad 929b8f6209
commit 762166495f
28 changed files with 327 additions and 66 deletions
@@ -43,6 +43,11 @@
 #define SCREEN_ROTATE
 #define SCREEN_TRANSITION_FRAMERATE 5

+// Picomputer gets a white on black display
+#define TFT_MESH COLOR565(0xFF, 0xFF, 0xFF)
+
+#define CANNED_MESSAGE_MODULE_ENABLE 1
+
 #define INPUTBROKER_MATRIX_TYPE 1

 #define KEYS_COLS                                                                                                                \
@@ -27,7 +27,6 @@
 #define BUTTON_PIN 0
 // #define BUTTON_NEED_PULLUP

-#define HAS_GPS 0
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN

@@ -50,6 +49,7 @@
 #define KB_POWERON 10                  // must be set to HIGH
 #define KB_SLAVE_ADDRESS TDECK_KB_ADDR // 0x55
 #define KB_BL_PIN 46                   // not used for now
+#define CANNED_MESSAGE_MODULE_ENABLE 1

 // trackball
 #define HAS_TRACKBALL 1
@@ -86,4 +86,4 @@
 #define SX126X_RESET LORA_RESET
 #define SX126X_E22 // Not really an E22 but TTGO seems to be trying to clone that
 // Internally the TTGO module hooks the SX1262-DIO2 in to control the TX/RX switch (which is the default for the sx1262interface
-// code)
+// code)