Added 4ppqn ext and new subdivs (24, 32, 64, 128)

This commit is contained in:
2023-11-17 10:20:22 +02:00
parent 3310e6cf66
commit 0f8caee49b
4 changed files with 114 additions and 35 deletions

View File

@ -24,7 +24,7 @@ void updateScreen() {
} else if (masterClockMode == 0 && bpmModulationRange != 0) {
lastMenuItem = 3;
} else if (masterClockMode == 1) {
lastMenuItem = 1;
lastMenuItem = 2;
} else if (masterClockMode == 2) {
lastMenuItem = 1;
}
@ -34,6 +34,8 @@ void updateScreen() {
valueStr = "MODE:";
} else if (i == 2 && masterClockMode == 0) {
valueStr = "MOD:";
} else if (i == 2 && masterClockMode == 1) {
valueStr = "PPQN:";
} else if (i == 3 && masterClockMode == 0) {
valueStr = "RANGE:";
}
@ -62,6 +64,10 @@ void updateScreen() {
valueStr = "CV2";
} else if (i == 2 && masterClockMode == 0 && bpmModulationRange == 0) {
valueStr = "OFF";
} else if (i == 2 && masterClockMode == 1 && extClockPPQN == 0) {
valueStr = "24";
} else if (i == 2 && masterClockMode == 1 && extClockPPQN == 1) {
valueStr = "4";
} else if (i == 3 && bpmModulationRange != 0) {
valueStr = String(bpmModulationRange * 10);
}
@ -82,7 +88,7 @@ void updateScreen() {
if (masterClockMode == 0) {
bpmStr = String(bpm);
} else if (masterClockMode == 1) {
bpmStr = "24";
bpmStr = "EXT";
} else if (masterClockMode == 2) {
bpmStr = "MIDI";
}
@ -109,11 +115,11 @@ void updateScreen() {
}
}
if (masterClockMode == 1) {
if (masterClockMode != 0) { //EXT and MIDI
u8g2.setFont(fabryka);
u8g2.drawButtonUTF8(leftOffset, 28, U8G2_BTN_BW0|U8G2_BTN_HCENTER, width, 0, 0, bpmChar );
u8g2.setFont(velvetscreen);
u8g2.drawButtonUTF8(leftOffset, 40, U8G2_BTN_BW0|U8G2_BTN_HCENTER, width, 0, 2, "PPQN" );
//u8g2.setFont(velvetscreen);
//u8g2.drawButtonUTF8(leftOffset, 40, U8G2_BTN_BW0|U8G2_BTN_HCENTER, width, 0, 2, "PPQN" );
}
}