Merge branch 'master' into master

variants/diy/platformio.ini

@@ -7,7 +7,6 @@ build_flags =
   ${esp32_base.build_flags}
   -D DIY_V1
   -D EBYTE_E22
-  -D OLED_RU
   -I variants/diy/v1
 
 ; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
@@ -19,7 +18,6 @@ build_flags =
   ${esp32_base.build_flags}
   -D DIY_V1
   -D EBYTE_E22
-  -D OLED_RU
   -I variants/diy/v1_1
 
 ; Port to Disaster Radio's ESP32-v3 Dev Board
@@ -52,7 +50,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
   -I variants/diy/nrf52_promicro_diy_xtal
   -D NRF52_PROMICRO_DIY
-  -D OLED_RU
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_xtal>
 lib_deps = 
@@ -68,7 +65,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
   -I variants/diy/nrf52_promicro_diy_tcxo
   -D NRF52_PROMICRO_DIY
-  -D OLED_RU
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_tcxo>
 lib_deps = 

variants/radiomaster_900_bandit/variant.h

@@ -11,12 +11,17 @@
 
 /*
   I2C SDA and SCL.
-  0x18 - STK8XXX Accelerometer, Not supported yet.
+  0x18 - STK8XXX Accelerometer
   0x3C - SH1115 Display Driver
 */
 #define I2C_SDA 14
 #define I2C_SCL 12
 
+/*
+  I2C STK8XXX Accelerometer Interrupt PIN to ESP32 Pin 6 - SENSOR_CAPP (GPIO37)
+*/
+#define STK8XXX_INT 37
+
 /*
   No GPS - but free pins are available.
 */

variants/rak11200/variant.h

@@ -70,6 +70,7 @@ static const uint8_t SCK = 33;
 #define LORA_CS SS
 
 #define USE_SX1262
+#define SX126X_ANT_SW WB_IO2
 #define SX126X_CS SS // NSS for SX126X
 #define SX126X_DIO1 LORA_DIO1
 #define SX126X_BUSY LORA_DIO2

variants/seeed-sensecap-indicator/pins_arduino.h

@@ -0,0 +1,56 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+// static const uint8_t LED_BUILTIN = -1;
+
+// static const uint8_t TX = 43;
+// static const uint8_t RX = 44;
+
+static const uint8_t SDA = 39;
+static const uint8_t SCL = 40;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = -1;
+static const uint8_t MOSI = 48;
+static const uint8_t MISO = 47;
+static const uint8_t SCK = 41;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+static const uint8_t A18 = 19;
+static const uint8_t A19 = 20;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+#endif /* Pins_Arduino_h */

variants/seeed-sensecap-indicator/platformio.ini

@@ -0,0 +1,28 @@
+; Seeed Studio SenseCAP Indicator
+[env:seeed-sensecap-indicator]
+extends = esp32s3_base
+platform_packages =
+    platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32.git#add_tca9535 ; based on 2.0.16
+
+board = seeed-sensecap-indicator
+board_check = true
+upload_protocol = esptool
+
+build_flags = ${esp32_base.build_flags}
+  -Ivariants/seeed-sensecap-indicator
+  -DSENSECAP_INDICATOR
+  -DCONFIG_ARDUHAL_LOG_COLORS
+  -DRADIOLIB_DEBUG_SPI=0
+  -DRADIOLIB_DEBUG_PROTOCOL=0
+  -DRADIOLIB_DEBUG_BASIC=0
+  -DRADIOLIB_VERBOSE_ASSERT=0
+  -DRADIOLIB_SPI_PARANOID=0
+  -DIO_EXPANDER=0x40
+  -DIO_EXPANDER_IRQ=42
+  ;-DIO_EXPANDER_DEBUG
+  -DUSE_ARDUINO_HAL_GPIO
+
+lib_deps = ${esp32s3_base.lib_deps}
+  https://github.com/mverch67/LovyanGFX#develop
+  earlephilhower/ESP8266Audio@^1.9.7
+  earlephilhower/ESP8266SAM@^1.0.1

variants/seeed-sensecap-indicator/variant.h

@@ -0,0 +1,64 @@
+#define I2C_SDA 39
+#define I2C_SCL 40
+
+#define BUTTON_PIN 38
+// #define BUTTON_NEED_PULLUP
+
+// #define BATTERY_PIN 27 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+// #define ADC_CHANNEL ADC1_GPIO27_CHANNEL
+// #define ADC_MULTIPLIER 2
+
+// ST7701 TFT LCD
+#define ST7701_CS (4 | IO_EXPANDER)
+#define ST7701_RS -1  // DC
+#define ST7701_SDA 48 // MOSI
+#define ST7701_SCK 41
+#define ST7701_RESET (5 | IO_EXPANDER)
+#define ST7701_MISO 47
+#define ST7701_BUSY -1
+#define ST7701_BL 45
+#define ST7701_SPI_HOST SPI2_HOST
+#define ST7701_BACKLIGHT_EN 45
+#define SPI_FREQUENCY 20000000
+#define SPI_READ_FREQUENCY 16000000
+#define TFT_HEIGHT 480
+#define TFT_WIDTH 480
+#define TFT_OFFSET_X 0
+#define TFT_OFFSET_Y 0
+#define TFT_OFFSET_ROTATION 0
+#define TFT_BL 45
+#define SCREEN_ROTATE
+#define SCREEN_TRANSITION_FRAMERATE 5 // fps
+
+#define HAS_TOUCHSCREEN 1
+#define SCREEN_TOUCH_INT (6 | IO_EXPANDER)
+#define SCREEN_TOUCH_RST (7 | IO_EXPANDER)
+#define TOUCH_I2C_PORT 0
+#define TOUCH_SLAVE_ADDRESS 0x48
+
+// Buzzer
+#define PIN_BUZZER 19
+
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+#define USE_SX1262
+#define USE_SX1268
+
+#define LORA_SCK 41
+#define LORA_MISO 47
+#define LORA_MOSI 48
+#define LORA_CS (0 | IO_EXPANDER)
+
+#define LORA_DIO0 -1 // a no connect on the SX1262 module
+#define LORA_RESET (1 | IO_EXPANDER)
+#define LORA_DIO1 (3 | IO_EXPANDER) // SX1262 IRQ
+#define LORA_DIO2 (2 | IO_EXPANDER) // SX1262 BUSY
+#define LORA_DIO3
+
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_DIO2_AS_RF_SWITCH