Merge branch 'master' into master

meshtastic · Jan 15, 2024 · 014e672 · 014e672
2 parents ef0b197 + 30e3a28
commit 014e672
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -51,6 +51,7 @@ build_flags = -Wno-missing-field-initializers
   -DRADIOLIB_EXCLUDE_NRF24
   -DRADIOLIB_EXCLUDE_RF69
   -DRADIOLIB_EXCLUDE_SX1231
+  -DRADIOLIB_EXCLUDE_SX1233
   -DRADIOLIB_EXCLUDE_SI443X
   -DRADIOLIB_EXCLUDE_RFM2X
   -DRADIOLIB_EXCLUDE_AFSK

diff --git a/protobufs b/protobufs
diff --git a/src/mesh/SX128xInterface.cpp b/src/mesh/SX128xInterface.cpp
@@ -252,7 +252,7 @@ template <typename T> void SX128xInterface<T>::startReceive()
 
     // We use the PREAMBLE_DETECTED and HEADER_VALID IRQ flag to detect whether we are actively receiving
     int err = lora.startReceive(RADIOLIB_SX128X_RX_TIMEOUT_INF, RADIOLIB_SX128X_IRQ_RX_DEFAULT |
-                                                                    RADIOLIB_SX128X_IRQ_RADIOLIB_PREAMBLE_DETECTED |
+                                                                    RADIOLIB_SX128X_IRQ_PREAMBLE_DETECTED |
                                                                     RADIOLIB_SX128X_IRQ_HEADER_VALID);
 
     assert(err == RADIOLIB_ERR_NONE);
@@ -284,7 +284,7 @@ template <typename T> bool SX128xInterface<T>::isChannelActive()
 template <typename T> bool SX128xInterface<T>::isActivelyReceiving()
 {
     uint16_t irq = lora.getIrqStatus();
-    bool detected = (irq & (RADIOLIB_SX128X_IRQ_HEADER_VALID | RADIOLIB_SX128X_IRQ_RADIOLIB_PREAMBLE_DETECTED));
+    bool detected = (irq & (RADIOLIB_SX128X_IRQ_HEADER_VALID | RADIOLIB_SX128X_IRQ_PREAMBLE_DETECTED));
 
     // Handle false detections
     if (detected) {
@@ -327,4 +327,4 @@ template <typename T> bool SX128xInterface<T>::sleep()
 #endif
 
     return true;
-}
+}
diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -119,6 +119,8 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_HELTEC_HT62 = 53,
     /* EBYTE SPI LoRa module and ESP32-S3 */
     meshtastic_HardwareModel_EBYTE_ESP32_S3 = 54,
+    /* Waveshare ESP32-S3-PICO with PICO LoRa HAT and 2.9inch e-Ink */
+    meshtastic_HardwareModel_ESP32_S3_PICO = 55,
     /* ------------------------------------------------------------------------------------------------------------------------------------------
  Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
  ------------------------------------------------------------------------------------------------------------------------------------------ */