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

Rev 6 #1

Merged
oleksiy merged 37 commits from hardware-rev-4 into main 2024-08-25 12:37:13 +00:00
Conversation 0 Commits 37 Files Changed 120 +39494 -7938
105 changed files with 39494 additions and 7938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4937de026c - Show all commits

8
Software/Gravity/Gravity.ino
View File

@ -6,7 +6,7 @@
#include <avr/wdt.h> #include <avr/wdt.h>
#include <NeoHWSerial.h> #include <NeoHWSerial.h>
const char version[5] = "1.1b4"; const char version[5] = "V:1.1";
#define SCREEN_ADDRESS 0x3C #define SCREEN_ADDRESS 0x3C
@ -238,10 +238,9 @@ void sendMIDIStop() {
NeoSerial.write(0xFC); NeoSerial.write(0xFC);
} }
void receiveMIDI() { void receiveMIDI( uint8_t msg, uint8_t status ) {
if (masterClockMode == 2) { if (masterClockMode == 2) {
//if(Serial.available() > 0) { //int msg = NeoSerial.read();
int msg = NeoSerial.read();
if (msg == 0xF8) { //Clock if (msg == 0xF8) { //Clock
MIDIClockReceived = true; MIDIClockReceived = true;
} else if (msg == 0xFC) { //stop } else if (msg == 0xFC) { //stop
@ -249,7 +248,6 @@ void receiveMIDI() {
} else if (msg == 0xFA || msg == 0xFB) { //start and continue } else if (msg == 0xFA || msg == 0xFB) { //start and continue
isPlaying = true; isPlaying = true;
} }
//}
} }
} }

2
Software/Gravity/Interactions.ino
View File

@ -178,7 +178,7 @@ void checkInputs() {
&& (shiftBtnPushed || menuItemSelected) && (shiftBtnPushed || menuItemSelected)
&& displayTab == 0 && displayTab == 0
&& menuItem == 1) { //Master Clock Mode && menuItem == 1) { //Master Clock Mode
if (masterClockMode == 1 && change == -1) { //Stop when switching from ext to int if (masterClockMode == 1) { // && change == -1) { //Stop when switching from ext to int or to midi
isPlaying = false; isPlaying = false;
} }