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

add rotate display option

Browse Source
This commit is contained in:
Adam Wonak
2025-08-09 18:33:28 -07:00
parent 7c02628403
commit b7f3520560
4 changed files with 80 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
firmware/Gravity/Gravity.ino
View File

@ -213,31 +213,36 @@ void HandleEncoderPressed() {
// Check if leaving editing mode should apply a selection. // Check if leaving editing mode should apply a selection.
if (app.editing_param) { if (app.editing_param) {
if (app.selected_channel == 0) { // main page if (app.selected_channel == 0) { // main page
// TODO: rewrite as switch switch (app.selected_param) {
if (app.selected_param == PARAM_MAIN_ENCODER_DIR) { case PARAM_MAIN_ENCODER_DIR:
app.encoder_reversed = app.selected_sub_param == 1; app.encoder_reversed = app.selected_sub_param == 1;
gravity.encoder.SetReverseDirection(app.encoder_reversed); gravity.encoder.SetReverseDirection(app.encoder_reversed);
} break;
if (app.selected_param == PARAM_MAIN_SAVE_DATA) { case PARAM_MAIN_ROTATE_DISP:
if (app.selected_sub_param < StateManager::MAX_SAVE_SLOTS) { app.rotate_display = app.selected_sub_param == 1;
app.selected_save_slot = app.selected_sub_param; gravity.display.setFlipMode(app.rotate_display ? 1 : 0);
stateManager.saveData(app); break;
} case PARAM_MAIN_SAVE_DATA:
} if (app.selected_sub_param < StateManager::MAX_SAVE_SLOTS) {
if (app.selected_param == PARAM_MAIN_LOAD_DATA) { app.selected_save_slot = app.selected_sub_param;
if (app.selected_sub_param < StateManager::MAX_SAVE_SLOTS) { stateManager.saveData(app);
app.selected_save_slot = app.selected_sub_param; }
stateManager.loadData(app, app.selected_save_slot); break;
InitGravity(app); case PARAM_MAIN_LOAD_DATA:
} if (app.selected_sub_param < StateManager::MAX_SAVE_SLOTS) {
} app.selected_save_slot = app.selected_sub_param;
if (app.selected_param == PARAM_MAIN_FACTORY_RESET) { stateManager.loadData(app, app.selected_save_slot);
if (app.selected_sub_param == 0) { // Erase InitGravity(app);
// Show bootsplash during slow erase operation. }
Bootsplash(); break;
stateManager.factoryReset(app); case PARAM_MAIN_FACTORY_RESET:
InitGravity(app); if (app.selected_sub_param == 0) { // Erase
} // Show bootsplash during slow erase operation.
Bootsplash();
stateManager.factoryReset(app);
InitGravity(app);
}
break;
} }
} }
// Only mark dirty and reset selected_sub_param when leaving editing mode. // Only mark dirty and reset selected_sub_param when leaving editing mode.
@ -313,6 +318,7 @@ void editMainParameter(int val) {
} }
// These changes are applied upon encoder button press. // These changes are applied upon encoder button press.
case PARAM_MAIN_ENCODER_DIR: case PARAM_MAIN_ENCODER_DIR:
case PARAM_MAIN_ROTATE_DISP:
updateSelection(app.selected_sub_param, val, 2); updateSelection(app.selected_sub_param, val, 2);
break; break;
case PARAM_MAIN_SAVE_DATA: case PARAM_MAIN_SAVE_DATA:

1
firmware/Gravity/app_state.h
View File

@ -31,6 +31,7 @@ struct AppState {
Clock::Pulse selected_pulse = Clock::PULSE_PPQN_24; Clock::Pulse selected_pulse = Clock::PULSE_PPQN_24;
bool editing_param = false; bool editing_param = false;
bool encoder_reversed = false; bool encoder_reversed = false;
bool rotate_display = false;
bool refresh_screen = true; bool refresh_screen = true;
}; };

74
firmware/Gravity/display.h
View File

