Merge branch 'master' into big-brain-baud-bash

src/input/ScanAndSelect.cpp

@@ -59,7 +59,7 @@ int32_t ScanAndSelectInput::runOnce()
     // If: "no messages added" alert screen currently shown
     if (alertingNoMessage) {
         // Dismiss the alert screen several seconds after it appears
-        if (now > alertingSinceMs + durationAlertMs) {
+        if (!Throttle::isWithinTimespanMs(alertingSinceMs, durationAlertMs)) {
             alertingNoMessage = false;
             screen->endAlert();
         }
@@ -74,9 +74,9 @@ int32_t ScanAndSelectInput::runOnce()
 
         // Existing press
         else {
-            // Duration enough for long press
+            // Longer than shortpress window
             // Long press not yet fired (prevent repeat firing while held)
-            if (!longPressFired && Throttle::isWithinTimespanMs(downSinceMs, durationLongMs)) {
+            if (!longPressFired && !Throttle::isWithinTimespanMs(downSinceMs, durationLongMs)) {
                 longPressFired = true;
                 longPress();
             }
@@ -91,7 +91,9 @@ int32_t ScanAndSelectInput::runOnce()
         // Button newly released
         // Long press event didn't already fire
         if (held && !longPressFired) {
-            // Duration enough for short press
+            // Duration within shortpress window
+            // - longer than durationShortPress (debounce)
+            // - shorter than durationLongPress
             if (!Throttle::isWithinTimespanMs(downSinceMs, durationShortMs)) {
                 shortPress();
             }

src/mesh/RadioLibInterface.cpp

@@ -11,6 +11,10 @@
 #include <pb_decode.h>
 #include <pb_encode.h>
 
+#if ARCH_PORTDUINO
+#include "PortduinoGlue.h"
+#include "meshUtils.h"
+#endif
 void LockingArduinoHal::spiBeginTransaction()
 {
     spiLock->lock();
@@ -393,6 +397,11 @@ void RadioLibInterface::handleReceiveInterrupt()
 #endif
 
     int state = iface->readData((uint8_t *)&radioBuffer, length);
+#if ARCH_PORTDUINO
+    if (settingsMap[logoutputlevel] == level_trace) {
+        printBytes("Raw incoming packet: ", (uint8_t *)&radioBuffer, length);
+    }
+#endif
     if (state != RADIOLIB_ERR_NONE) {
         LOG_ERROR("ignoring received packet due to error=%d", state);
         rxBad++;

src/mesh/generated/meshtastic/mesh.pb.h

@@ -408,7 +408,7 @@ typedef enum _meshtastic_LogRecord_Level {
 } meshtastic_LogRecord_Level;
 
 /* Struct definitions */
-/* a gps position */
+/* A GPS Position */
 typedef struct _meshtastic_Position {
     /* The new preferred location encoding, multiply by 1e-7 to get degrees
  in floating point */

src/mesh/mesh-pb-constants.cpp

@@ -3,7 +3,6 @@
 #include "FSCommon.h"
 #include "mesh-pb-constants.h"
 #include <Arduino.h>
-#include <assert.h>
 #include <pb_decode.h>
 #include <pb_encode.h>
 
@@ -14,8 +13,6 @@ size_t pb_encode_to_bytes(uint8_t *destbuf, size_t destbufsize, const pb_msgdesc
     pb_ostream_t stream = pb_ostream_from_buffer(destbuf, destbufsize);
     if (!pb_encode(&stream, fields, src_struct)) {
         LOG_ERROR("Panic: can't encode protobuf reason='%s'", PB_GET_ERROR(&stream));
-        assert(
-            0); // If this assert fails it probably means you made a field too large for the max limits specified in mesh.options
         return 0;
     } else {
         return stream.bytes_written;
@@ -71,4 +68,4 @@ bool is_in_helper(uint32_t n, const uint32_t *array, pb_size_t count)
             return true;
 
     return false;
-}
+}

src/meshUtils.cpp

@@ -61,15 +61,13 @@ char *strnstr(const char *s, const char *find, size_t slen)
 void printBytes(const char *label, const uint8_t *p, size_t numbytes)
 {
     int labelSize = strlen(label);
-    if (labelSize < 100 && numbytes < 64) {
-        char *messageBuffer = new char[labelSize + (numbytes * 3) + 2];
-        strncpy(messageBuffer, label, labelSize);
-        for (size_t i = 0; i < numbytes; i++)
-            snprintf(messageBuffer + labelSize + i * 3, 4, " %02x", p[i]);
-        strcpy(messageBuffer + labelSize + numbytes * 3, "\n");
-        LOG_DEBUG(messageBuffer);
-        delete[] messageBuffer;
-    }
+    char *messageBuffer = new char[labelSize + (numbytes * 3) + 2];
+    strncpy(messageBuffer, label, labelSize);
+    for (size_t i = 0; i < numbytes; i++)
+        snprintf(messageBuffer + labelSize + i * 3, 4, " %02x", p[i]);
+    strcpy(messageBuffer + labelSize + numbytes * 3, "\n");
+    LOG_DEBUG(messageBuffer);
+    delete[] messageBuffer;
 }
 
 bool memfll(const uint8_t *mem, uint8_t find, size_t numbytes)