Merge branch 'master' into neighborinfo

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

@@ -54,8 +54,6 @@ typedef enum _meshtastic_PortNum {
     /* Audio Payloads.
  Encapsulated codec2 packets. On 2.4 GHZ Bandwidths only for now */
     meshtastic_PortNum_AUDIO_APP = 9,
-    /* Payloads for clients with a network connection proxying MQTT pub/sub to the device */
-    meshtastic_PortNum_MQTT_CLIENT_PROXY_APP = 10,
     /* Provides a 'ping' service that replies to any packet it receives.
  Also serves as a small example module. */
     meshtastic_PortNum_REPLY_APP = 32,

src/modules/PositionModule.cpp

@@ -52,11 +52,22 @@ bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
 
     nodeDB.updatePosition(getFrom(&mp), p);
 
+    // Only respond to location requests on the channel where we broadcast location.
+    if (channels.getByIndex(mp.channel).role == meshtastic_Channel_Role_PRIMARY) {
+        ignoreRequest = false;
+    } else {
+        ignoreRequest = true;
+    }
+
     return false; // Let others look at this message also if they want
 }
 
 meshtastic_MeshPacket *PositionModule::allocReply()
 {
+    if (ignoreRequest) {
+        return NULL;
+    }
+
     meshtastic_NodeInfoLite *node = service.refreshLocalMeshNode(); // should guarantee there is now a position
     assert(node->has_position);
 

src/mqtt/MQTT.cpp

@@ -164,6 +164,8 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), mqttQueue(MAX_MQTT_QUEUE)
 #endif
 {
     if (moduleConfig.mqtt.enabled) {
+        LOG_DEBUG("Initializing MQTT\n");
+
         assert(!mqtt);
         mqtt = this;
 
@@ -181,6 +183,14 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), mqttQueue(MAX_MQTT_QUEUE)
         if (!moduleConfig.mqtt.proxy_to_client_enabled)
             pubSub.setCallback(mqttCallback);
 #endif
+
+        if (moduleConfig.mqtt.proxy_to_client_enabled) {
+            LOG_INFO("MQTT configured to use client proxy...\n");
+            enabled = true;
+            runASAP = true;
+            reconnectCount = 0;
+            publishStatus();
+        }
         // preflightSleepObserver.observe(&preflightSleep);
     } else {
         disable();