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

roll back text const. remove bootsplash. add rotate disp to metadata.

Browse Source
This commit is contained in:
Adam Wonak
2025-08-09 19:42:53 -07:00
parent c3c0b39378
commit 675ab20267
4 changed files with 32 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/Gravity/Gravity.ino
View File

@ -66,10 +66,6 @@ void setup() {
// Start Gravity. // Start Gravity.
gravity.Init(); gravity.Init();
// Show bootsplash when initializing firmware.
Bootsplash();
delay(2000);
// Initialize the state manager. This will load settings from EEPROM // Initialize the state manager. This will load settings from EEPROM
stateManager.initialize(app); stateManager.initialize(app);
InitGravity(app); InitGravity(app);
@ -237,8 +233,6 @@ void HandleEncoderPressed() {
break; break;
case PARAM_MAIN_FACTORY_RESET: case PARAM_MAIN_FACTORY_RESET:
if (app.selected_sub_param == 0) { // Erase if (app.selected_sub_param == 0) { // Erase
// Show bootsplash during slow erase operation.
Bootsplash();
stateManager.factoryReset(app); stateManager.factoryReset(app);
InitGravity(app); InitGravity(app);
} }
@ -387,6 +381,7 @@ void InitGravity(AppState& app) {
gravity.clock.SetTempo(app.tempo); gravity.clock.SetTempo(app.tempo);
gravity.clock.SetSource(app.selected_source); gravity.clock.SetSource(app.selected_source);
gravity.encoder.SetReverseDirection(app.encoder_reversed); gravity.encoder.SetReverseDirection(app.encoder_reversed);
gravity.display.setFlipMode(app.rotate_display ? 1 : 0);
} }
void ResetOutputs() { void ResetOutputs() {

86
firmware/Gravity/display.h
View File

@ -125,22 +125,6 @@ enum ParamsChannelPage : uint8_t {
PARAM_CH_LAST, PARAM_CH_LAST,
}; };
// Common/resused strings stored as const to save on flash memory.
const char* const STR_24_PPQN = "24 PPQN";
const char* const STR_4_PPQN = "4 PPQN";
const char* const STR_1_PPQN = "1 PPQN";
const char* const STR_CV_1 = "CV 1";
const char* const STR_CV_2 = "CV 2";
const char* const STR_NONE = "NONE";
const char* const STR_EXT = "EXT";
const char* const STR_X = "X";
const char* const STR_DEFAULT = "DEFAULT";
const char* const STR_REVERSED = "REVERSED";
const char* const STR_FLIPPED = "FLIPPED";
const char* const STR_BACK = "BACK TO MAIN";
const char* const STR_EUC_STEPS = "EUCLID STEPS";
const char* const STR_EUC_HITS = "EUCLID HITS";
// Helper function to draw centered text // Helper function to draw centered text
void drawCenteredText(const char* text, int y, const uint8_t* font) { void drawCenteredText(const char* text, int y, const uint8_t* font) {
gravity.display.setFont(font); gravity.display.setFont(font);
@ -254,27 +238,27 @@ void DisplayMainPage() {
case PARAM_MAIN_TEMPO: case PARAM_MAIN_TEMPO:
// Serial MIDI is too unstable to display bpm in real time. // Serial MIDI is too unstable to display bpm in real time.
if (app.selected_source == Clock::SOURCE_EXTERNAL_MIDI) { if (app.selected_source == Clock::SOURCE_EXTERNAL_MIDI) {
mainText = STR_EXT; mainText = F("EXT");
} else { } else {
mainText = String(gravity.clock.Tempo()); mainText = String(gravity.clock.Tempo());
} }
subText = F("BPM"); subText = F("BPM");
break; break;
case PARAM_MAIN_SOURCE: case PARAM_MAIN_SOURCE:
mainText = STR_EXT; mainText = F("EXT");
switch (app.selected_source) { switch (app.selected_source) {
case Clock::SOURCE_INTERNAL: case Clock::SOURCE_INTERNAL:
mainText = F("INT"); mainText = F("INT");
subText = F("CLOCK"); subText = F("CLOCK");
break; break;
case Clock::SOURCE_EXTERNAL_PPQN_24: case Clock::SOURCE_EXTERNAL_PPQN_24:
subText = STR_24_PPQN; subText = F("24 PPQN");
break; break;
case Clock::SOURCE_EXTERNAL_PPQN_4: case Clock::SOURCE_EXTERNAL_PPQN_4:
subText = STR_4_PPQN; subText = F("4 PPQN");
break; break;
case Clock::SOURCE_EXTERNAL_PPQN_1: case Clock::SOURCE_EXTERNAL_PPQN_1:
subText = STR_1_PPQN; subText = F("1 PPQN");
break; break;
case Clock::SOURCE_EXTERNAL_MIDI: case Clock::SOURCE_EXTERNAL_MIDI:
subText = F("MIDI"); subText = F("MIDI");
@ -285,13 +269,13 @@ void DisplayMainPage() {
mainText = F("RUN"); mainText = F("RUN");
switch (app.cv_run) { switch (app.cv_run) {
case 0: case 0:
subText = STR_NONE; subText = F("NONE");
break; break;
case 1: case 1:
subText = STR_CV_1; subText = F("CV 1");
break; break;
case 2: case 2:
subText = STR_CV_2; subText = F("CV 2");
break; break;
} }
break; break;
@ -299,13 +283,13 @@ void DisplayMainPage() {
mainText = F("RST"); mainText = F("RST");
switch (app.cv_reset) { switch (app.cv_reset) {
case 0: case 0:
subText = STR_NONE; subText = F("NONE");
break; break;
case 1: case 1:
subText = STR_CV_1; subText = F("CV 1");
break; break;
case 2: case 2:
subText = STR_CV_2; subText = F("CV 2");
break; break;
} }
break; break;
@ -316,29 +300,29 @@ void DisplayMainPage() {
subText = F("PULSE OFF"); subText = F("PULSE OFF");
break; break;
case Clock::PULSE_PPQN_24: case Clock::PULSE_PPQN_24:
subText = STR_24_PPQN; subText = F("24 PPQN PULSE");
break; break;
case Clock::PULSE_PPQN_4: case Clock::PULSE_PPQN_4:
subText = STR_4_PPQN; subText = F("4 PPQN PULSE");
break; break;
case Clock::PULSE_PPQN_1: case Clock::PULSE_PPQN_1:
subText = STR_1_PPQN; subText = F("1 PPQN PULSE");
break; break;
} }
break; break;
case PARAM_MAIN_ENCODER_DIR: case PARAM_MAIN_ENCODER_DIR:
mainText = F("DIR"); mainText = F("DIR");
subText = app.selected_sub_param == 0 ? STR_DEFAULT : STR_REVERSED; subText = app.selected_sub_param == 0 ? F("DEFAULT") : F("REVERSED");
break; break;
case PARAM_MAIN_ROTATE_DISP: case PARAM_MAIN_ROTATE_DISP:
mainText = F("ROT"); mainText = F("ROT");
subText = app.selected_sub_param == 0 ? STR_DEFAULT : STR_FLIPPED; subText = app.selected_sub_param == 0 ? F("DEFAULT") : F("FLIPPED");
break; break;
case PARAM_MAIN_SAVE_DATA: case PARAM_MAIN_SAVE_DATA:
case PARAM_MAIN_LOAD_DATA: case PARAM_MAIN_LOAD_DATA:
if (app.selected_sub_param == StateManager::MAX_SAVE_SLOTS) { if (app.selected_sub_param == StateManager::MAX_SAVE_SLOTS) {
mainText = STR_X; mainText = F("x");
subText = STR_BACK; subText = F("BACK TO MAIN");
} else { } else {
// Indicate currently active slot. // Indicate currently active slot.
if (app.selected_sub_param == app.selected_save_slot) { if (app.selected_sub_param == app.selected_save_slot) {
@ -355,8 +339,8 @@ void DisplayMainPage() {
mainText = F("DEL"); mainText = F("DEL");
subText = F("FACTORY RESET"); subText = F("FACTORY RESET");
} else { } else {
mainText = STR_X; mainText = F("x");
subText = STR_BACK; subText = F("BACK TO MAIN");
} }
break; break;
} }
@ -387,7 +371,7 @@ void DisplayChannelPage() {
switch (app.selected_param) { switch (app.selected_param) {
case PARAM_CH_MOD: { case PARAM_CH_MOD: {
int mod_value = withCvMod ? ch.getClockModWithMod(cv1, cv2): ch.getClockMod(); int mod_value = withCvMod ? ch.getClockModWithMod(cv1, cv2) : ch.getClockMod();
if (mod_value > 1) { if (mod_value > 1) {
mainText = F("/"); mainText = F("/");
mainText += String(mod_value); mainText += String(mod_value);
@ -415,16 +399,16 @@ void DisplayChannelPage() {
ch.getSwing() == 50 ch.getSwing() == 50
? mainText = F("OFF") ? mainText = F("OFF")
: mainText = String(withCvMod ? ch.getSwingWithMod(cv1, cv2) : ch.getSwing()) + F("%"); : mainText = String(withCvMod ? ch.getSwingWithMod(cv1, cv2) : ch.getSwing()) + F("%");
subText = F("DOWN BEAT"); subText = "DOWN BEAT";
swingDivisionMark(); swingDivisionMark();
break; break;
case PARAM_CH_EUC_STEPS: case PARAM_CH_EUC_STEPS:
mainText = String(withCvMod ? ch.getStepsWithMod(cv1, cv2) : ch.getSteps()); mainText = String(withCvMod ? ch.getStepsWithMod(cv1, cv2) : ch.getSteps());
subText = STR_EUC_STEPS; subText = "EUCLID STEPS";
break; break;
case PARAM_CH_EUC_HITS: case PARAM_CH_EUC_HITS:
mainText = String(withCvMod ? ch.getHitsWithMod(cv1, cv2) : ch.getHits()); mainText = String(withCvMod ? ch.getHitsWithMod(cv1, cv2) : ch.getHits());
subText = STR_EUC_HITS; subText = "EUCLID HITS";
break; break;
case PARAM_CH_CV1_DEST: case PARAM_CH_CV1_DEST:
case PARAM_CH_CV2_DEST: { case PARAM_CH_CV2_DEST: {
@ -449,10 +433,10 @@ void DisplayChannelPage() {
subText = F("SWING"); subText = F("SWING");
break; break;
case CV_DEST_EUC_STEPS: case CV_DEST_EUC_STEPS:
subText = STR_EUC_STEPS; subText = F("EUCLID STEPS");
break; break;
case CV_DEST_EUC_HITS: case CV_DEST_EUC_HITS:
subText = STR_EUC_HITS; subText = F("EUCLID HITS");
break; break;
} }
break; break;
@ -515,22 +499,4 @@ void UpdateDisplay() {
} while (gravity.display.nextPage()); } while (gravity.display.nextPage());
} }
void Bootsplash() {
gravity.display.firstPage();
do {
int textWidth;
String loadingText = F("LOADING....");
gravity.display.setFont(TEXT_FONT);
textWidth = gravity.display.getStrWidth(StateManager::SKETCH_NAME);
gravity.display.drawStr(16 + (textWidth / 2), 20, StateManager::SKETCH_NAME);
textWidth = gravity.display.getStrWidth(StateManager::SEMANTIC_VERSION);
gravity.display.drawStr(16 + (textWidth / 2), 32, StateManager::SEMANTIC_VERSION);
textWidth = gravity.display.getStrWidth(loadingText.c_str());
gravity.display.drawStr(26 + (textWidth / 2), 44, loadingText.c_str());
} while (gravity.display.nextPage());
}
#endif // DISPLAY_H #endif // DISPLAY_H

3
firmware/Gravity/save_state.cpp
View File

@ -17,7 +17,7 @@
// Define the constants for the current firmware. // Define the constants for the current firmware.
const char StateManager::SKETCH_NAME[] = "ALT GRAVITY"; const char StateManager::SKETCH_NAME[] = "ALT GRAVITY";
const char StateManager::SEMANTIC_VERSION[] = "V2.0.0BETA4"; // NOTE: This should match the version in the library.properties file. const char StateManager::SEMANTIC_VERSION[] = "2.0.1"; // NOTE: This should match the version in the library.properties file.
// Number of available save slots. // Number of available save slots.
const byte StateManager::MAX_SAVE_SLOTS = 10; const byte StateManager::MAX_SAVE_SLOTS = 10;
@ -212,6 +212,7 @@ void StateManager::_saveMetadata(const AppState& app) {
// Global user settings // Global user settings
current_meta.selected_save_slot = app.selected_save_slot; current_meta.selected_save_slot = app.selected_save_slot;
current_meta.encoder_reversed = app.encoder_reversed; current_meta.encoder_reversed = app.encoder_reversed;
current_meta.rotate_display = app.rotate_display;
EEPROM.put(METADATA_START_ADDR, current_meta); EEPROM.put(METADATA_START_ADDR, current_meta);
interrupts(); interrupts();

5
firmware/Gravity/save_state.h
View File

@ -52,11 +52,12 @@ class StateManager {
// This struct holds the data that identifies the firmware version. // This struct holds the data that identifies the firmware version.
struct Metadata { struct Metadata {
char sketch_name[16]; char sketch_name[12];
char version[16]; char version[5];
// Additional global/hardware settings // Additional global/hardware settings
byte selected_save_slot; byte selected_save_slot;
bool encoder_reversed; bool encoder_reversed;
bool rotate_display;
}; };
struct ChannelState { struct ChannelState {
byte base_clock_mod_index; byte base_clock_mod_index;