pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 09:42:35 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix MQTT on ETH

Browse Source
This commit is contained in:
Thomas Göttgens 2022-11-04 19:44:45 +01:00
parent a5d1165c54
commit 4ccb4393c5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cpp
View File

@ -37,7 +37,7 @@
#include "nimble/NimbleBluetooth.h" #include "nimble/NimbleBluetooth.h"
#endif #endif
#if HAS_WIFI || defined(ARCH_PORTDUINO) #if HAS_WIFI
#include "mesh/wifi/WiFiServerAPI.h" #include "mesh/wifi/WiFiServerAPI.h"
#include "mqtt/MQTT.h" #include "mqtt/MQTT.h"
#endif #endif

6
src/mesh/Router.cpp
View File

@ -11,7 +11,7 @@ extern "C" {
#include "mesh/compression/unishox2.h" #include "mesh/compression/unishox2.h"
} }
#if HAS_WIFI #if HAS_WIFI || HAS_ETHERNET
#include "mqtt/MQTT.h" #include "mqtt/MQTT.h"
#endif #endif
@ -209,7 +209,7 @@ ErrorCode Router::send(MeshPacket *p)
if (p->which_payload_variant == MeshPacket_decoded_tag) { if (p->which_payload_variant == MeshPacket_decoded_tag) {
ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it
#if HAS_WIFI #if HAS_WIFI || HAS_ETHERNET
// check if we should send decrypted packets to mqtt // check if we should send decrypted packets to mqtt
// truth table: // truth table:
@ -240,7 +240,7 @@ ErrorCode Router::send(MeshPacket *p)
return encodeResult; // FIXME - this isn't a valid ErrorCode return encodeResult; // FIXME - this isn't a valid ErrorCode
} }
#if HAS_WIFI #if HAS_WIFI || HAS_ETHERNET
// the packet is now encrypted. // the packet is now encrypted.
// check if we should send encrypted packets to mqtt // check if we should send encrypted packets to mqtt
if (mqtt && shouldActuallyEncrypt) if (mqtt && shouldActuallyEncrypt)