Merge branch 'master' into store-and-forward

variants/mesh-tab/platformio.ini

@@ -178,7 +178,7 @@ build_flags = ${mesh_tab_base.build_flags}
   -D LGFX_TOUCH_Y_MIN=0
   -D LGFX_TOUCH_Y_MAX=479
   -D LGFX_TOUCH_ROTATION=0
-  -D LGFX_TOUCH_I2C_FREQ=1000000
+  -D LGFX_TOUCH_I2C_FREQ=400000
 
 ; 3.5" IPS TFT ILI9488 / FT6236: https://vi.aliexpress.com/item/1005006893699919.html
 [env:mesh-tab-3-5-IPS-capacitive]
@@ -204,7 +204,7 @@ build_flags = ${mesh_tab_base.build_flags}
   -D LGFX_TOUCH_Y_MIN=0
   -D LGFX_TOUCH_Y_MAX=479
   -D LGFX_TOUCH_ROTATION=1
-  -D LGFX_TOUCH_I2C_FREQ=1000000
+  -D LGFX_TOUCH_I2C_FREQ=400000
 
 ; 4.0" IPS TFT ILI9488 / FT6236: https://vi.aliexpress.com/item/1005007082906950.html
 [env:mesh-tab-4-0-IPS-capacitive]
@@ -230,4 +230,4 @@ build_flags = ${mesh_tab_base.build_flags}
   -D LGFX_TOUCH_Y_MIN=0
   -D LGFX_TOUCH_Y_MAX=479
   -D LGFX_TOUCH_ROTATION=1
-  -D LGFX_TOUCH_I2C_FREQ=1000000
+  -D LGFX_TOUCH_I2C_FREQ=400000

variants/rak11310/pins_arduino.h

@@ -38,15 +38,15 @@ static const uint8_t A3 = PIN_A3;
 #define PIN_SERIAL2_RX (5ul)
 
 // SPI
-#define PIN_SPI0_MISO (12u)
-#define PIN_SPI0_MOSI (11u)
-#define PIN_SPI0_SCK (10u)
-#define PIN_SPI0_SS (13u)
+#define PIN_SPI1_MISO (12u)
+#define PIN_SPI1_MOSI (11u)
+#define PIN_SPI1_SCK (10u)
+#define PIN_SPI1_SS (13u)
 
-#define PIN_SPI1_MISO (16u)
-#define PIN_SPI1_MOSI (19u)
-#define PIN_SPI1_SCK (18u)
-#define PIN_SPI1_SS (17u)
+#define PIN_SPI0_MISO (16u)
+#define PIN_SPI0_MOSI (19u)
+#define PIN_SPI0_SCK (18u)
+#define PIN_SPI0_SS (17u)
 
 // Wire
 #define PIN_WIRE0_SDA (2u)
@@ -65,4 +65,4 @@ static const uint8_t MISO = PIN_SPI0_MISO;
 static const uint8_t SCK = PIN_SPI0_SCK;
 
 static const uint8_t SDA = PIN_WIRE0_SDA;
-static const uint8_t SCL = PIN_WIRE0_SCL;
+static const uint8_t SCL = PIN_WIRE0_SCL;

variants/rak11310/platformio.ini

@@ -12,7 +12,10 @@ build_flags = ${rp2040_base.build_flags}
   -Ivariants/rak11310
   -DDEBUG_RP2040_PORT=Serial
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
+build_src_filter = ${rp2040_base.build_src_filter} +<../variants/rak11310> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps =
   ${rp2040_base.lib_deps}
+  ${networking_base.lib_deps}
+  https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
 debug_build_flags = ${rp2040_base.build_flags}, -g
-debug_tool = cmsis-dap ; for e.g. Picotool
+debug_tool = cmsis-dap ; for e.g. Picotool

variants/rak11310/variant.h

@@ -28,10 +28,10 @@
 
 // RAK BSP somehow uses SPI1 instead of SPI0
 #define HW_SPI1_DEVICE
-#define LORA_SCK PIN_SPI0_SCK
-#define LORA_MOSI PIN_SPI0_MOSI
-#define LORA_MISO PIN_SPI0_MISO
-#define LORA_CS PIN_SPI0_SS
+#define LORA_SCK (10u)
+#define LORA_MOSI (11u)
+#define LORA_MISO (12u)
+#define LORA_CS (13u)
 
 #define LORA_DIO0 RADIOLIB_NC
 #define LORA_RESET 14
@@ -49,3 +49,10 @@
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 #endif
+
+#define HAS_ETHERNET 1
+#define PIN_ETHERNET_RESET 7 // IO3
+#define PIN_ETHERNET_SS 17
+#define ETH_SPI_PORT SPI
+
+#define PIN_ETH_POWER_EN 22

variants/seeed-sensecap-indicator/platformio.ini

@@ -24,5 +24,5 @@ build_flags = ${esp32_base.build_flags}
 
 lib_deps = ${esp32s3_base.lib_deps}
   https://github.com/mverch67/LovyanGFX#develop
-  earlephilhower/ESP8266Audio@^1.9.7
-  earlephilhower/ESP8266SAM@^1.0.1
+  earlephilhower/ESP8266Audio@^1.9.9
+  earlephilhower/ESP8266SAM@^1.0.1

variants/seeed-sensecap-indicator/variant.h

@@ -1,6 +1,12 @@
 #define I2C_SDA 39
 #define I2C_SCL 40
 
+// This board has a serial coprocessor for sensor readings
+#define SENSOR_RP2040_TXD 19
+#define SENSOR_RP2040_RXD 20
+#define SENSOR_PORT_NUM 2
+#define SENSOR_BAUD_RATE 115200
+
 #define BUTTON_PIN 38
 // #define BUTTON_NEED_PULLUP
 
@@ -19,8 +25,7 @@
 #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 SPI_FREQUENCY 12000000
 #define TFT_HEIGHT 480
 #define TFT_WIDTH 480
 #define TFT_OFFSET_X 0

variants/t-deck/platformio.ini

@@ -6,7 +6,7 @@ board_check = true
 upload_protocol = esptool
 #upload_port = COM29
 
-build_flags = ${esp32_base.build_flags} 
+build_flags = ${esp32s3_base.build_flags} 
   -DT_DECK 
   -DBOARD_HAS_PSRAM
   -DMAX_THREADS=40
@@ -16,4 +16,4 @@ build_flags = ${esp32_base.build_flags}
 lib_deps = ${esp32s3_base.lib_deps}
 	lovyan03/LovyanGFX@^1.1.9
   earlephilhower/ESP8266Audio@^1.9.9
-  earlephilhower/ESP8266SAM@^1.0.1
+  earlephilhower/ESP8266SAM@^1.0.1

variants/t-deck/variant.h

@@ -27,8 +27,10 @@
 
 #define SLEEP_TIME 120
 
+#ifndef HAS_TFT
 #define BUTTON_PIN 0
 // #define BUTTON_NEED_PULLUP
+#endif
 #define GPS_DEFAULT_NOT_PRESENT 1
 #define GPS_RX_PIN 44
 #define GPS_TX_PIN 43
@@ -60,7 +62,7 @@
 #define TB_DOWN 15
 #define TB_LEFT 1
 #define TB_RIGHT 2
-#define TB_PRESS BUTTON_PIN
+#define TB_PRESS 0 // BUTTON_PIN
 
 // microphone
 #define ES7210_SCK 47
@@ -98,4 +100,4 @@
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 // Internally the TTGO module hooks the SX1262-DIO2 in to control the TX/RX switch (which is the default for the sx1262interface
-// code)
+// code)