Merge branch 'master' into raspi-portduino

src/platform/esp32/CallbackCharacteristic.h

@@ -3,7 +3,7 @@
 #include "PowerFSM.h" // FIXME - someday I want to make this OTA thing a separate lb at at that point it can't touch this
 
 /**
- * A characterstic with a set of overridable callbacks
+ * A characteristic with a set of overridable callbacks
  */
 class CallbackCharacteristic : public BLECharacteristic, public BLECharacteristicCallbacks
 {

src/platform/esp32/architecture.h

@@ -46,6 +46,10 @@
 #if defined(HAS_AXP192) || defined(HAS_AXP2101)
 #define HAS_PMU
 #endif
+
+#ifdef PIN_BUTTON_TOUCH
+#define BUTTON_PIN_TOUCH PIN_BUTTON_TOUCH
+#endif
 //
 // set HW_VENDOR
 //
@@ -81,6 +85,10 @@
 #define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P6
 #elif defined(TLORA_V2_1_18)
 #define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P8
+#elif defined(T_DECK)
+#define HW_VENDOR meshtastic_HardwareModel_T_DECK
+#elif defined(T_WATCH_S3)
+#define HW_VENDOR meshtastic_HardwareModel_T_WATCH_S3
 #elif defined(GENIEBLOCKS)
 #define HW_VENDOR meshtastic_HardwareModel_GENIEBLOCKS
 #elif defined(PRIVATE_HW)
@@ -97,6 +105,10 @@
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_V3
 #elif defined(HELTEC_WSL_V3)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WSL_V3
+#elif defined(HELTEC_WIRELESS_TRACKER)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER
+#elif defined(HELTEC_WIRELESS_PAPER)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER
 #elif defined(TLORA_T3S3_V1)
 #define HW_VENDOR meshtastic_HardwareModel_TLORA_T3_S3
 #elif defined(BETAFPV_2400_TX)

src/platform/esp32/main-esp32.cpp

@@ -99,7 +99,7 @@ void esp32Setup()
 
     LOG_DEBUG("Setup Preferences in Flash Storage\n");
 
-    // Create object to store our persistant data
+    // Create object to store our persistent data
     Preferences preferences;
     preferences.begin("meshtastic", false);
 

src/platform/nrf52/JLINK_MONITOR_ISR_SES.S

@@ -136,7 +136,7 @@ Purpose : Implementation of debug monitor for J-Link monitor mode
 *    This handler is also responsible for handling commands that are sent by the debugger.
 *
 *  Notes 
-*    This is actually the ISR for the debug inerrupt (exception no. 12)
+*    This is actually the ISR for the debug interrupt (exception no. 12)
 */ 
         .thumb_func
 

src/platform/nrf52/NRF52Bluetooth.cpp

@@ -17,7 +17,7 @@ static BLEBas blebas; // BAS (Battery Service) helper class instance
 static BLEDfu bledfu; // DFU software update helper service
 
 // This scratch buffer is used for various bluetooth reads/writes - but it is safe because only one bt operation can be in
-// proccess at once
+// process at once
 // static uint8_t trBytes[_max(_max(_max(_max(ToRadio_size, RadioConfig_size), User_size), MyNodeInfo_size), FromRadio_size)];
 static uint8_t fromRadioBytes[meshtastic_FromRadio_size];
 static uint8_t toRadioBytes[meshtastic_ToRadio_size];

src/platform/nrf52/architecture.h

@@ -66,6 +66,14 @@
 
 #endif
 
+#ifdef _SEEED_XIAO_NRF52840_SENSE_H_
+
+// This board uses 0 to be mean LED on
+#undef LED_INVERTED
+#define LED_INVERTED 1
+
+#endif
+
 #ifndef TTGO_T_ECHO
 #define GPS_UBLOX
 #endif

src/platform/nrf52/main-nrf52.cpp

@@ -170,8 +170,11 @@ void cpuDeepSleep(uint32_t msecToWake)
     Serial1.end();
 #endif
     setBluetoothEnable(false);
+
 #ifdef RAK4630
+#ifdef PIN_3V3_EN
     digitalWrite(PIN_3V3_EN, LOW);
+#endif
 #ifndef USE_EINK
     // RAK-12039 set pin for Air quality sensor
     digitalWrite(AQ_SET_PIN, LOW);

src/platform/portduino/SimRadio.cpp

@@ -92,7 +92,7 @@ void SimRadio::completeSending()
     }
 }
 
-/** Could we send right now (i.e. either not actively receving or transmitting)? */
+/** Could we send right now (i.e. either not actively receiving or transmitting)? */
 bool SimRadio::canSendImmediately()
 {
     // We wait _if_ we are partially though receiving a packet (rather than just merely waiting for one).

src/platform/rp2040/architecture.h

@@ -2,9 +2,18 @@
 
 #define ARCH_RP2040
 
+#ifndef HAS_BUTTON
+#define HAS_BUTTON 1
+#endif
 #ifndef HAS_TELEMETRY
 #define HAS_TELEMETRY 1
 #endif
+#ifndef HAS_SCREEN
+#define HAS_SCREEN 1
+#endif
+#ifndef HAS_WIRE
+#define HAS_WIRE 1
+#endif
 #ifndef HAS_SENSOR
 #define HAS_SENSOR 1
 #endif

src/platform/stm32wl/InternalFileSystem.cpp

@@ -49,7 +49,7 @@ static int _internal_flash_read(const struct lfs_config *c, lfs_block_t block, l
 }
 
 // Program a region in a block. The block must have previously
-// been erased. Negative error codes are propogated to the user.
+// been erased. Negative error codes are propagated to the user.
 // May return LFS_ERR_CORRUPT if the block should be considered bad.
 static int _internal_flash_prog(const struct lfs_config *c, lfs_block_t block, lfs_off_t off, const void *buffer, lfs_size_t size)
 {
@@ -67,7 +67,7 @@ static int _internal_flash_prog(const struct lfs_config *c, lfs_block_t block, l
 
 // Erase a block. A block must be erased before being programmed.
 // The state of an erased block is undefined. Negative error codes
-// are propogated to the user.
+// are propagated to the user.
 // May return LFS_ERR_CORRUPT if the block should be considered bad.
 static int _internal_flash_erase(const struct lfs_config *c, lfs_block_t block)
 {
@@ -84,7 +84,7 @@ static int _internal_flash_erase(const struct lfs_config *c, lfs_block_t block)
 }
 
 // Sync the state of the underlying block device. Negative error codes
-// are propogated to the user.
+// are propagated to the user.
 static int _internal_flash_sync(const struct lfs_config *c)
 {
     // we don't use a ram cache, this is a noop