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 +20922 -7936
81 changed files with 20922 additions and 7936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 120ef40ea1 - Show all commits

20
Software/Gravity/Gravity.ino
View File

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