Merge branch 'master' into apollo

variants/senselora_rp2040/pins_arduino.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#define PIN_A0 (26u)
+#define PIN_A1 (27u)
+#define PIN_A2 (28u)
+#define PIN_A3 (29u)
+
+static const uint8_t A0 = PIN_A0;
+static const uint8_t A1 = PIN_A1;
+static const uint8_t A2 = PIN_A2;
+static const uint8_t A3 = PIN_A3;
+
+// LEDs
+#define PIN_LED (23u)
+#define PIN_LED1 PIN_LED
+#define LED_BUILTIN PIN_LED
+
+#define ADC_RESOLUTION 12
+
+// Serial
+#define PIN_SERIAL1_TX (0ul)
+#define PIN_SERIAL1_RX (1ul)
+
+#define PIN_SERIAL2_TX (4ul)
+#define PIN_SERIAL2_RX (5ul)
+
+// SPI
+#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 (6u)
+#define PIN_WIRE0_SCL (7u)
+
+#define PIN_WIRE1_SDA (-1)
+#define PIN_WIRE1_SCL (-1)
+
+#define SERIAL_HOWMANY (3u)
+#define SPI_HOWMANY (2u)
+#define WIRE_HOWMANY (1u)
+
+static const uint8_t SS = PIN_SPI0_SS;
+static const uint8_t MOSI = PIN_SPI0_MOSI;
+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;

variants/senselora_rp2040/platformio.ini

@@ -0,0 +1,13 @@
+[env:senselora_rp2040]
+extends = rp2040_base
+board = rpipico
+upload_protocol = picotool
+
+# add our variants files to the include and src paths
+build_flags = ${rp2040_base.build_flags} 
+  -DSENSELORA_RP2040
+  -Ivariants/senselora_rp2040
+  -DDEBUG_RP2040_PORT=Serial
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
+lib_deps =
+  ${rp2040_base.lib_deps}

variants/senselora_rp2040/variant.h

@@ -0,0 +1,26 @@
+#define ARDUINO_ARCH_AVR
+
+#define USE_SSD1306
+
+#define BUTTON_PIN 2
+#define BUTTON_NEED_PULLUP
+
+#define LED_PIN PIN_LED
+
+#undef BATTERY_PIN
+
+#undef LORA_SCK
+#undef LORA_MISO
+#undef LORA_MOSI
+#undef LORA_CS
+
+#define USE_RF95
+#define LORA_SCK PIN_SPI0_SCK
+#define LORA_MISO PIN_SPI0_MISO
+#define LORA_MOSI PIN_SPI0_MOSI
+#define LORA_CS PIN_SPI0_SS
+
+#define LORA_DIO0 21
+#define LORA_DIO1 22
+#define LORA_DIO2 RADIOLIB_NC
+#define LORA_RESET 20

variants/t-deck/platformio.ini

@@ -2,8 +2,8 @@
 [env:t-deck]
 extends = esp32s3_base
 board = t-deck
-upload_protocol = esp-builtin
-debug_tool = esp-builtin
+upload_protocol = esptool
+#upload_port = COM29
 
 build_flags = ${esp32_base.build_flags} 
   -DT_DECK 
@@ -12,4 +12,6 @@ build_flags = ${esp32_base.build_flags}
   -Ivariants/t-deck
 
 lib_deps = ${esp32s3_base.lib_deps}
-	lovyan03/LovyanGFX@^1.1.9
+	lovyan03/LovyanGFX@^1.1.9
+  earlephilhower/ESP8266Audio@^1.9.7
+  earlephilhower/ESP8266SAM@^1.0.1

variants/t-deck/variant.h

@@ -65,6 +65,12 @@
 #define ES7210_LRCK 21
 #define ES7210_MCLK 48
 
+// dac / amp
+#define HAS_I2S
+#define DAC_I2S_BCK 7
+#define DAC_I2S_WS 5
+#define DAC_I2S_DOUT 6
+
 // LoRa
 #define USE_SX1262
 #define USE_SX1268

variants/t-watch-s3/platformio.ini

@@ -3,6 +3,8 @@
 extends = esp32s3_base
 board = t-watch-s3
 upload_protocol = esptool
+upload_speed = 115200
+upload_port = /dev/tty.usbmodem3485188D636C1
 
 build_flags = ${esp32_base.build_flags} 
   -DT_WATCH_S3
@@ -12,4 +14,6 @@ build_flags = ${esp32_base.build_flags}
 lib_deps = ${esp32s3_base.lib_deps}
 	lovyan03/LovyanGFX@^1.1.9
   lewisxhe/PCF8563_Library@1.0.1
-  adafruit/Adafruit DRV2605 Library@^1.2.2
+  adafruit/Adafruit DRV2605 Library@^1.2.2
+  earlephilhower/ESP8266Audio@^1.9.7
+  earlephilhower/ESP8266SAM@^1.0.1

variants/t-watch-s3/variant.h

@@ -30,6 +30,11 @@
 
 #define TFT_BL ST7789_BACKLIGHT_EN
 
+#define HAS_I2S
+#define DAC_I2S_BCK 48
+#define DAC_I2S_WS 15
+#define DAC_I2S_DOUT 46
+
 #define HAS_AXP2101
 
 #define HAS_RTC 1
@@ -37,8 +42,6 @@
 #define I2C_SDA 10 // For QMC6310 sensors and screens
 #define I2C_SCL 11 // For QMC6310 sensors and screens
 
-#define BUTTON_PIN 0
-
 #define BMA4XX_INT 14 // Interrupt for BMA_423 axis sensor
 
 #define HAS_GPS 0