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

switched to NeoHWSerial to fix MIDI-in conflict with inputs. seems to work

Browse Source
This commit is contained in:
Oleksiy
2024-02-06 21:58:30 +02:00
parent 7c5d744789
commit 120ef40ea1
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Software/Gravity/Gravity.ino
View File

@ -4,8 +4,9 @@
#include <EEPROM.h>
#include <U8g2lib.h>
#include <avr/wdt.h>
#include <NeoHWSerial.h>
const char version[5] = "1.1b3";
const char version[5] = "1.1b4";
#define SCREEN_ADDRESS 0x3C
@ -190,7 +191,8 @@ const uint8_t stkL[569] U8G2_FONT_SECTION("stk-l") =
void setup() {
Serial.begin(31250);
NeoSerial.begin(31250);
NeoSerial.attachInterrupt(receiveMIDI);
pinMode(ENC_BTN_PIN, INPUT_PULLUP);
pinMode(START_STOP_BTN_PIN, INPUT_PULLUP);
@ -220,27 +222,26 @@ void setup() {
}
void loop() {
if (masterClockMode == 2) {
receiveMIDI();
} else if (masterClockMode == 1 && extClockPPQN == 1) {
if (masterClockMode == 1 && extClockPPQN == 1) {
calculateBPMTiming();
}
checkInputs();
}
void sendMIDIClock() {
Serial.write(0xF8);
NeoSerial.write(0xF8);
}
void sendMIDIStart() {
Serial.write(0xFA);
NeoSerial.write(0xFA);
}
void sendMIDIStop() {
Serial.write(0xFC);
NeoSerial.write(0xFC);
}
void receiveMIDI() {
if (masterClockMode == 2) {
//if(Serial.available() > 0) {
int msg = Serial.read();
int msg = NeoSerial.read();
if (msg == 0xF8) { //Clock
MIDIClockReceived = true;
} else if (msg == 0xFC) { //stop
@ -249,6 +250,7 @@ void receiveMIDI() {
isPlaying = true;
}
//}
}
}