Merge branch 'master' into t-watch-fixes

variants/heltec_v3/variant.h

@@ -4,6 +4,10 @@
 #define I2C_SDA SDA_OLED // I2C pins for this board
 #define I2C_SCL SCL_OLED
 
+// Enable secondary bus for external periherals
+#define I2C_SDA1 SDA
+#define I2C_SCL1 SCL
+
 #define VEXT_ENABLE Vext // active low, powers the oled display and the lora antenna boost
 #define BUTTON_PIN 0
 

variants/heltec_wireless_paper/variant.h

@@ -1,5 +1,9 @@
 #define LED_PIN 18
 
+// Enable bus for external periherals
+#define I2C_SDA SDA
+#define I2C_SCL SCL
+
 #define USE_EINK
 /*
  * eink display pins

variants/heltec_wsl_v3/variant.h

@@ -1,5 +1,5 @@
-#define I2C_SCL 47
-#define I2C_SDA 48
+#define I2C_SCL SCL
+#define I2C_SDA SDA
 
 #define LED_PIN LED
 

variants/picomputer-s3/pins_arduino.h

@@ -0,0 +1,30 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS 48
+#define NUM_ANALOG_INPUTS 20
+
+#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
+#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
+#define digitalPinHasPWM(p) (p < 46)
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+// The default Wire will be mapped to PMU and RTC
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 9;
+
+// Default SPI
+static const uint8_t MISO = 39;
+static const uint8_t SCK = 21;
+static const uint8_t MOSI = 38;
+static const uint8_t SS = 40;
+
+#endif /* Pins_Arduino_h */

variants/picomputer-s3/platformio.ini

@@ -0,0 +1,17 @@
+[env:picomputer-s3]
+extends = esp32s3_base
+board = bpi_picow_esp32_s3
+board_level = extra
+;OpenOCD flash method
+;upload_protocol = esp-builtin
+;Normal method
+upload_protocol = esptool
+
+build_flags = 
+  ${esp32s3_base.build_flags}
+  -DPICOMPUTER_S3
+  -I variants/picomputer-s3
+
+lib_deps = 
+  ${esp32s3_base.lib_deps}
+  lovyan03/LovyanGFX@^1.1.8

variants/picomputer-s3/variant.h

@@ -0,0 +1,54 @@
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+#define BUTTON_PIN 0
+
+#define PIN_BUZZER 43
+
+#define HAS_GPS 0
+#define HAS_WIRE 0
+
+#define USE_RF95 // RFM95/SX127x
+
+#define RF95_SCK SCK   // 21
+#define RF95_MISO MISO // 39
+#define RF95_MOSI MOSI // 38
+#define RF95_NSS SS    // 40
+#define LORA_RESET RADIOLIB_NC
+
+// per SX1276_Receive_Interrupt/utilities.h
+#define LORA_DIO0 10
+#define LORA_DIO1 RADIOLIB_NC
+#define LORA_DIO2 RADIOLIB_NC
+
+// Default SPI1 will be mapped to the display
+#define ST7789_SDA 4
+#define ST7789_SCK 3
+#define ST7789_CS 6
+#define ST7789_RS 1
+#define ST7789_BL 5
+
+#define ST7789_RESET -1
+#define ST7789_MISO -1
+#define ST7789_BUSY -1
+#define ST7789_SPI_HOST SPI3_HOST
+#define ST7789_BACKLIGHT_EN 5
+#define SPI_FREQUENCY 40000000
+#define SPI_READ_FREQUENCY 16000000
+#define TFT_HEIGHT 320
+#define TFT_WIDTH 240
+#define TFT_OFFSET_X 0
+#define TFT_OFFSET_Y 0
+#define SCREEN_ROTATE
+#define SCREEN_TRANSITION_FRAMERATE 5
+
+#define INPUTBROKER_MATRIX_TYPE 1
+
+#define KEYS_COLS                                                                                                                \
+    {                                                                                                                            \
+        44, 47, 17, 15, 13, 41                                                                                                   \
+    }
+#define KEYS_ROWS                                                                                                                \
+    {                                                                                                                            \
+        12, 16, 42, 18, 14, 7                                                                                                    \
+    }