diff --git a/docs/hardware/DS_SX1261-2_V1.2.pdf b/docs/hardware/DS_SX1261-2_V1.2.pdf new file mode 100644 index 000000000..2d6c51cb5 Binary files /dev/null and b/docs/hardware/DS_SX1261-2_V1.2.pdf differ diff --git a/docs/hardware/T-SX1262.pdf b/docs/hardware/T-SX1262.pdf new file mode 100644 index 000000000..0e9fbfc11 Binary files /dev/null and b/docs/hardware/T-SX1262.pdf differ diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index ca0995c65..281737560 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -819,14 +819,16 @@ int Screen::handleStatusUpdate(const meshtastic::Status *arg) // DEBUG_MSG("Screen got status update %d\n", arg->getStatusType()); switch (arg->getStatusType()) { case STATUS_TYPE_NODE: - if (nodeDB.updateTextMessage || nodeStatus->getLastNumTotal() != nodeStatus->getNumTotal()) - setFrames(); - prevFrame = -1; + if (nodeDB.updateTextMessage || nodeStatus->getLastNumTotal() != nodeStatus->getNumTotal()) { + setFrames(); // Regen the list of screens + prevFrame = -1; // Force a GUI update + setPeriod(1); // Update the screen right away + } nodeDB.updateGUI = false; nodeDB.updateTextMessage = false; break; } - setPeriod(1); // Update the screen right away + return 0; } } // namespace graphics diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp index 26be9de3f..45a9fed75 100644 --- a/src/mesh/RadioInterface.cpp +++ b/src/mesh/RadioInterface.cpp @@ -68,6 +68,9 @@ void printPacket(const char *prefix, const MeshPacket *p) if (p->rx_time != 0) { DEBUG_MSG(" rxtime=%u", p->rx_time); } + if (p->rx_snr != 0.0) { + DEBUG_MSG(" rxSNR=%g", p->rx_snr); + } DEBUG_MSG(")\n"); } @@ -115,8 +118,6 @@ unsigned long hash(char *str) return hash; } - - #define POWER_DEFAULT 17 /** diff --git a/src/mesh/SX1262Interface.cpp b/src/mesh/SX1262Interface.cpp index 6350741e4..b7fe422f3 100644 --- a/src/mesh/SX1262Interface.cpp +++ b/src/mesh/SX1262Interface.cpp @@ -74,6 +74,10 @@ bool SX1262Interface::reconfigure() err = lora.setCodingRate(cr); assert(err == ERR_NONE); + // Hmm - seems to lower SNR when the signal levels are high. Leaving off for now... + //err = lora.setRxGain(true); + //assert(err == ERR_NONE); + err = lora.setSyncWord(syncWord); assert(err == ERR_NONE); @@ -123,6 +127,7 @@ void SX1262Interface::setStandby() */ void SX1262Interface::addReceiveMetadata(MeshPacket *mp) { + // DEBUG_MSG("PacketStatus %x\n", lora.getPacketStatus()); mp->rx_snr = lora.getSNR(); }