Oleksiy/GravityFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: Oleksiy:1.2-dev
Branches Tags
Oleksiy:main Oleksiy:1.1.3-beta Oleksiy:1.2-dev Oleksiy:1.1.2-beta
...
pull from: Oleksiy:1.1.2-beta
Branches Tags
Oleksiy:main Oleksiy:1.1.3-beta Oleksiy:1.2-dev Oleksiy:1.1.2-beta

3 Commits
1.2-dev ... 1.1.2-beta

Author SHA1 Message Date
Oleksiy
fb86269b21 1.1.2 2025-03-04 18:00:19 +02:00
Oleksiy
bf01c01ce9 fixed (?) a bug when the sequencer and multipliers were not working correctly with with ext 4ppqn clock 2024-11-29 15:07:42 +02:00
Oleksiy
ecf8e53d1b 1.1.1 final final 1 (hopefuly). Fixed a play indicator bug and added reset after stop to prevent stuck channels 2024-10-20 14:14:21 +03:00
3 changed files with 10 additions and 5 deletions
Expand all files Collapse all files

9
Software/Gravity/Gravity.ino
View File

@ -6,7 +6,7 @@
#include <avr/wdt.h> #include <avr/wdt.h>
#include <NeoHWSerial.h> #include <NeoHWSerial.h>
#define VERSION "V:1.1.1" #define VERSION "V:1.1.2"
byte memCode = 'D'; //Change to different letter if you changed the data structure byte memCode = 'D'; //Change to different letter if you changed the data structure
@ -100,7 +100,6 @@ byte currentStep = 0;
byte stepNumSelected = 0; byte stepNumSelected = 0;
bool *patternToEdit; bool *patternToEdit;
unsigned int channelPulseCount[6]; unsigned int channelPulseCount[6];
unsigned int channelPulsesPerCycle[6]; unsigned int channelPulsesPerCycle[6];
byte sixteenthPulseCount = 0; byte sixteenthPulseCount = 0;
@ -250,8 +249,12 @@ void receiveMIDI( uint8_t msg, uint8_t status ) {
MIDIClockReceived = true; MIDIClockReceived = true;
} else if (msg == 0xFC) { //stop } else if (msg == 0xFC) { //stop
isPlaying = false; isPlaying = false;
resetClocks();
sendMIDIStop();
} else if (msg == 0xFA || msg == 0xFB) { //start and continue } else if (msg == 0xFA || msg == 0xFB) { //start and continue
resetClocks();
isPlaying = true; isPlaying = true;
sendMIDIStart();
} }
} }
} }
@ -529,7 +532,7 @@ void calculateBPMTiming() {
pulsePeriod = 600000 / (calcbpm * PPQN); pulsePeriod = 600000 / (calcbpm * PPQN);
} else if (masterClockMode == 1 && extClockPPQN == 1) { //for ext 1/16 clock (hardcoded) } else if (masterClockMode == 1 && extClockPPQN == 1) { //for ext 1/16 clock (hardcoded)
pulsePeriod = (newExtPulseTime - lastExtPulseTime) / 6; pulsePeriod = ((newExtPulseTime - lastExtPulseTime) * 10) / 6;
} }
} }

3
Software/Gravity/Interactions.ino
View File

@ -371,12 +371,13 @@ void checkInputs() {
if (!digitalRead(START_STOP_BTN_PIN) && !playBtnPushed) { if (!digitalRead(START_STOP_BTN_PIN) && !playBtnPushed) {
if (masterClockMode == 0) { if (masterClockMode == 0) {
calculateBPMTiming(); calculateBPMTiming();
resetClocks();
if (!isPlaying) { if (!isPlaying) {
resetClocks();
isPlaying = true; isPlaying = true;
sendMIDIStart(); sendMIDIStart();
} else { } else {
isPlaying = false; isPlaying = false;
resetClocks();
sendMIDIStop(); sendMIDIStop();
} }
} }

3
Software/Gravity/UI.ino
View File

@ -259,10 +259,11 @@ void updateScreen() {
} }
} }
valueStr = F("t");
if (masterClockMode == 0 && !isPlaying) { if (masterClockMode == 0 && !isPlaying) {
valueStr = F("t");
u8g2.drawUTF8(121, yPos, valueStr.c_str() ); u8g2.drawUTF8(121, yPos, valueStr.c_str() );
} else if (masterClockMode == 0 && isPlaying) { } else if (masterClockMode == 0 && isPlaying) {
valueStr = F("r");
u8g2.drawUTF8(122, yPos, valueStr.c_str() ); u8g2.drawUTF8(122, yPos, valueStr.c_str() );
} }
} }