pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-08 21:51:46 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #1266 from mkinney/bug_fixes

Browse Source 
remove assert; revert a change that cpplint reported as a warning
This commit is contained in:
mkinney 2022-03-01 16:11:34 -08:00 committed by GitHub
commit 9a87e1b53e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesh/PhoneAPI.h
View File

@ -58,7 +58,7 @@ class PhoneAPI
// Call this when the client drops the connection, resets the state to STATE_SEND_NOTHING // Call this when the client drops the connection, resets the state to STATE_SEND_NOTHING
// Unregisters our observer. A closed connection **can** be reopened by calling init again. // Unregisters our observer. A closed connection **can** be reopened by calling init again.
void close(); virtual void close();
/** /**
* Handle a ToRadio protobuf * Handle a ToRadio protobuf

2
src/mesh/Router.cpp
View File

@ -276,7 +276,7 @@ bool perhapsDecode(MeshPacket *p)
if (p->which_payloadVariant == MeshPacket_decoded_tag) if (p->which_payloadVariant == MeshPacket_decoded_tag)
return true; // If packet was already decoded just return return true; // If packet was already decoded just return
assert(p->which_payloadVariant == MeshPacket_encrypted_tag); //assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
// Try to find a channel that works with this hash // Try to find a channel that works with this hash
for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) { for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) {

4
suppressions.txt
View File

@ -36,3 +36,7 @@ cstyleCast
// ignore stuff that is not ours // ignore stuff that is not ours
*:.pio/* *:.pio/*
*:*/libdeps/* *:*/libdeps/*
// these two caused issues
missingOverride
virtualCallInConstructor