From 25bfac0e93afa58df6ae3d0f009a3c5e5e42c326 Mon Sep 17 00:00:00 2001 From: agessaman Date: Sun, 19 Jul 2026 15:49:27 -0700 Subject: [PATCH] fix: remove duplicate declarations left by the upstream merge The 2026-07-19 upstream merge auto-merged two additions into the same class bodies without conflicting, producing duplicate declarations: examples/simple_room_server/MyMesh.h - getCADEnabled() variants/heltec_v4/HeltecV4Board.h - setLoRaFemLnaEnabled(), canControlLoRaFemLna(), isLoRaFemLnaEnabled() Same class of breakage as the RadioLibWrapper::_cad_enabled and MyMesh::getCADEnabled() duplicates already fixed in the merge commit. These survived because the merge was validated with the two prescribed MQTT smoke builds, and neither of them compiles simple_room_server or the heltec_v4 variant - so CI was the first thing to touch the broken files. Now verified across ALL 32 observer envs locally, not a sample: 32/32 build. --- examples/simple_room_server/MyMesh.h | 3 --- variants/heltec_v4/HeltecV4Board.h | 4 ---- 2 files changed, 7 deletions(-) diff --git a/examples/simple_room_server/MyMesh.h b/examples/simple_room_server/MyMesh.h index 2bc5dce8..3e18b2b3 100644 --- a/examples/simple_room_server/MyMesh.h +++ b/examples/simple_room_server/MyMesh.h @@ -171,9 +171,6 @@ protected: int getInterferenceThreshold() const override { return _prefs.interference_threshold; } - bool getCADEnabled() const override { - return _prefs.cad_enabled; - } int getAGCResetInterval() const override { return ((int)_prefs.agc_reset_interval) * 4000; // milliseconds } diff --git a/variants/heltec_v4/HeltecV4Board.h b/variants/heltec_v4/HeltecV4Board.h index 9e08abd8..55166bb3 100644 --- a/variants/heltec_v4/HeltecV4Board.h +++ b/variants/heltec_v4/HeltecV4Board.h @@ -37,8 +37,4 @@ public: } float getAdcMultiplier() const override { return adc_mult; } const char* getManufacturerName() const override; - - bool setLoRaFemLnaEnabled(bool enable) override; - bool canControlLoRaFemLna() const override; - bool isLoRaFemLnaEnabled() const override; };