Compare commits

..

3 Commits

Author SHA1 Message Date
mkinney
f7c6955736 Update version.properties 2022-03-01 16:25:58 -08:00
mkinney
9a87e1b53e Merge pull request #1266 from mkinney/bug_fixes
remove assert; revert a change that cpplint reported as a warning
2022-03-01 16:11:34 -08:00
Mike Kinney
f1478a7c93 remove assert; revert a change that cpplint reported as a warning 2022-03-02 00:00:31 +00:00
4 changed files with 7 additions and 3 deletions

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

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++) {

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

View File

@@ -1,4 +1,4 @@
[VERSION] [VERSION]
major = 1 major = 1
minor = 2 minor = 2
build = 56 build = 57