awonak/libGravity
1
1
Fork 0
Code Issues Pull Requests Packages Releases 2 Activity

Move save slot to metadata to persist when loading transient.

Browse Source
This commit is contained in:
Adam Wonak
2025-07-21 21:00:00 -07:00
parent d30e9e2f85
commit 1155978e51
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/Gravity/save_state.cpp
View File

@ -34,9 +34,9 @@ bool StateManager::initialize(AppState& app) {
_saveMetadata(app); _saveMetadata(app);
reset(app); reset(app);
for (int i = 0; i < MAX_SAVE_SLOTS; i++) { for (int i = 0; i < MAX_SAVE_SLOTS; i++) {
app.selected_save_slot = i;
_saveState(app, i); _saveState(app, i);
} }
_saveState(app, TRANSIENT_SLOT);
return false; return false;
} }
} }
@ -122,7 +122,6 @@ void StateManager::_saveState(const AppState& app, byte slot_index) {
save_data.selected_channel = app.selected_channel; save_data.selected_channel = app.selected_channel;
save_data.selected_source = static_cast<byte>(app.selected_source); save_data.selected_source = static_cast<byte>(app.selected_source);
save_data.selected_pulse = static_cast<byte>(app.selected_pulse); save_data.selected_pulse = static_cast<byte>(app.selected_pulse);
save_data.selected_save_slot = app.selected_save_slot;
// TODO: break this out into a separate function. Save State should be // TODO: break this out into a separate function. Save State should be
// broken out into global / per-channel save methods. When saving via // broken out into global / per-channel save methods. When saving via
@ -149,7 +148,7 @@ void StateManager::_saveState(const AppState& app, byte slot_index) {
void StateManager::_loadState(AppState& app, byte slot_index) { void StateManager::_loadState(AppState& app, byte slot_index) {
// Check if slot_index is within max range + 1 for transient. // Check if slot_index is within max range + 1 for transient.
if (slot_index >= MAX_SAVE_SLOTS + 1) return; if (slot_index >= MAX_SAVE_SLOTS + 1) return;
noInterrupts(); noInterrupts();
static EepromData load_data; static EepromData load_data;
@ -188,6 +187,7 @@ void StateManager::_saveMetadata(const AppState& app) {
current_meta.version = SKETCH_VERSION; current_meta.version = SKETCH_VERSION;
// Global user settings // Global user settings
current_meta.selected_save_slot = app.selected_save_slot;
current_meta.encoder_reversed = app.encoder_reversed; current_meta.encoder_reversed = app.encoder_reversed;
EEPROM.put(METADATA_START_ADDR, current_meta); EEPROM.put(METADATA_START_ADDR, current_meta);
@ -198,6 +198,7 @@ void StateManager::_loadMetadata(AppState& app) {
noInterrupts(); noInterrupts();
Metadata metadata; Metadata metadata;
EEPROM.get(METADATA_START_ADDR, metadata); EEPROM.get(METADATA_START_ADDR, metadata);
app.selected_save_slot = metadata.selected_save_slot;
app.encoder_reversed = metadata.encoder_reversed; app.encoder_reversed = metadata.encoder_reversed;
interrupts(); interrupts();
} }

2
firmware/Gravity/save_state.h
View File

@ -61,6 +61,7 @@ class StateManager {
byte version; byte version;
char sketch_name[16]; char sketch_name[16];
// Additional global/hardware settings // Additional global/hardware settings
byte selected_save_slot;
bool encoder_reversed; bool encoder_reversed;
}; };
struct ChannelState { struct ChannelState {
@ -82,7 +83,6 @@ class StateManager {
byte selected_channel; byte selected_channel;
byte selected_source; byte selected_source;
byte selected_pulse; byte selected_pulse;
byte selected_save_slot;
ChannelState channel_data[Gravity::OUTPUT_COUNT]; ChannelState channel_data[Gravity::OUTPUT_COUNT];
}; };