From 5867038abf196cfd99580ff7f19fcf6b886e047e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Tue, 3 Jan 2023 22:09:35 +0100 Subject: [PATCH] trybuildfix mqtt system --- src/mqtt/MQTT.cpp | 6 +++--- src/mqtt/MQTT.h | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp index f72271324..49ad586dd 100644 --- a/src/mqtt/MQTT.cpp +++ b/src/mqtt/MQTT.cpp @@ -274,9 +274,9 @@ void MQTT::onSend(const MeshPacket &mp, ChannelIndex chIndex) const char *channelId = channels.getGlobalId(chIndex); // FIXME, for now we just use the human name for the channel ServiceEnvelope env = ServiceEnvelope_init_default; - env->channel_id = (char *)channelId; - env->gateway_id = owner.id; - env->packet = (MeshPacket *)∓ + env.channel_id = (char *)channelId; + env.gateway_id = owner.id; + env.packet = (MeshPacket *)∓ // don't bother sending if not connected... if (pubSub.connected()) { diff --git a/src/mqtt/MQTT.h b/src/mqtt/MQTT.h index ddbacbcc4..9c813711a 100644 --- a/src/mqtt/MQTT.h +++ b/src/mqtt/MQTT.h @@ -13,8 +13,6 @@ #include #endif -#define MAX_MQTT_QUEUE 32 - /** * Our wrapper/singleton for sending/receiving MQTT "udp" packets. This object isolates the MQTT protocol implementation from * the two components that use it: MQTTPlugin and MQTTSimInterface. @@ -55,10 +53,6 @@ class MQTT : private concurrency::OSThread bool connected(); protected: - PointerQueue mqttQueue; - - int reconnectCount = 0; - virtual int32_t runOnce() override; private: