pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-04 10:38:57 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fixing macros

Browse Source
This commit is contained in:
medentem 2025-01-07 13:33:00 -06:00
parent bcce6c83d9
commit 807dc327d6
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesh/FloodingRouter.cpp
View File

@ -163,7 +163,8 @@ void FloodingRouter::mergeMyCoverage(CoverageFilter &coverage)
float FloodingRouter::calculateForwardProbability(const CoverageFilter &incoming, NodeNum from)
{
#if defined(USERPREFS_USE_COVERAGE_FILTER) && USERPREFS_USE_COVERAGE_FILTER == true
#ifndef USERPREFS_USE_COVERAGE_FILTER
LOG_DEBUG("Coverage filter is NOT enabled.");
return 1.0f;
#endif
// If we are a router or repeater, always forward because it's assumed these are in the most advantageous locations

3
src/mesh/MeshTypes.h
View File

@ -36,12 +36,13 @@ enum RxSource {
* too long.
**/
#if defined(USERPREFS_USE_COVERAGE_FILTER) && USERPREFS_USE_COVERAGE_FILTER == true
#ifdef USERPREFS_USE_COVERAGE_FILTER
#define HOP_MAX 15
#else
#define HOP_MAX 7
#endif
/// We normally just use max 3 hops for sending reliable messages
#define HOP_RELIABLE 3

2
src/mesh/NodeDB.cpp
View File

@ -494,7 +494,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
#endif
config.lora.hop_limit = HOP_RELIABLE;
#if defined(USERPREFS_USE_COVERAGE_FILTER) && USERPREFS_USE_COVERAGE_FILTER == true
#ifdef USERPREFS_USE_COVERAGE_FILTER
config.lora.hop_limit = HOP_MAX;
#endif
#ifdef USERPREFS_CONFIG_LORA_IGNORE_MQTT

4
userPrefs.jsonc
View File

@ -30,10 +30,10 @@
// "USERPREFS_LORACONFIG_CHANNEL_NUM": "31",
// "USERPREFS_LORACONFIG_MODEM_PRESET": "meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST",
// "USERPREFS_SPLASH_TITLE": "DEFCONtastic",
"USERPREFS_TZ_STRING": "tzplaceholder ",
// "USERPREFS_USE_ADMIN_KEY_0": "{ 0xcd, 0xc0, 0xb4, 0x3c, 0x53, 0x24, 0xdf, 0x13, 0xca, 0x5a, 0xa6, 0x0c, 0x0d, 0xec, 0x85, 0x5a, 0x4c, 0xf6, 0x1a, 0x96, 0x04, 0x1a, 0x3e, 0xfc, 0xbb, 0x8e, 0x33, 0x71, 0xe5, 0xfc, 0xff, 0x3c }",
// "USERPREFS_USE_ADMIN_KEY_1": "{}",
// "USERPREFS_USE_ADMIN_KEY_2": "{}",
// "USERPREFS_NODEINFO_BROADCAST_CHANNEL_HASH": "8",
"USERPREFS_USE_COVERAGE_FILTER": "false"
// "USERPREFS_USE_COVERAGE_FILTER": "",
"USERPREFS_TZ_STRING": "tzplaceholder "
}