From 667169c7ff3e16c5e804b11dd0c0c15725235bb6 Mon Sep 17 00:00:00 2001 From: Vashiru Date: Sun, 5 Jul 2026 03:11:21 +0200 Subject: [PATCH] feat: Bump to 168 hours to match docs.meshcore.io --- repeater/handler_helpers/mesh_cli.py | 6 +++--- repeater/handler_helpers/repeater_cli.py | 6 +++--- repeater/web/api_endpoints.py | 6 +++--- tests/test_identity_manager_and_repeater_cli.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/repeater/handler_helpers/mesh_cli.py b/repeater/handler_helpers/mesh_cli.py index 1e27b0f..214c7a0 100644 --- a/repeater/handler_helpers/mesh_cli.py +++ b/repeater/handler_helpers/mesh_cli.py @@ -218,7 +218,7 @@ class MeshCLI: " set guest.password Guest password\n" " set allow.read.only on|off Read-only access\n" " set advert.interval 60-240 minutes\n" - " set flood.advert.interval
3-50 hours\n" + " set flood.advert.interval
3-168 hours\n" " set flood.max Max flood hops (max 64)\n" " set rxdelay RX delay base (>=0)\n" " set txdelay TX delay factor (>=0)\n" @@ -570,8 +570,8 @@ class MeshCLI: elif key == "flood.advert.interval": hours = int(value) - if (hours > 0 and hours < 3) or hours > 50: - return "Error: interval range is 3-50 hours" + if (hours > 0 and hours < 3) or hours > 168: + return "Error: interval range is 3-168 hours" self.repeater_config["flood_advert_interval_hours"] = hours saved, _ = self.config_manager.save_to_file() self.config_manager.live_update_daemon(["repeater"]) diff --git a/repeater/handler_helpers/repeater_cli.py b/repeater/handler_helpers/repeater_cli.py index 8a6f5ec..96165ff 100644 --- a/repeater/handler_helpers/repeater_cli.py +++ b/repeater/handler_helpers/repeater_cli.py @@ -231,7 +231,7 @@ class MeshCLI: " set guest.password Guest password\n" " set allow.read.only on|off Read-only access\n" " set advert.interval 60-240 minutes\n" - " set flood.advert.interval
3-50 hours\n" + " set flood.advert.interval
3-168 hours\n" " set flood.max Max flood hops (max 64)\n" " set rxdelay RX delay base (>=0)\n" " set txdelay TX delay factor (>=0)\n" @@ -519,8 +519,8 @@ class MeshCLI: elif key == "flood.advert.interval": hours = int(value) - if (hours > 0 and hours < 3) or hours > 50: - return "Error: interval range is 3-50 hours" + if (hours > 0 and hours < 3) or hours > 168: + return "Error: interval range is 3-168 hours" self.repeater_config["flood_advert_interval_hours"] = hours self.save_config() return "OK" diff --git a/repeater/web/api_endpoints.py b/repeater/web/api_endpoints.py index 781c20d..539a206 100644 --- a/repeater/web/api_endpoints.py +++ b/repeater/web/api_endpoints.py @@ -3326,7 +3326,7 @@ class APIEndpoints: "latitude": 0.0, # Latitude (-90 to 90) "longitude": 0.0, # Longitude (-180 to 180) "max_flood_hops": 64, # Max flood hops (0-64) - "flood_advert_interval_hours": 10, # Flood advert interval (0 or 3-50) + "flood_advert_interval_hours": 10, # Flood advert interval (0 or 3-168) "advert_interval_minutes": 120 # Local advert interval (0 or 1-10080) } @@ -3461,8 +3461,8 @@ class APIEndpoints: # Update flood advert interval (hours) if "flood_advert_interval_hours" in data: hours = int(data["flood_advert_interval_hours"]) - if hours != 0 and (hours < 3 or hours > 50): - return self._error("Flood advert interval must be 0 (off) or 3-50 hours") + if hours != 0 and (hours < 3 or hours > 168): + return self._error("Flood advert interval must be 0 (off) or 3-168 hours") self.config["repeater"]["send_advert_interval_hours"] = hours applied.append(f"flood.advert.interval={hours}h") diff --git a/tests/test_identity_manager_and_repeater_cli.py b/tests/test_identity_manager_and_repeater_cli.py index c859212..f1109cf 100644 --- a/tests/test_identity_manager_and_repeater_cli.py +++ b/tests/test_identity_manager_and_repeater_cli.py @@ -203,7 +203,7 @@ def test_cli_set_commands_apply_and_validate_ranges(): assert cli._cmd_set("advert.interval 60") == "OK" assert cli._cmd_set("flood.advert.interval 2").startswith("Error: interval range") - assert cli._cmd_set("flood.advert.interval 50") == "OK" + assert cli._cmd_set("flood.advert.interval 168") == "OK" assert cli._cmd_set("flood.max 65") == "Error: max 64" assert cli._cmd_set("flood.max 64") == "OK"