Merge remote-tracking branch 'origin/main'

# Conflicts:
#	include/LCDDisplay.hpp
#	src/LCDDisplay.cpp
This commit is contained in:
2026-01-15 00:24:55 +01:00
6 changed files with 8 additions and 7 deletions

View File

@@ -144,7 +144,7 @@ void Application::displayThread(const std::stop_token& st) {
// actual main display loop
while (!st.stop_requested()) {
m_control.display.try_acquire_for(std::chrono::milliseconds(static_cast<int>(m_config.lcd.refresh_interval_ms * 1.25))); // holds the loop until sensor data is ready, max 1.25x of the loop time
if (st.stop_requested()) break; // needed, otherwise it wont quit correctly
if (st.stop_requested()) break; // needed, otherwise it wont quit correctly
{
std::lock_guard lock(m_control.sensors);