Merge branch 'master' into 2296-rak11300-target

meshtastic · Mar 6, 2023 · eb9a927 · eb9a927
2 parents bb32796 + 5044169
commit eb9a927
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/boards/tlora-t3s3-v1.json b/boards/tlora-t3s3-v1.json
@@ -9,7 +9,8 @@
       "-DARDUINO_USB_CDC_ON_BOOT=1",
       "-DARDUINO_USB_MODE=0",
       "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_EVENT_RUNNING_CORE=1",
+      "-DBOARD_HAS_PSRAM"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
@@ -281,7 +281,7 @@ void printPacket(const char *prefix, const meshtastic_MeshPacket *p)
     if (p->priority != 0)
         out += DEBUG_PORT.mt_sprintf(" priority=%d", p->priority);
 
-    out + ")\n";
+    out += ")\n";
     LOG_DEBUG("%s", out.c_str());
 }
 

diff --git a/src/mqtt/MQTT.h b/src/mqtt/MQTT.h
@@ -30,12 +30,14 @@ class MQTT : private concurrency::OSThread
 #if HAS_ETHERNET
     EthernetClient mqttClient;
 #endif
+#if !defined(DEBUG_HEAP_MQTT)
     PubSubClient pubSub;
 
-    // instead we supress sleep from our runOnce() callback
-    // CallbackObserver<MQTT, void *> preflightSleepObserver = CallbackObserver<MQTT, void *>(this, &MQTT::preflightSleepCb);
-
   public:
+#else
+  public:
+    PubSubClient pubSub;
+#endif
     MQTT();
 
     /**