From 1876016509acbb1bcd58ee0a6b0725596bb2ff11 Mon Sep 17 00:00:00 2001
From: Ricardo Guzman <richon2001@hotmail.com>
Date: Fri, 2 Oct 2026 17:43:04 -0300
Subject: [PATCH] rfCommentEveryXBeacons

---
 data_embed/index.html   | 24 ++++++++++++++++++++++++
 data_embed/script.js    |  1 +
 include/configuration.h |  1 +
 src/configuration.cpp   |  4 ++++
 src/utils.cpp           |  7 +++++--
 src/web_utils.cpp       |  1 +
 6 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/data_embed/index.html b/data_embed/index.html
index 6ca4ac9..f4119c5 100644
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -305,6 +305,30 @@ body{background:var(--msh-bg);color:var(--msh-text);font-family:"Inter",system-u
                                             placeholder=""
                                         />
                                     </div>
+                                    <div class="col-6 mt-3">
+                                        <label
+                                            for="beacon.rfCommentEveryXBeacons"
+                                            class="form-label"
+                                            >Send Comment on RF every</label
+                                        >
+                                        <div class="input-group">
+                                            <input
+                                                type="number"
+                                                name="beacon.rfCommentEveryXBeacons"
+                                                id="beacon.rfCommentEveryXBeacons"
+                                                class="form-control"
+                                                value="1"
+                                                min="1"
+                                                max="100"
+                                                step="1"
+                                                required
+                                            />
+                                            <span class="input-group-text"
+                                                >beacons
+                                            </span>
+                                        </div>
+                                        <small>(1 = every beacon. APRS-IS beacon always includes the comment)</small>
+                                    </div>
                                     <div class="col-12 mt-3">
                                         <label
                                             for="beacon.path"
diff --git a/data_embed/script.js b/data_embed/script.js
index 98cdfcf..8445e5c 100644
--- a/data_embed/script.js
+++ b/data_embed/script.js
@@ -56,6 +56,7 @@ function loadSettings(settings) {
     document.getElementById("callsign").value                           = settings.callsign;
     document.getElementById("tacticalCallsign").value                   = settings.tacticalCallsign;
     document.getElementById("beacon.comment").value                     = settings.beacon.comment;
+    document.getElementById("beacon.rfCommentEveryXBeacons").value      = settings.beacon.rfCommentEveryXBeacons;
     document.getElementById("beacon.path").value                        = settings.beacon.path;
     document.getElementById("beacon.symbol").value                      = settings.beacon.symbol;
     document.getElementById("beacon.overlay").value                     = settings.beacon.overlay;
diff --git a/include/configuration.h b/include/configuration.h
index 69e9667..1829c16 100644
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -42,6 +42,7 @@ public:
     double  latitude;
     double  longitude;
     String  comment;
+    int     rfCommentEveryXBeacons;
     int     interval;
     String  overlay;
     String  symbol;
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 306045a..020ae9b 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -65,6 +65,7 @@ bool Configuration::writeFile() {
         data["aprs_is"]["objectsToRF"]              = aprs_is.objectsToRF;
 
         data["beacon"]["comment"]                   = beacon.comment;
+        data["beacon"]["rfCommentEveryXBeacons"]    = beacon.rfCommentEveryXBeacons;
         data["beacon"]["interval"]                  = beacon.interval;
         data["beacon"]["latitude"]                  = beacon.latitude;
         data["beacon"]["longitude"]                 = beacon.longitude;
@@ -249,6 +250,7 @@ bool Configuration::readFile() {
         if (data["beacon"]["latitude"].isNull() ||
             data["beacon"]["longitude"].isNull() ||
             data["beacon"]["comment"].isNull() ||
+            data["beacon"]["rfCommentEveryXBeacons"].isNull() ||
             data["beacon"]["interval"].isNull() ||
             data["beacon"]["overlay"].isNull() ||
             data["beacon"]["symbol"].isNull() ||
@@ -263,6 +265,7 @@ bool Configuration::readFile() {
         beacon.latitude                 = data["beacon"]["latitude"] | 0.0;
         beacon.longitude                = data["beacon"]["longitude"] | 0.0;
         beacon.comment                  = data["beacon"]["comment"] | "LoRa APRS";
+        beacon.rfCommentEveryXBeacons   = data["beacon"]["rfCommentEveryXBeacons"] | 1;
         beacon.interval                 = data["beacon"]["interval"] | 15;
         beacon.overlay                  = data["beacon"]["overlay"] | "L";
         beacon.symbol                   = data["beacon"]["symbol"] | "a";
@@ -472,6 +475,7 @@ void Configuration::setDefaultValues() {
     aprs_is.objectsToRF             = false;
 
     beacon.comment                  = "LoRa APRS";
+    beacon.rfCommentEveryXBeacons   = 1;
     beacon.latitude                 = 0.0;
     beacon.longitude                = 0.0;
     beacon.interval                 = 15;
diff --git a/src/utils.cpp b/src/utils.cpp
index 005ebc7..6a7d2b1 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -71,6 +71,7 @@ uint32_t    lastStatusTx            = 0;
 bool        stationCallsignIsValid  = false;
 String      beaconPacket;
 String      secondaryBeaconPacket;
+uint32_t    rfBeaconCounter         = 0;
 
 
 namespace Utils {
@@ -214,8 +215,9 @@ namespace Utils {
                 beaconPacket            += sensorData;
                 secondaryBeaconPacket   += sensorData;
             }
-            beaconPacket            += Config.beacon.comment;
-            secondaryBeaconPacket   += Config.beacon.comment;
+            beaconPacket            += Config.beacon.comment;                           // APRS-IS beacon always carries the comment
+            int commentEveryX       = max(1, Config.beacon.rfCommentEveryXBeacons);   // safety: 0 or negative behaves as "every beacon"
+            if (rfBeaconCounter % commentEveryX == 0) secondaryBeaconPacket += Config.beacon.comment;
             if (stationCallsignIsValid && Config.tacticalCallsign != "") {
                 beaconPacket            += " de ";
                 beaconPacket            += Config.callsign;
@@ -300,6 +302,7 @@ namespace Utils {
                 displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING DIGI BEACON", 0);
                 seventhLine = "     listening...";
                 STATION_Utils::addToOutputPacketBuffer(secondaryBeaconPacket, true);
+                rfBeaconCounter++;
             }
 
             lastBeaconTx = millis();
diff --git a/src/web_utils.cpp b/src/web_utils.cpp
index f758a53..0084e03 100644
--- a/src/web_utils.cpp
+++ b/src/web_utils.cpp
@@ -246,6 +246,7 @@ namespace WEB_Utils {
         Config.beacon.latitude              = getParamDoubleSafe("beacon.latitude", Config.beacon.latitude);
         Config.beacon.longitude             = getParamDoubleSafe("beacon.longitude", Config.beacon.longitude);
         Config.beacon.comment               = getParamStringSafe("beacon.comment", Config.beacon.comment);
+        Config.beacon.rfCommentEveryXBeacons = getParamIntSafe("beacon.rfCommentEveryXBeacons", Config.beacon.rfCommentEveryXBeacons);
         Config.beacon.overlay               = getParamStringSafe("beacon.overlay", Config.beacon.overlay);
         Config.beacon.symbol                = getParamStringSafe("beacon.symbol", Config.beacon.symbol);
         Config.beacon.path                  = getParamStringSafe("beacon.path", Config.beacon.path);