pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-17 18:53:30 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Satisfy cppcheck

Browse Source
This commit is contained in:
Sacha Weatherstone 2022-05-07 20:36:15 +10:00
parent 6b0ce6b729
commit 5e7b372345
No known key found for this signature in database
GPG Key ID: 7AB2D7E206124B31
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/Screen.cpp
View File

@ -1518,9 +1518,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
auto mode = "";
Config_LoRaConfig &loraConfig = config.payloadVariant.lora;
switch (loraConfig.modem_preset) {
switch (config.payloadVariant.lora.modem_preset) {
case Config_LoRaConfig_ModemPreset_ShortSlow:
mode = "ShortSlow";
break;

5
src/mesh/Channels.cpp
View File

@ -203,7 +203,6 @@ void Channels::setChannel(const Channel &c)
const char *Channels::getName(size_t chIndex)
{
Config_LoRaConfig &loraConfig = config.payloadVariant.lora;
// Convert the short "" representation for Default into a usable string
const ChannelSettings &channelSettings = getByIndex(chIndex).settings;
const char *channelName = channelSettings.name;
@ -211,10 +210,10 @@ const char *Channels::getName(size_t chIndex)
// Per mesh.proto spec, if bandwidth is specified we must ignore modemPreset enum, we assume that in that case
// the app fucked up and forgot to set channelSettings.name
if (loraConfig.bandwidth != 0)
if (config.payloadVariant.lora.bandwidth != 0)
channelName = "Unset";
else
switch (loraConfig.modem_preset) {
switch (config.payloadVariant.lora.modem_preset) {
case Config_LoRaConfig_ModemPreset_ShortSlow:
channelName = "ShortSlow";
break;