Cleanup and improvements (#194)
- Lots of changes for migrating C code to C++ - Improved `Lockable` in several ways like adding `withLock()` (+ tests) - Improved `Semaphore` a bit for improved readability, and also added some tests - Upgrade Linux machine in GitHub Actions so that we can compile with a newer GCC - Simplification of WiFi connection - Updated funding options - (and more)
This commit is contained in:
committed by
GitHub
parent
1bb1260ea0
commit
6c67845645
@@ -1,5 +1,3 @@
|
||||
#include <sstream>
|
||||
#include <vector>
|
||||
#include "lvgl.h"
|
||||
#include "lvgl/Style.h"
|
||||
#include "lvgl/Toolbar.h"
|
||||
@@ -7,6 +5,10 @@
|
||||
#include "service/loader/Loader.h"
|
||||
#include "lvgl/LvglSync.h"
|
||||
|
||||
#include <sstream>
|
||||
#include <vector>
|
||||
#include <ranges>
|
||||
|
||||
#define TAG "text_viewer"
|
||||
|
||||
namespace tt::app::log {
|
||||
@@ -18,39 +20,36 @@ private:
|
||||
LogLevel filterLevel = LogLevel::Info;
|
||||
lv_obj_t* labelWidget = nullptr;
|
||||
|
||||
static bool shouldShowLog(LogLevel filterLevel, LogLevel logLevel) {
|
||||
if (filterLevel == LogLevel::None || logLevel == LogLevel::None) {
|
||||
return false;
|
||||
} else {
|
||||
return filterLevel >= logLevel;
|
||||
}
|
||||
static inline bool shouldShowLog(LogLevel filterLevel, LogLevel logLevel) {
|
||||
return (filterLevel != LogLevel::None) &&
|
||||
(logLevel != LogLevel::None) &&
|
||||
filterLevel >= logLevel;
|
||||
}
|
||||
|
||||
void updateLogEntries() {
|
||||
unsigned int index;
|
||||
auto* entries = copyLogEntries(index);
|
||||
std::size_t next_log_index;
|
||||
auto entries = copyLogEntries(next_log_index);
|
||||
std::stringstream buffer;
|
||||
if (entries != nullptr) {
|
||||
for (unsigned int i = index; i < TT_LOG_ENTRY_COUNT; ++i) {
|
||||
if (shouldShowLog(filterLevel, entries[i].level)) {
|
||||
buffer << entries[i].message;
|
||||
|
||||
if (next_log_index != 0) {
|
||||
long to_drop = TT_LOG_ENTRY_COUNT - next_log_index;
|
||||
for (auto entry : std::views::drop(*entries, (long)next_log_index)) {
|
||||
if (shouldShowLog(filterLevel, entry.level) && entry.message[0] != 0x00) {
|
||||
buffer << entry.message;
|
||||
}
|
||||
}
|
||||
if (index != 0) {
|
||||
for (unsigned int i = 0; i < index; ++i) {
|
||||
if (shouldShowLog(filterLevel, entries[i].level)) {
|
||||
buffer << entries[i].message;
|
||||
}
|
||||
}
|
||||
}
|
||||
delete entries;
|
||||
if (!buffer.str().empty()) {
|
||||
lv_label_set_text(labelWidget, buffer.str().c_str());
|
||||
} else {
|
||||
lv_label_set_text(labelWidget, "No logs for the selected log level");
|
||||
}
|
||||
|
||||
for (auto entry : std::views::take(*entries, (long)next_log_index)) {
|
||||
if (shouldShowLog(filterLevel, entry.level) && entry.message[0] != 0x00) {
|
||||
buffer << entry.message;
|
||||
}
|
||||
}
|
||||
|
||||
if (!buffer.str().empty()) {
|
||||
lv_label_set_text(labelWidget, buffer.str().c_str());
|
||||
} else {
|
||||
lv_label_set_text(labelWidget, "Failed to load log");
|
||||
lv_label_set_text(labelWidget, "No logs for the selected log level");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user