Merge pull request #64 from anarkiwi/transnmi

only send nmi on ctrl message.

Author: anarkiwi

vessel.ino

@@ -112,7 +112,16 @@ void inline blink() {
 #else
 #define blink()
 #endif
-
+#define NMI_WRAP(x)                                                            \
+  {                                                                            \
+    if (vesselConfig.nmiEnabled) {                                             \
+      flagPin.write(HIGH);                                                     \
+      x;                                                                       \
+      flagPin.write(LOW);                                                      \
+    } else {                                                                   \
+      x;                                                                       \
+    }                                                                          \
+  }
 class FakeSerial {
 public:
   void begin(int BaudRate __attribute__((unused))) {}
@@ -122,6 +131,13 @@ public:
     outBuf[vesselConfig.outBufReadPtr++] = i;
     ++vesselConfig.pendingOut;
   }
+  inline __attribute__((always_inline)) void ctrl_write(byte i) {
+    write(i);
+    // send NMI on control message or sysex stop.
+    if ((i | 0x80) && (i != midi::MidiType::SystemExclusiveStart)) {
+      NMI_WRAP(blink());
+    }
+  }
   inline __attribute__((always_inline)) unsigned available() { return n; }
 
 private:
@@ -142,16 +158,6 @@ struct VesselSettings : public midi::DefaultSettings {
 
 MIDI_CREATE_CUSTOM_INSTANCE(FakeSerial, fs, MIDI, VesselSettings);
 
-#define NMI_WRAP(x)                                                            \
-  {                                                                            \
-    if (vesselConfig.nmiEnabled) {                                             \
-      flagPin.write(HIGH);                                                     \
-      x;                                                                       \
-      flagPin.write(LOW);                                                      \
-    } else {                                                                   \
-      x;                                                                       \
-    }                                                                          \
-  }
 #define NMI_CMD_WRAP(x)                                                        \
   {                                                                            \
     if (!vesselConfig.nmiStatusOnlyEnabled) {                                  \
@@ -285,7 +291,6 @@ inline bool transparentDrainOutBuf() {
     return true;
   }
   if (transparentUsbMidiRx()) {
-    NMI_WRAP(blink());
     return true;
   }
   return false;

vesselusbmidi.h

@@ -62,7 +62,7 @@ midiEventPacket_t mPacket;
     return packets;                                                            \
   }
 
-USBMIDIRX(transparentUsbMidiRx, PUSHBACK1(fs.write), PUSHBACK2(fs.write),
-          PUSHBACK3(fs.write));
+USBMIDIRX(transparentUsbMidiRx, PUSHBACK1(fs.ctrl_write), PUSHBACK2(fs.ctrl_write),
+          PUSHBACK3(fs.ctrl_write));
 USBMIDIRX(UsbMidiRx, PUSHBACK1(fs.qread), PUSHBACK2(fs.qread),
           PUSHBACK3(fs.qread));