pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-27 15:02:41 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Trunk fix

Browse Source
This commit is contained in:
HarukiToreda 2025-10-17 01:21:16 -04:00
parent c0361d2aea
commit f09ac16f19
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesh/MeshService.cpp
View File

@ -7,18 +7,18 @@
#include "../concurrency/Periodic.h" #include "../concurrency/Periodic.h"
#include "BluetoothCommon.h" // needed for updateBatteryLevel, FIXME, eventually when we pull mesh out into a lib we shouldn't be whacking bluetooth from here #include "BluetoothCommon.h" // needed for updateBatteryLevel, FIXME, eventually when we pull mesh out into a lib we shouldn't be whacking bluetooth from here
#include "MeshService.h" #include "MeshService.h"
#include "MessageStore.h"
#include "NodeDB.h" #include "NodeDB.h"
#include "PowerFSM.h" #include "PowerFSM.h"
#include "RTC.h" #include "RTC.h"
#include "TypeConversions.h" #include "TypeConversions.h"
#include "graphics/draw/MessageRenderer.h"
#include "main.h" #include "main.h"
#include "mesh-pb-constants.h" #include "mesh-pb-constants.h"
#include "meshUtils.h" #include "meshUtils.h"
#include "modules/NodeInfoModule.h" #include "modules/NodeInfoModule.h"
#include "modules/PositionModule.h" #include "modules/PositionModule.h"
#include "modules/RoutingModule.h" #include "modules/RoutingModule.h"
#include "MessageStore.h"
#include "graphics/draw/MessageRenderer.h"
#include "power.h" #include "power.h"
#include <assert.h> #include <assert.h>
#include <string> #include <string>
@ -196,9 +196,8 @@ void MeshService::handleToRadio(meshtastic_MeshPacket &p)
p.rx_time = getValidTime(RTCQualityFromNet); // Record the time the packet arrived from the phone p.rx_time = getValidTime(RTCQualityFromNet); // Record the time the packet arrived from the phone
#if HAS_SCREEN #if HAS_SCREEN
if (p.decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP && if (p.decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP && p.decoded.payload.size > 0 && p.to != NODENUM_BROADCAST &&
p.decoded.payload.size > 0 && p.to != 0) // DM only
p.to != NODENUM_BROADCAST && p.to != 0) // DM only
{ {
perhapsDecode(&p); perhapsDecode(&p);
const StoredMessage &sm = messageStore.addFromPacket(p); const StoredMessage &sm = messageStore.addFromPacket(p);