Skip to content

Commit

Permalink
decrease sync time for log - Fix missing log entries in web emsesp#1652
Browse files Browse the repository at this point in the history
  • Loading branch information
proddy committed Mar 31, 2024
1 parent e02a731 commit 46c4dc8
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
10 changes: 6 additions & 4 deletions pio_local.ini_example
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
; -DEMSESP_TEST ; enable the tests. EN language only
; -DEMSESP_DE_ONLY ; only DE translated entity names
; -DEMSESP_EN_ONLY ; only EN translated entity names
; -DEMSESP_PINGTEST ; send log message every 1/2 second
; my_build_flags = -DEMSESP_TEST
; my_build_flags = -DEMSESP_DEBUG -DEMSESP_TEST
; my_build_flags = -DEMSESP_DEBUG -DEMSESP_TEST -DEMSESP_PINGTEST

[platformio]
; default_envs = esp32_4M
default_envs = esp32_4M
; default_envs = esp32_16M
; default_envs = lolin_s3
; default_envs = standalone
Expand All @@ -32,13 +34,13 @@
; upload_port = /dev/ttyUSB*
; upload_port = COM5
extra_scripts =
; pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
scripts/rename_fw.py

[env:esp32_16M]

[env:custom]
; use for baisc ESP boards with 4MB flash
; use for basic ESP boards with 4MB flash
; make sure -D TASMOTA_SDK is also enabled
platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.01.00/platform-espressif32.zip
; use for S3 boards:
Expand Down Expand Up @@ -76,7 +78,7 @@ build_flags =
[env:lolin_s3]
upload_port = /dev/ttyUSB0
extra_scripts =
; pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
scripts/rename_fw.py

; pio run -e debug
Expand Down
5 changes: 5 additions & 0 deletions src/system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,11 @@ void System::system_check() {
if (!last_system_check_ || ((uint32_t)(uuid::get_uptime() - last_system_check_) >= SYSTEM_CHECK_FREQUENCY)) {
last_system_check_ = uuid::get_uptime();

#ifdef EMSESP_PINGTEST
static uint64_t ping_count = 0;
LOG_NOTICE("Ping test, #%d", ping_count++);
#endif

// check if we have a valid network connection
if (!ethernet_connected() && (WiFi.status() != WL_CONNECTED)) {
healthcheck_ |= HEALTHCHECK_NO_NETWORK;
Expand Down
6 changes: 5 additions & 1 deletion src/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,11 @@ class System {
static constexpr uint32_t BUTTON_VLongPressDelay = 9000; // Hold period for a very long press event (in ms)

// healthcheck
static constexpr uint32_t SYSTEM_CHECK_FREQUENCY = 5000; // do a system check every 5 seconds
#ifdef EMSESP_PINGTEST
static constexpr uint32_t SYSTEM_CHECK_FREQUENCY = 500; // do a system check every 1/2 second
#else
static constexpr uint32_t SYSTEM_CHECK_FREQUENCY = 5000; // do a system check every 5 seconds
#endif
static constexpr uint32_t HEALTHCHECK_LED_LONG_DUARATION = 1500;
static constexpr uint32_t HEALTHCHECK_LED_FLASH_DUARATION = 150;
static constexpr uint8_t HEALTHCHECK_NO_BUS = (1 << 0); // 1
Expand Down
2 changes: 1 addition & 1 deletion src/web/WebLogService.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace emsesp {
class WebLogService : public uuid::log::Handler {
public:
static constexpr size_t MAX_LOG_MESSAGES = 50;
static constexpr size_t REFRESH_SYNC = 80;
static constexpr size_t REFRESH_SYNC = 30;

WebLogService(AsyncWebServer * server, SecurityManager * securityManager);

Expand Down

0 comments on commit 46c4dc8

Please sign in to comment.