diff --git a/docs/cli_commands.md b/docs/cli_commands.md index 3a5ef732b..8f4a1f403 100644 --- a/docs/cli_commands.md +++ b/docs/cli_commands.md @@ -852,7 +852,7 @@ voltage channel, plus the collected noise-floor snapshots. GPS is never included in this raw transmission. The history remains boot-local, so the first scheduled run after a reboot needs about 82.5 hours to fill. On the default two-day interval, each 82.5-hour temperature or -battery packet overlaps its predecessor by 34.5 hours. Packets are paced two +battery packet overlaps its predecessor by 34.5 hours. Packets are queued 90 seconds apart. A queue failure is retried after 30 minutes only for the packet that did not queue; successfully queued packets are not duplicated. diff --git a/docs/telemetry_decoder.md b/docs/telemetry_decoder.md index b1669df96..214d2d1e7 100644 --- a/docs/telemetry_decoder.md +++ b/docs/telemetry_decoder.md @@ -63,6 +63,9 @@ history is entirely zero are treated as disconnected and are not sent. The command requires at least one collected base sample and works even when the automatic schedule is off. +Packets in manual and scheduled batches are queued 90 seconds apart. Channel +activity and airtime limits can delay actual transmission further. + It also queues a `N1B1` noise-floor packet once the main radio has completed a 15-minute history bucket. With radio2 enabled, it queues a separate `N2B1` packet for that profile once it has a completed bucket. Each holds the latest diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp index 3e82deab5..34fed4fca 100644 --- a/examples/simple_repeater/MyMesh.cpp +++ b/examples/simple_repeater/MyMesh.cpp @@ -239,7 +239,7 @@ static const char FLOOD_CHANNEL_SCOPE_USAGE[] = #define TELEMETRY_HISTORY_TX_PREFS_FILE "/telemetry_tx" static const uint64_t TELEMETRY_HISTORY_TX_RETRY_MILLIS = 30ULL * 60ULL * 1000ULL; -static const uint64_t TELEMETRY_HISTORY_TX_PACKET_SPACING_MILLIS = 2000ULL; +static const uint64_t TELEMETRY_HISTORY_TX_PACKET_SPACING_MILLIS = 90000ULL; static const uint8_t TELEMETRY_HISTORY_TX_DEFAULT_DAYS = 2U; static const uint8_t TELEMETRY_HISTORY_TX_MAX_DAYS = 30U; static const uint8_t TELEMETRY_HISTORY_TX_TEMPERATURE = 1U; diff --git a/test/fixtures/telemetry_tx_persistence/fixture.cpp b/test/fixtures/telemetry_tx_persistence/fixture.cpp index d5e338039..3b82a5cdd 100644 --- a/test/fixtures/telemetry_tx_persistence/fixture.cpp +++ b/test/fixtures/telemetry_tx_persistence/fixture.cpp @@ -454,7 +454,9 @@ static void checkAmbiguousPublicationAndServiceGate() { assert(healthy.node.packets.size() == 1); assert(healthy.node.packets[0].payload_len == 184); assert(!memcmp(healthy.node.packets[0].payload, "TTB1", 4)); - test_millis += 2000; healthy.node.serviceTelemetryHistoryTx(); test_millis = 0; + test_millis += 89999; healthy.node.serviceTelemetryHistoryTx(); + assert(healthy.node.packets.size() == 1); + test_millis += 1; healthy.node.serviceTelemetryHistoryTx(); test_millis = 0; assert(healthy.node.packets.size() == 2 && !memcmp(healthy.node.packets[1].payload, "TVB1", 4)); assert(healthy.node.command("send telemetry.tx now").find("OK - telemetry.tx queued") == 0); }