andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-10-28 11:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests for gateway speeds

Browse Source
This commit is contained in:
proddy
2026-10-04 14:28:53 +02:00
parent ca79e2e09b
commit 4b3f6015ee
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/emsesp.cpp
+11 -1
View File
@@ -55,6 +55,8 @@ uint32_t EMSESP::gateway_hold_start_ = 0;
uint32_t EMSESP::gateway_cooldown_until_ = 0; uint32_t EMSESP::gateway_cooldown_until_ = 0;
uint32_t EMSESP::gateway_window_start_ = 0; uint32_t EMSESP::gateway_window_start_ = 0;
uint8_t EMSESP::gateway_window_count_ = 0; uint8_t EMSESP::gateway_window_count_ = 0;
uint32_t EMSESP::gateway_fast_start_ = 0;
uint8_t EMSESP::gateway_fast_count_ = 0;
uint8_t EMSESP::last_version_request_src_ = 0; uint8_t EMSESP::last_version_request_src_ = 0;
uint32_t EMSESP::last_version_request_time_ = 0; uint32_t EMSESP::last_version_request_time_ = 0;
#endif #endif
@@ -1771,9 +1773,17 @@ void EMSESP::gateway_rx_check(const uint8_t * data, const uint8_t length) {
gateway_window_start_ = now; gateway_window_start_ = now;
gateway_window_count_ = 0; gateway_window_count_ = 0;
} }
if (++gateway_window_count_ >= GATEWAY_BURST_THRESHOLD) { if (now - gateway_fast_start_ > GATEWAY_FAST_WINDOW) {
gateway_fast_start_ = now;
gateway_fast_count_ = 0;
}
++gateway_window_count_;
++gateway_fast_count_;
if (gateway_window_count_ >= GATEWAY_BURST_THRESHOLD || gateway_fast_count_ >= GATEWAY_FAST_THRESHOLD) {
gateway_window_start_ = now; gateway_window_start_ = now;
gateway_window_count_ = 0; gateway_window_count_ = 0;
gateway_fast_start_ = now;
gateway_fast_count_ = 0;
gateway_tx_hold_start(); gateway_tx_hold_start();
} }
} }
src/core/emsesp.h
+4
View File
@@ -300,6 +300,8 @@ class EMSESP {
static constexpr uint32_t GATEWAY_BURST_WINDOW = 30000; // ms window for counting gateway read requests static constexpr uint32_t GATEWAY_BURST_WINDOW = 30000; // ms window for counting gateway read requests
static constexpr uint8_t GATEWAY_BURST_THRESHOLD = 15; // read requests within window to treat gateway as busy static constexpr uint8_t GATEWAY_BURST_THRESHOLD = 15; // read requests within window to treat gateway as busy
static constexpr uint32_t GATEWAY_FAST_WINDOW = 5000; // short window to catch the start of a burst quickly
static constexpr uint8_t GATEWAY_FAST_THRESHOLD = 8; // normal polling is ~1 read per 2s, a sync starts at >10/s
static constexpr uint32_t GATEWAY_HOLD_TIME = 60000; // keep holding Tx this long after the last busy window static constexpr uint32_t GATEWAY_HOLD_TIME = 60000; // keep holding Tx this long after the last busy window
static constexpr uint32_t GATEWAY_HOLD_MAX = 600000; // never hold longer than 10 minutes in one go static constexpr uint32_t GATEWAY_HOLD_MAX = 600000; // never hold longer than 10 minutes in one go
static constexpr uint32_t GATEWAY_HOLD_COOLDOWN = 600000; // after hitting the max, don't hold again for 10 minutes static constexpr uint32_t GATEWAY_HOLD_COOLDOWN = 600000; // after hitting the max, don't hold again for 10 minutes
@@ -309,6 +311,8 @@ class EMSESP {
static uint32_t gateway_cooldown_until_; static uint32_t gateway_cooldown_until_;
static uint32_t gateway_window_start_; static uint32_t gateway_window_start_;
static uint8_t gateway_window_count_; static uint8_t gateway_window_count_;
static uint32_t gateway_fast_start_;
static uint8_t gateway_fast_count_;
static uint8_t last_version_request_src_; static uint8_t last_version_request_src_;
static uint32_t last_version_request_time_; static uint32_t last_version_request_time_;
#endif #endif