@ -104,6 +104,7 @@ enum ParamsMainPage : uint8_t {
PARAM_MAIN_RESET, PARAM_MAIN_RESET,
PARAM_MAIN_PULSE, PARAM_MAIN_PULSE,
PARAM_MAIN_ENCODER_DIR, PARAM_MAIN_ENCODER_DIR,
PARAM_MAIN_ROTATE_DISP,
PARAM_MAIN_SAVE_DATA, PARAM_MAIN_SAVE_DATA,
PARAM_MAIN_LOAD_DATA, PARAM_MAIN_LOAD_DATA,
PARAM_MAIN_FACTORY_RESET, PARAM_MAIN_FACTORY_RESET,
@ -124,6 +125,22 @@ 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);
@ -237,30 +254,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 = F("EXT"); mainText = STR_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 = F("EXT"); mainText = STR_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 = F("24 PPQN"); subText = STR_24_PPQN;
break; break;
case Clock::SOURCE_EXTERNAL_PPQN_4: case Clock::SOURCE_EXTERNAL_PPQN_4:
subText = F("4 PPQN"); subText = STR_4_PPQN;
break;
case Clock::SOURCE_EXTERNAL_PPQN_2:
subText = F("2 PPQN");
break; break;
case Clock::SOURCE_EXTERNAL_PPQN_1: case Clock::SOURCE_EXTERNAL_PPQN_1:
subText = F("1 PPQN"); subText = STR_1_PPQN;
break; break;
case Clock::SOURCE_EXTERNAL_MIDI: case Clock::SOURCE_EXTERNAL_MIDI:
subText = F("MIDI"); subText = F("MIDI");
@ -271,13 +285,13 @@ void DisplayMainPage() {
mainText = F("RUN"); mainText = F("RUN");
switch (app.cv_run) { switch (app.cv_run) {
case 0: case 0:
subText = F("NONE"); subText = STR_NONE;
break; break;
case 1: case 1:
subText = F("CV 1"); subText = STR_CV_1;
break; break;
case 2: case 2:
subText = F("CV 2"); subText = STR_CV_2;
break; break;
} }
break; break;
@ -285,13 +299,13 @@ void DisplayMainPage() {
mainText = F("RST"); mainText = F("RST");
switch (app.cv_reset) { switch (app.cv_reset) {
case 0: case 0:
subText = F("NONE"); subText = STR_NONE;
break; break;
case 1: case 1:
subText = F("CV 1"); subText = STR_CV_1;
break; break;
case 2: case 2:
subText = F("CV 2"); subText = STR_CV_2;
break; break;
} }
break; break;
@ -302,25 +316,29 @@ void DisplayMainPage() {
subText = F("PULSE OFF"); subText = F("PULSE OFF");
break; break;
case Clock::PULSE_PPQN_24: case Clock::PULSE_PPQN_24:
subText = F("24 PPQN PULSE"); subText = STR_24_PPQN;
break; break;
case Clock::PULSE_PPQN_4: case Clock::PULSE_PPQN_4:
subText = F("4 PPQN PULSE"); subText = STR_4_PPQN;
break; break;
case Clock::PULSE_PPQN_1: case Clock::PULSE_PPQN_1:
subText = F("1 PPQN PULSE"); subText = STR_1_PPQN;
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 ? F("DEFAULT") : F("REVERSED"); subText = app.selected_sub_param == 0 ? STR_DEFAULT : STR_REVERSED;
break;
case PARAM_MAIN_ROTATE_DISP:
mainText = F("ROT");
subText = app.selected_sub_param == 0 ? STR_DEFAULT : STR_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 = F("x"); mainText = STR_X;
subText = F("BACK TO MAIN"); subText = STR_BACK;
} 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) {
@ -337,8 +355,8 @@ void DisplayMainPage() {
mainText = F("DEL"); mainText = F("DEL");
subText = F("FACTORY RESET"); subText = F("FACTORY RESET");
} else { } else {
mainText = F("x"); mainText = STR_X;
subText = F("BACK TO MAIN"); subText = STR_BACK;
} }
break; break;
} }
@ -347,7 +365,7 @@ void DisplayMainPage() {
drawCenteredText(subText.c_str(), SUB_TEXT_Y, TEXT_FONT); drawCenteredText(subText.c_str(), SUB_TEXT_Y, TEXT_FONT);
// Draw Main Page menu items // Draw Main Page menu items
String menu_items[PARAM_MAIN_LAST] = {F("TEMPO"), F("SOURCE"), F("CLK RUN"), F("CLK RESET"), F("PULSE OUT"), F("ENCODER DIR"), F("SAVE"), F("LOAD"), F("ERASE")}; String menu_items[PARAM_MAIN_LAST] = {F("TEMPO"), F("SOURCE"), F("CLK RUN"), F("CLK RESET"), F("PULSE OUT"), F("ENCODER DIR"), F("ROTATE DISP"), F("SAVE"), F("LOAD"), F("ERASE")};
drawMenuItems(menu_items, PARAM_MAIN_LAST); drawMenuItems(menu_items, PARAM_MAIN_LAST);
} }
@ -397,16 +415,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 = "DOWN BEAT"; subText = F("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 = "EUCLID STEPS"; subText = STR_EUC_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 = "EUCLID HITS"; subText = STR_EUC_HITS;
break; break;
case PARAM_CH_CV1_DEST: case PARAM_CH_CV1_DEST:
case PARAM_CH_CV2_DEST: { case PARAM_CH_CV2_DEST: {
@ -431,10 +449,10 @@ void DisplayChannelPage() {
subText = F("SWING"); subText = F("SWING");
break; break;
case CV_DEST_EUC_STEPS: case CV_DEST_EUC_STEPS:
subText = F("EUCLID STEPS"); subText = STR_EUC_STEPS;
break; break;
case CV_DEST_EUC_HITS: case CV_DEST_EUC_HITS:
subText = F("EUCLID HITS"); subText = STR_EUC_HITS;
break; break;
} }
break; break;

9
src/clock.h
View File

@ -35,7 +35,6 @@ class Clock {
SOURCE_INTERNAL, SOURCE_INTERNAL,
SOURCE_EXTERNAL_PPQN_24, SOURCE_EXTERNAL_PPQN_24,
SOURCE_EXTERNAL_PPQN_4, SOURCE_EXTERNAL_PPQN_4,
SOURCE_EXTERNAL_PPQN_2,
SOURCE_EXTERNAL_PPQN_1, SOURCE_EXTERNAL_PPQN_1,
SOURCE_EXTERNAL_MIDI, SOURCE_EXTERNAL_MIDI,
SOURCE_LAST, SOURCE_LAST,
@ -43,9 +42,9 @@ class Clock {
enum Pulse { enum Pulse {
PULSE_NONE, PULSE_NONE,
PULSE_PPQN_1,
PULSE_PPQN_4,
PULSE_PPQN_24, PULSE_PPQN_24,
PULSE_PPQN_4,
PULSE_PPQN_1,
PULSE_LAST, PULSE_LAST,
}; };
@ -98,10 +97,6 @@ class Clock {
uClock.setClockMode(uClock.EXTERNAL_CLOCK); uClock.setClockMode(uClock.EXTERNAL_CLOCK);
uClock.setInputPPQN(uClock.PPQN_4); uClock.setInputPPQN(uClock.PPQN_4);
break; break;
case SOURCE_EXTERNAL_PPQN_2:
uClock.setClockMode(uClock.EXTERNAL_CLOCK);
uClock.setInputPPQN(uClock.PPQN_2);
break;
case SOURCE_EXTERNAL_PPQN_1: case SOURCE_EXTERNAL_PPQN_1:
uClock.setClockMode(uClock.EXTERNAL_CLOCK); uClock.setClockMode(uClock.EXTERNAL_CLOCK);
uClock.setInputPPQN(uClock.PPQN_1); uClock.setInputPPQN(uClock.PPQN_1);