oleksiy/GravityHW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed subdiv bug for random, title in sequencer, sequence erase not only during recording

Browse Source
This commit is contained in:
Oleksiy
2023-12-13 23:35:30 +02:00
parent 3902771d56
commit b7827b87a4
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -11,3 +11,7 @@ Hardware/gtoe/gtoe.kicad_sch-bak
Hardware/gtoe/_autosave-gtoe.kicad_sch Hardware/gtoe/_autosave-gtoe.kicad_sch
Software/Gravity/build/arduino.avr.nano Software/Gravity/build/arduino.avr.nano
Software/Gravity/build/arduino.avr.nano Software/Gravity/build/arduino.avr.nano
Hardware/gtoe/midi-backups
Hardware/gtoe/midi-panel-backups
Hardware/gtoe/MIDI Board REV1.zip
Hardware/gtoe/MIDI Panel REV1.zip

2
Software/Gravity/Gravity.ino
View File

@ -5,7 +5,7 @@
#include <U8g2lib.h> #include <U8g2lib.h>
#include <avr/wdt.h> #include <avr/wdt.h>
const char version[5] = "MIDI Test"; const char version[5] = "v:1.b";
#define SCREEN_ADDRESS 0x3C #define SCREEN_ADDRESS 0x3C

6
Software/Gravity/Interactions.ino
View File

@ -247,8 +247,8 @@ void checkInputs() {
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change; channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change;
if (channels[displayTab - 1].subDiv > 200) { if (channels[displayTab - 1].subDiv > 200) {
channels[displayTab - 1].subDiv = 0; channels[displayTab - 1].subDiv = 0;
} else if (channels[displayTab - 1].subDiv > (sizeof(subDivs) / sizeof(byte)) - 1) { } else if (channels[displayTab - 1].subDiv > (sizeof(subDivs) / sizeof(int)) - 1) {
channels[displayTab - 1].subDiv = (sizeof(subDivs) / sizeof(byte)) - 1; channels[displayTab - 1].subDiv = (sizeof(subDivs) / sizeof(int)) - 1;
} }
if (!isPlaying) { if (!isPlaying) {
calculateCycles(); calculateCycles();
@ -386,7 +386,7 @@ void checkInputs() {
} else if (digitalRead(SHIFT_BTN_PIN) && shiftBtnPushed) { } else if (digitalRead(SHIFT_BTN_PIN) && shiftBtnPushed) {
shiftBtnPushed = false; shiftBtnPushed = false;
shiftReleasedTime = millis(); shiftReleasedTime = millis();
if (shiftReleasedTime - shiftPressedTime > 500 && isRecording) { //&& shiftReleasedTime - shiftPressedTime < 2000 if (shiftReleasedTime - shiftPressedTime > 500) { //&& shiftReleasedTime - shiftPressedTime < 2000
for (byte i = 0; i < 16; i++) { for (byte i = 0; i < 16; i++) {
patternToEdit[i] = 0; patternToEdit[i] = 0;
} }

12
Software/Gravity/UI.ino
View File

@ -274,17 +274,19 @@ void updateScreen() {
} }
} }
//Edit Pattern Screen //Edit Pattern Screen (Sequencer)
else if (displayScreen == 1) { else if (displayScreen == 1) {
u8g2.setFont(velvetscreen);
byte pattern = channels[displayTab - 1].seqPattern; byte pattern = channels[displayTab - 1].seqPattern;
String patStr; String patStr;
if (pattern < 8) { if (pattern < 8) {
patStr = "EDIT PATTERN A" + String(pattern + 1); patStr = "PATTERN A" + String(pattern + 1);
} else { } else {
patStr = "EDIT PATTERN B" + String(pattern - 7); patStr = "PATTERN B" + String(pattern - 7);
} }
char patChar[16]; //patStr = "TEST";
patStr.toCharArray(patChar, 16); char patChar[11];
patStr.toCharArray(patChar, 11);
u8g2.drawButtonUTF8(64, 5, U8G2_BTN_BW1|U8G2_BTN_HCENTER, 128, 0, 2, patChar ); u8g2.drawButtonUTF8(64, 5, U8G2_BTN_BW1|U8G2_BTN_HCENTER, 128, 0, 2, patChar );
for (byte i = 0; i < 8; i++) { for (byte i = 0; i < 8; i++) {
if (patternToEdit[i]) { if (patternToEdit[i]) {