Merge branch 'master' into sim

This commit is contained in:
Mikael Degerfält 2019-06-23 17:01:16 +02:00
commit 8723bb8706
10 changed files with 136 additions and 86 deletions

View file

@ -26,7 +26,8 @@ extern Adafruit_SSD1306 display;
extern Adafruit_MPR121 touchSensor;
SimWire Wire;
SimSerial Serial;
SimSerial Serial3; //Midi
SimUsbMidi usbMIDI;
static const int scale = 3;