## Summary Currently, each activity has to manage their own `displayTaskLoop` which adds redundant boilerplate code. The loop is a wait loop which is also not the best practice, as the `updateRequested` boolean is not protected by a mutex. In this PR: - Move `displayTaskLoop` to the super `Activity` class - Replace `updateRequested` with freeRTOS's [direct to task notification](https://www.freertos.org/Documentation/02-Kernel/02-Kernel-features/03-Direct-to-task-notifications/01-Task-notifications) - For `ActivityWithSubactivity`, whenever a sub-activity is present, the parent's `render()` automatically goes inactive With this change, activities now only need to expose `render()` function, and anywhere in the code base can call `requestUpdate()` to request a new rendering pass. ## Additional Context In theory, this change may also make the battery life a bit better, since one wait loop is removed. Although the equipment in my home lab wasn't been able to verify it (the electric current is too noisy and small). Would appreciate if anyone has any insights on this subject. Update: I managed to hack [a small piece of code](https://github.com/ngxson/crosspoint-reader/tree/xsn/measure_cpu_usage) that allow tracking CPU idle time. The CPU load does decrease a bit (1.47% down to 1.39%), which make sense, because the display task is now sleeping most of the time unless notified. This should translate to a slightly increase in battery life in the long run. ``` PR: [40012] [MEM] Free: 185856 bytes, Total: 231004 bytes, Min Free: 123316 bytes [40012] [IDLE] Idle time: 98.61% (CPU load: 1.39%) [50017] [MEM] Free: 185856 bytes, Total: 231004 bytes, Min Free: 123316 bytes [50017] [IDLE] Idle time: 98.61% (CPU load: 1.39%) [60022] [MEM] Free: 185856 bytes, Total: 231004 bytes, Min Free: 123316 bytes [60022] [IDLE] Idle time: 98.61% (CPU load: 1.39%) master: [20012] [MEM] Free: 195016 bytes, Total: 231532 bytes, Min Free: 132460 bytes [20012] [IDLE] Idle time: 98.53% (CPU load: 1.47%) [30017] [MEM] Free: 195016 bytes, Total: 231532 bytes, Min Free: 132460 bytes [30017] [IDLE] Idle time: 98.53% (CPU load: 1.47%) [40022] [MEM] Free: 195016 bytes, Total: 231532 bytes, Min Free: 132460 bytes [40022] [IDLE] Idle time: 98.53% (CPU load: 1.47%) ``` --- ### AI Usage While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? **NO** <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Refactor** * Streamlined rendering architecture by consolidating update mechanisms across all activities, improving efficiency and consistency. * Modernized synchronization patterns for display updates to ensure reliable, conflict-free rendering. * **Bug Fixes** * Enhanced rendering stability through improved locking mechanisms and explicit update requests. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: znelson <znelson@users.noreply.github.com>
165 lines
4.9 KiB
C++
165 lines
4.9 KiB
C++
#pragma once
|
|
|
|
#include <functional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "activities/ActivityWithSubactivity.h"
|
|
#include "util/ButtonNavigator.h"
|
|
|
|
class CrossPointSettings;
|
|
|
|
enum class SettingType { TOGGLE, ENUM, ACTION, VALUE, STRING };
|
|
|
|
enum class SettingAction {
|
|
None,
|
|
RemapFrontButtons,
|
|
KOReaderSync,
|
|
OPDSBrowser,
|
|
Network,
|
|
ClearCache,
|
|
CheckForUpdates,
|
|
};
|
|
|
|
struct SettingInfo {
|
|
const char* name;
|
|
SettingType type;
|
|
uint8_t CrossPointSettings::* valuePtr = nullptr;
|
|
std::vector<std::string> enumValues;
|
|
SettingAction action = SettingAction::None;
|
|
|
|
struct ValueRange {
|
|
uint8_t min;
|
|
uint8_t max;
|
|
uint8_t step;
|
|
};
|
|
ValueRange valueRange = {};
|
|
|
|
const char* key = nullptr; // JSON API key (nullptr for ACTION types)
|
|
const char* category = nullptr; // Category for web UI grouping
|
|
|
|
// Direct char[] string fields (for settings stored in CrossPointSettings)
|
|
char* stringPtr = nullptr;
|
|
size_t stringMaxLen = 0;
|
|
|
|
// Dynamic accessors (for settings stored outside CrossPointSettings, e.g. KOReaderCredentialStore)
|
|
std::function<uint8_t()> valueGetter;
|
|
std::function<void(uint8_t)> valueSetter;
|
|
std::function<std::string()> stringGetter;
|
|
std::function<void(const std::string&)> stringSetter;
|
|
|
|
static SettingInfo Toggle(const char* name, uint8_t CrossPointSettings::* ptr, const char* key = nullptr,
|
|
const char* category = nullptr) {
|
|
SettingInfo s;
|
|
s.name = name;
|
|
s.type = SettingType::TOGGLE;
|
|
s.valuePtr = ptr;
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo Enum(const char* name, uint8_t CrossPointSettings::* ptr, std::vector<std::string> values,
|
|
const char* key = nullptr, const char* category = nullptr) {
|
|
SettingInfo s;
|
|
s.name = name;
|
|
s.type = SettingType::ENUM;
|
|
s.valuePtr = ptr;
|
|
s.enumValues = std::move(values);
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo Action(const char* name, SettingAction action) {
|
|
SettingInfo s;
|
|
s.name = name;
|
|
s.type = SettingType::ACTION;
|
|
s.action = action;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo Value(const char* name, uint8_t CrossPointSettings::* ptr, const ValueRange valueRange,
|
|
const char* key = nullptr, const char* category = nullptr) {
|
|
SettingInfo s;
|
|
s.name = name;
|
|
s.type = SettingType::VALUE;
|
|
s.valuePtr = ptr;
|
|
s.valueRange = valueRange;
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo String(const char* name, char* ptr, size_t maxLen, const char* key = nullptr,
|
|
const char* category = nullptr) {
|
|
SettingInfo s;
|
|
s.name = name;
|
|
s.type = SettingType::STRING;
|
|
s.stringPtr = ptr;
|
|
s.stringMaxLen = maxLen;
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo DynamicEnum(const char* name, std::vector<std::string> values, std::function<uint8_t()> getter,
|
|
std::function<void(uint8_t)> setter, const char* key = nullptr,
|
|
const char* category = nullptr) {
|
|
SettingInfo s;
|
|
s.name = name;
|
|
s.type = SettingType::ENUM;
|
|
s.enumValues = std::move(values);
|
|
s.valueGetter = std::move(getter);
|
|
s.valueSetter = std::move(setter);
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo DynamicString(const char* name, std::function<std::string()> getter,
|
|
std::function<void(const std::string&)> setter, const char* key = nullptr,
|
|
const char* category = nullptr) {
|
|
SettingInfo s;
|
|
s.name = name;
|
|
s.type = SettingType::STRING;
|
|
s.stringGetter = std::move(getter);
|
|
s.stringSetter = std::move(setter);
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
};
|
|
|
|
class SettingsActivity final : public ActivityWithSubactivity {
|
|
ButtonNavigator buttonNavigator;
|
|
|
|
int selectedCategoryIndex = 0; // Currently selected category
|
|
int selectedSettingIndex = 0;
|
|
int settingsCount = 0;
|
|
|
|
// Per-category settings derived from shared list + device-only actions
|
|
std::vector<SettingInfo> displaySettings;
|
|
std::vector<SettingInfo> readerSettings;
|
|
std::vector<SettingInfo> controlsSettings;
|
|
std::vector<SettingInfo> systemSettings;
|
|
const std::vector<SettingInfo>* currentSettings = nullptr;
|
|
|
|
const std::function<void()> onGoHome;
|
|
|
|
static constexpr int categoryCount = 4;
|
|
static const char* categoryNames[categoryCount];
|
|
|
|
void enterCategory(int categoryIndex);
|
|
void toggleCurrentSetting();
|
|
|
|
public:
|
|
explicit SettingsActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
|
const std::function<void()>& onGoHome)
|
|
: ActivityWithSubactivity("Settings", renderer, mappedInput), onGoHome(onGoHome) {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
void render(Activity::RenderLock&&) override;
|
|
};
|