mirror of
https://github.com/daveallie/crosspoint-reader.git
synced 2026-02-04 14:47:37 +03:00
5ae10a7eb6
Multiple goals are achieved with this change: - make descriptions of settings close to their definitions - settings validation on loading with reset to default in case of bad value - do not boot-loop on bad string values - (de)serialization is based on a single list of descriptors: single point of truth - possibly to have default values for the String configuration type - more constexpr to reduce RAM usage - less hardcoded values - more maintainable RAM Usage: From RAM: [=== ] 32.5% (used 106516 bytes from 327680 bytes) Flash: [========= ] 94.9% (used 6217240 bytes from 6553600 bytes) To RAM: [=== ] 32.3% (used 105844 bytes from 327680 bytes) Flash: [========= ] 94.8% (used 6213378 bytes from 6553600 bytes) Boot config validation with a test where the status bar config is wrong: [1256] [SD] SD card detected [1256] [CPS] Loading settings from file [1265] [CPS] Invalid value (0x3) for Status Bar, resetting to default [1265] [CPS] Settings loaded from file
48 lines
1.5 KiB
C++
48 lines
1.5 KiB
C++
#pragma once
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/semphr.h>
|
|
#include <freertos/task.h>
|
|
|
|
#include <functional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "CrossPointSettings.h"
|
|
#include "activities/ActivityWithSubactivity.h"
|
|
|
|
// Action items for the System category
|
|
struct ActionItem {
|
|
const char* name;
|
|
enum class Type { KOREADER_SYNC, CALIBRE_SETTINGS, CLEAR_CACHE, CHECK_UPDATES };
|
|
Type type;
|
|
};
|
|
|
|
class CategorySettingsActivity final : public ActivityWithSubactivity {
|
|
TaskHandle_t displayTaskHandle = nullptr;
|
|
SemaphoreHandle_t renderingMutex = nullptr;
|
|
bool updateRequired = false;
|
|
int selectedSettingIndex = 0;
|
|
const char* categoryName;
|
|
const std::vector<const SettingDescriptor*> descriptors;
|
|
const std::vector<ActionItem> actionItems;
|
|
const std::function<void()> onGoBack;
|
|
|
|
static void taskTrampoline(void* param);
|
|
[[noreturn]] void displayTaskLoop();
|
|
void render() const;
|
|
void toggleCurrentSetting();
|
|
|
|
public:
|
|
CategorySettingsActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, const char* categoryName,
|
|
const std::vector<const SettingDescriptor*>& descriptors,
|
|
const std::vector<ActionItem>& actionItems, const std::function<void()>& onGoBack)
|
|
: ActivityWithSubactivity("CategorySettings", renderer, mappedInput),
|
|
categoryName(categoryName),
|
|
descriptors(descriptors),
|
|
actionItems(actionItems),
|
|
onGoBack(onGoBack) {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
};
|