Merge branch 'meshtastic:master' into master

Mictronics · Jan 15, 2024 · 16eaf42 · 16eaf42
2 parents 83381c7 + 8b362de
commit 16eaf42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/protobufs b/protobufs
diff --git a/src/mesh/RadioLibRF95.cpp b/src/mesh/RadioLibRF95.cpp
@@ -21,7 +21,7 @@ int16_t RadioLibRF95::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_
     LOG_DEBUG("Current limit set result %d\n", state);
 
     // configure settings not accessible by API
-    state = config();
+    // state = config();
     RADIOLIB_ASSERT(state);
 
 #ifdef RF95_TCXO
@@ -75,5 +75,6 @@ bool RadioLibRF95::isReceiving()
 
 uint8_t RadioLibRF95::readReg(uint8_t addr)
 {
+    Module *mod = this->getMod();
     return mod->SPIreadRegister(addr);
-}
+}
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.
  ------------------------------------------------------------------------------------------------------------------------------------------ */