Merge branch 'master' into shared-secret-cache

arch/portduino/portduino.ini

@@ -47,4 +47,5 @@ build_flags =
   -lyaml-cpp
   -li2c
   -luv
+  -std=gnu17
   -std=c++17

bin/device-install.bat

@@ -17,8 +17,8 @@ SET "LOGCOUNTER=0"
 SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
 SET "C3=esp32c3"
 @REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
-SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core t-watch-s3 tracksenger"
-SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite"
+SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger"
+SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite t-watch-s3"
 
 GOTO getopts
 :help

bin/device-install.sh

@@ -22,7 +22,6 @@ BIGDB_8MB=(
 	"icarus"
 	"seeed-xiao-s3"
 	"tbeam-s3-core"
-	"t-watch-s3"
 	"tracksenger"
 )
 BIGDB_16MB=(
@@ -34,6 +33,7 @@ BIGDB_16MB=(
 	"m5stack-cores3"
 	"station-g2"
 	"t-eth-elite"
+	"t-watch-s3"
 )
 S3_VARIANTS=(
 	"s3"

boards/t-watch-s3.json

@@ -24,16 +24,16 @@
     "mcu": "esp32s3",
     "variant": "t-watch-s3"
   },
-  "connectivity": ["wifi", "bluetooth"],
+  "connectivity": ["wifi", "bluetooth", "lora"],
   "debug": {
     "openocd_target": "esp32s3.cfg"
   },
   "frameworks": ["arduino"],
   "name": "LilyGo T-Watch 2020 V3",
   "upload": {
-    "flash_size": "8MB",
+    "flash_size": "16MB",
     "maximum_ram_size": 327680,
-    "maximum_size": 8388608,
+    "maximum_size": 16777216,
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true,

platformio.ini

@@ -107,7 +107,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/9345b03d47d3e2be91125325842b8bced0daaf86.zip
+	https://github.com/meshtastic/device-ui/archive/acf343b73cedbdcd5838ba1407c054974a0b6914.zip
 
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)

variants/ec_catsniffer/platformio.ini

@@ -0,0 +1,15 @@
+[env:catsniffer]
+extends = rp2040_base
+board = rpipico
+upload_protocol = picotool
+
+build_flags = ${rp2040_base.build_flags} 
+  -DRPI_PICO
+  -Ivariants/ec_catsniffer
+  -DDEBUG_RP2040_PORT=Serial
+  # -DHW_SPI1_DEVICE
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
+lib_deps =
+  ${rp2040_base.lib_deps}
+debug_build_flags = ${rp2040_base.build_flags}, -g
+debug_tool = cmsis-dap

variants/ec_catsniffer/variant.cpp

@@ -0,0 +1,39 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+#define CTF1 8
+#define CTF2 9
+#define CTF3 10
+
+void initVariant()
+{
+    // Config the LoRa Switch
+    pinMode(CTF1, OUTPUT);
+    pinMode(CTF2, OUTPUT);
+    pinMode(CTF3, OUTPUT);
+
+    digitalWrite(CTF1, HIGH);
+    digitalWrite(CTF2, LOW);
+    digitalWrite(CTF3, LOW);
+}

variants/ec_catsniffer/variant.h

@@ -0,0 +1,41 @@
+// #define RADIOLIB_CUSTOM_ARDUINO 1
+// #define RADIOLIB_TONE_UNSUPPORTED 1
+// #define RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED 1
+
+#define ARDUINO_ARCH_AVR
+
+#define HAS_SCREEN 0
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+#define LED_PIN 27
+
+#define USE_SX1262
+
+#undef LORA_SCK
+#undef LORA_MISO
+#undef LORA_MOSI
+#undef LORA_CS
+
+#define LORA_SCK 18
+#define LORA_MISO 16
+#define LORA_MOSI 19
+#define LORA_CS 17 // NSS
+
+#define LORA_DIO0 5
+#define LORA_RESET 24
+#define LORA_DIO1 4
+#define LORA_DIO2 23
+#define LORA_DIO3 25
+#define SX126X_RXEN 21
+#define SX126X_TXEN 20
+
+#ifdef USE_SX1262
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO0
+#define SX126X_BUSY LORA_DIO1
+#define SX126X_RESET LORA_RESET
+// #define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 0
+#endif

variants/t-watch-s3/platformio.ini

@@ -3,7 +3,7 @@
 extends = esp32s3_base
 board = t-watch-s3
 board_check = true
-board_build.partitions = default_8MB.csv
+board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32_base.build_flags}