From b82d7e43d11f4c744de3a5f702ddaa0c880ac886 Mon Sep 17 00:00:00 2001 From: agessaman Date: Sun, 7 Dec 2025 15:13:05 -0800 Subject: [PATCH] Add WiFi TX power configuration option for MQTT. Update MQTTBridge to use build flag for TX power, defaulting to 11dBm. Document available power levels in MQTT_IMPLEMENTATION.md and update platformio.ini with example usage. --- MQTT_IMPLEMENTATION.md | 4 ++++ src/helpers/bridges/MQTTBridge.cpp | 9 +++++++-- variants/heltec_v4/platformio.ini | 6 ++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/MQTT_IMPLEMENTATION.md b/MQTT_IMPLEMENTATION.md index 28f1169ce..74e4e4cd5 100644 --- a/MQTT_IMPLEMENTATION.md +++ b/MQTT_IMPLEMENTATION.md @@ -108,6 +108,10 @@ build_flags = - `MQTT_PORT` - MQTT broker port (default: 1883) - `MQTT_USERNAME` - MQTT username - `MQTT_PASSWORD` - MQTT password +- `MQTT_WIFI_TX_POWER` - WiFi TX power level (default: `WIFI_POWER_11dBm`) + - Available values: `WIFI_POWER_19_5dBm`, `WIFI_POWER_19dBm`, `WIFI_POWER_18_5dBm`, `WIFI_POWER_17_5dBm`, `WIFI_POWER_15dBm`, `WIFI_POWER_13dBm`, `WIFI_POWER_11dBm`, `WIFI_POWER_8_5dBm`, `WIFI_POWER_7dBm`, `WIFI_POWER_5dBm`, `WIFI_POWER_2dBm`, `WIFI_POWER_MINUS_1dBm` + - Example: `-D MQTT_WIFI_TX_POWER=WIFI_POWER_19_5dBm` for maximum power + - **Note**: These power levels are appropriate for ESP32 and ESP32-S3. ESP32-C3 and ESP32-C6 may have different maximum power capabilities. If an invalid constant is used for your chip, the compiler will report an error. Check your specific ESP32 variant's datasheet for maximum supported TX power. ## Default Configuration diff --git a/src/helpers/bridges/MQTTBridge.cpp b/src/helpers/bridges/MQTTBridge.cpp index a37cfcc8d..cf9b16254 100644 --- a/src/helpers/bridges/MQTTBridge.cpp +++ b/src/helpers/bridges/MQTTBridge.cpp @@ -199,9 +199,14 @@ void MQTTBridge::begin() { MQTT_DEBUG_PRINTLN("Failed to enable WiFi power save mode: %d", ps_result); } - // Set WiFi TX power to reasonable level for MQTT connectivity + // Set WiFi TX power - use build flag if defined, otherwise default to 11dBm + #ifdef MQTT_WIFI_TX_POWER + WiFi.setTxPower(MQTT_WIFI_TX_POWER); + MQTT_DEBUG_PRINTLN("WiFi TX power set via build flag (MQTT_WIFI_TX_POWER)"); + #else WiFi.setTxPower(WIFI_POWER_11dBm); - MQTT_DEBUG_PRINTLN("WiFi TX power set to 11dBm"); + MQTT_DEBUG_PRINTLN("WiFi TX power set to 11dBm (default)"); + #endif #endif // Sync time with NTP diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini index e16d103c5..c3783aca7 100644 --- a/variants/heltec_v4/platformio.ini +++ b/variants/heltec_v4/platformio.ini @@ -112,6 +112,12 @@ build_flags = # -D MQTT_PORT=1883 # -D MQTT_USERNAME='"your-username"' # -D MQTT_PASSWORD='"your-password"' +# -D MQTT_WIFI_TX_POWER=WIFI_POWER_11dBm ; WiFi TX power (default: WIFI_POWER_11dBm) +# ; Available values: WIFI_POWER_19_5dBm, WIFI_POWER_19dBm, WIFI_POWER_18_5dBm, +# ; WIFI_POWER_17_5dBm, WIFI_POWER_15dBm, WIFI_POWER_13dBm, WIFI_POWER_11dBm, +# ; WIFI_POWER_8_5dBm, WIFI_POWER_7dBm, WIFI_POWER_5dBm, WIFI_POWER_2dBm, +# ; WIFI_POWER_MINUS_1dBm +# ; Note: These values are for ESP32/ESP32-S3. ESP32-C3/C6 may have different limits. build_src_filter = ${Heltec_lora32_v4.build_src_filter} + +