From 9cc1ff99f5a1e64b98d6412d20133e073c08f36a Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Tue, 11 Aug 2026 11:16:15 -0700 Subject: [PATCH] The position block is for a single event, so disable by default (#11411) Co-authored-by: Ben Meadors --- src/mesh/Channels.h | 4 ---- userPrefs.jsonc | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mesh/Channels.h b/src/mesh/Channels.h index 6fc40b0e4..27833130c 100644 --- a/src/mesh/Channels.h +++ b/src/mesh/Channels.h @@ -5,10 +5,6 @@ #include "mesh-pb-constants.h" #include -#ifndef USERPREFS_BLOCK_POSITION_ON_EVENT_CHANNEL -#define USERPREFS_BLOCK_POSITION_ON_EVENT_CHANNEL USERPREFS_EVENT_MODE -#endif - #if USERPREFS_BLOCK_POSITION_ON_EVENT_CHANNEL && !defined(USERPREFS_CHANNEL_0_PSK) #error "USERPREFS_BLOCK_POSITION_ON_EVENT_CHANNEL requires USERPREFS_CHANNEL_0_PSK" #endif diff --git a/userPrefs.jsonc b/userPrefs.jsonc index cec5b82c5..eb9ff3faf 100644 --- a/userPrefs.jsonc +++ b/userPrefs.jsonc @@ -25,7 +25,7 @@ // "USERPREFS_CONFIG_DEVICE_ROLE": "meshtastic_Config_DeviceConfig_Role_CLIENT", // Defaults to CLIENT. ROUTER*, and LOST AND FOUND roles are restricted. // "USERPREFS_EVENT_MODE": "1", // "USERPREFS_EVENT_MODE_HOP_LIMIT": "3", // Event-mode default and firmware-generated/relay hop cap (0-7; default 3) - // "USERPREFS_BLOCK_POSITION_ON_EVENT_CHANNEL": "1", // Block location TX + discard inbound location on channels keyed with USERPREFS_CHANNEL_0_PSK. Defaults on under EVENT_MODE. + // "USERPREFS_BLOCK_POSITION_ON_EVENT_CHANNEL": "1", // Block location TX + discard inbound location on channels keyed with USERPREFS_CHANNEL_0_PSK. Defaults off, and must be set explicitly. // "USERPREFS_TMM_APPLY_TO_PRIVATE_CHANNELS": "1", // Extend TMM position dedup and precision clamping to private/custom-key channels (default: well-known channels only) // "USERPREFS_FIRMWARE_EDITION": "meshtastic_FirmwareEdition_BURNING_MAN", // "USERPREFS_FIXED_BLUETOOTH": "121212",