rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-07 18:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ESPIDF-Rollup

Browse Source
This commit is contained in:
Thomas Göttgens
2022-09-19 09:33:50 +02:00
committed by GitHub
parent e0d3ac01b0 033f45d4da
commit 1f96d5d957
8 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesh/Channels.cpp
View File

@@ -215,25 +215,25 @@ const char *Channels::getName(size_t chIndex)
else
switch (config.lora.modem_preset) {
case Config_LoRaConfig_ModemPreset_SHORT_SLOW:
channelName = "ShortS";
channelName = "ShortSlow";
break;
case Config_LoRaConfig_ModemPreset_SHORT_FAST:
channelName = "ShortF";
channelName = "ShortFast";
break;
case Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
channelName = "MedS";
channelName = "MediumSlow";
break;
case Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
channelName = "MedF";
channelName = "MediumFast";
break;
case Config_LoRaConfig_ModemPreset_LONG_SLOW:
channelName = "LongS";
channelName = "LongSlow";
break;
case Config_LoRaConfig_ModemPreset_LONG_FAST:
channelName = "LongF";
channelName = "LongFast";
break;
case Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
channelName = "VeryL";
channelName = "VLongSlow";
break;
default:
channelName = "Invalid";

2
src/mesh/NodeDB.h
View File

@@ -13,7 +13,7 @@ DeviceState versions used to be defined in the .proto file but really only this
#define here.
*/
#define DEVICESTATE_CUR_VER 17
#define DEVICESTATE_CUR_VER 18
#define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER
extern DeviceState devicestate;

8
src/mesh/RadioLibInterface.cpp
View File

@@ -125,13 +125,13 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
if (config.lora.region != Config_LoRaConfig_RegionCode_UNSET) {
if (disabled || !config.lora.tx_enabled) {
DEBUG_MSG("send - lora_tx_disabled\n");
DEBUG_MSG("send - !config.lora.tx_enabled\n");
packetPool.release(p);
return ERRNO_DISABLED;
}
} else {
DEBUG_MSG("send - lora_tx_disabled because RegionCode_Unset\n");
DEBUG_MSG("send - lora tx disable because RegionCode_Unset\n");
packetPool.release(p);
return ERRNO_DISABLED;
}
@@ -140,8 +140,8 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
#else
if (disabled || config.lora.tx_disabled) {
DEBUG_MSG("send - lora_tx_disabled\n");
if (disabled || !config.lora.tx_enabled) {
DEBUG_MSG("send - !config.lora.tx_enabled\n");
packetPool.release(p);
return ERRNO_DISABLED;
}