rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-04 09:02:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'meshtastic:master' into router

Browse Source
This commit is contained in:
Jm Casler
2022-03-06 14:40:11 -08:00
committed by GitHub
parent ec86246da9 ca21e8b2bf
commit c1c8fea21e
7 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/graphics/Screen.cpp
View File

@@ -1362,18 +1362,20 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
auto mode = "";
if (channels.getPrimary().modem_config == 0) {
if (channels.getPrimary().modem_config == 0) {
mode = "ShrtSlow";
} else if (channels.getPrimary().modem_config == 1) {
mode = "ShrtFast";
} else if (channels.getPrimary().modem_config == 2) {
mode = "LngFast";
} else if (channels.getPrimary().modem_config == 3) {
mode = "LngSlow";
} else if (channels.getPrimary().modem_config == 4) {
mode = "MedSlow";
} else if (channels.getPrimary().modem_config == 5) {
} else if (channels.getPrimary().modem_config == 3) {
mode = "MedFast";
} else if (channels.getPrimary().modem_config == 4) {
mode = "LngFast";
} else if (channels.getPrimary().modem_config == 5) {
mode = "LngSlow";
} else if (channels.getPrimary().modem_config == 6) {
mode = "VngSlow";
} else {
mode = "Custom";
}

2
src/mesh/PhoneAPI.h
View File

@@ -59,7 +59,7 @@ class PhoneAPI
// 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.
void close();
virtual void close();
/**
* 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)
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
for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) {