support MIDI channel masking

add info text using teensy

Author: marcel-licence

src/audio_module.h

@@ -290,9 +290,11 @@ static int16_t *queueTransmitBuffer2;
 
 void Teensy_Setup()
 {
-#ifdef LED_PIN
-    pinMode(ledPin, OUTPUT);
-#endif
+    Serial.printf("Teensy Setup\n");
+    Serial.printf("\tBCK: 21\n");
+    Serial.printf("\tLRCK: 20\n");
+    Serial.printf("\tSDOUT: 7\n");
+    Serial.printf("AudoBlockSamples: %d\n", AUDIO_BLOCK_SAMPLES);
     Midi_Setup();
 }
 

src/midi_interface.h

@@ -35,9 +35,6 @@
  *
  * @brief This file contains an implementation of a simple MIDI interpreter to parse incoming messages
  *
- * MIDI_DUMP_Serial1_TO_SERIAL <- when active received data will be output as hex on serial(1)
- * MIDI_SERIAL1_BAUDRATE <- use define to override baud-rate for MIDI, otherwise default of 31250 will be used
- *
  * @see https://www.midi.org/specifications-old/item/table-1-summary-of-midi-message
  */
 
@@ -50,8 +47,15 @@
 #ifdef ML_SYNTH_INLINE_DECLARATION
 
 
-void Midi_Setup();
-void Midi_Process();
+#define MIDI_CHANNEL_MASK   0x10
+#define MIDI_CHANNEL_0      0x01
+#define MIDI_CHANNEL_1      0x02
+#define MIDI_CHANNEL_2      0x04
+#define MIDI_CHANNEL_3      0x08
+
+
+void Midi_Setup(void);
+void Midi_Process(void);
 
 #ifdef MIDI_VIA_USB_ENABLED
 void Midi_HandleShortMsg(uint8_t *data, uint8_t cable __attribute__((unused)));
@@ -60,10 +64,18 @@ void Midi_HandleShortMsgEx(uint8_t *data, uint8_t cable __attribute__((unused)))
 
 #ifdef MIDI_TX2_PIN
 void Midi_SendShortMessage(uint8_t *msg);
+#endif
+
+#ifdef MIDI_SYSEX_ENABLED
+void Midi_HandleSysEx(uint8_t *buf, uint8_t len);
+#endif
+
 #ifndef ARDUINO_SEEED_XIAO_M0
 #ifndef SWAP_SERIAL
+#ifdef MIDI_TX2_PIN
+void Midi_SendShortMessage(uint8_t *msg);
 void Midi_SendRaw(uint8_t *msg);
-#endif
+#endif /* MIDI_TX2_PIN */
 #endif
 #endif
 
@@ -108,6 +120,10 @@ void Midi_SendRaw(uint8_t *msg);
 #define MIDI_PORT2_ACTIVE
 #endif
 
+#ifdef MIDI_SYSEX_ENABLED
+#define MIDI_SYSEX_MAX  256
+#endif
+
 #if (defined ARDUINO_RASPBERRY_PI_PICO) || (defined ARDUINO_GENERIC_RP2040)
 #define PIN_CAPTION "GP"
 #elif (defined ESP32)
@@ -123,22 +139,22 @@ struct midi_port_s
     uint32_t inMsgWd ;
     uint8_t inMsg[3];
     uint8_t inMsgIndex ;
+
+#ifdef MIDI_SYSEX_ENABLED
+    bool sysexIncoming ;
+    uint8_t sysexBuf[MIDI_SYSEX_MAX];
+    uint8_t sysexCnt ;
+#endif
 };
 
-#ifdef ARDUINO_DAISY_SEED
+#if (defined ARDUINO_DAISY_SEED) || (defined STM32H7xx)
 HardwareSerial Serial2(USART1);
 #endif
 
 #if (defined ARDUINO_GENERIC_F407VGTX) // || (defined ARDUINO_DISCO_F407VG)
 HardwareSerial Serial2(USART2); /* PA3 */
 #endif
 
-#if 0
-#ifdef ARDUINO_GENERIC_F407VGTX
-HardwareSerial Serial2(USART3); /* PB11 */
-#endif
-#endif
-
 #ifdef MIDI_PORT_ACTIVE
 struct midi_port_s MidiPort;
 #endif
@@ -270,7 +286,25 @@ inline void Midi_CC_Map(uint8_t channel, uint8_t data1, uint8_t data2, struct mi
 {
     for (int i = 0; i < mapSize; i++)
     {
-        if ((controlMapping[i].channel == channel) && (controlMapping[i].data1 == data1))
+        /*
+         * in case channel and control number matches or
+         * in channel bit 0x10 is set, then the bit of the channel is set too and control number matches
+         */
+#if 0
+        if ((controlMapping[i].channel & 0x10) != 0)
+        {
+            Serial.printf("mask\n");
+            Serial.printf("boold %d\n", (controlMapping[i].channel & (1 << channel)) != 0);
+            Serial.printf("var %d\n", (controlMapping[i].channel & (1 << channel)));
+            Serial.printf("var1 %d\n", controlMapping[i].channel);
+            Serial.printf("var2 %d\n", (1 << channel));
+        }
+#endif
+
+        if (
+            ((controlMapping[i].channel == channel) && (controlMapping[i].data1 == data1))
+            || (((controlMapping[i].channel & 0x10) != 0) && ((controlMapping[i].channel & (1 << channel)) != 0) && (controlMapping[i].data1 == data1))
+        )
         {
             if (controlMapping[i].callback_mid != NULL)
             {
@@ -439,6 +473,11 @@ static void Midi_PortSetup(struct midi_port_s *port)
     port->inMsgWd = 0;
     memset(port->inMsg, 0, sizeof(port->inMsg));
     port->inMsgIndex = 0;
+#ifdef MIDI_SYSEX_ENABLED
+    port->sysexIncoming = false;
+    memset(port->sysexBuf, 0, sizeof(port->sysexBuf));
+    port->sysexCnt = 0;
+#endif
 }
 #endif
 
@@ -479,8 +518,12 @@ void Midi_Setup()
     Serial1.begin(MIDI_SERIAL1_BAUDRATE, SERIAL_8N1, MIDI_RX1_PIN);
 #endif
     pinMode(MIDI_RX1_PIN, INPUT_PULLUP); /* can be connected to open collector output */
+#else
+#ifdef TEENSYDUINO
+    Serial.printf("Setup Serial1 with %d baud with rx: RX1 pin (PIN 0)\n", MIDI_SERIAL1_BAUDRATE);
 #else
     Serial.printf("Setup Serial1 with %d baud with rx: RX1 pin\n", MIDI_SERIAL1_BAUDRATE);
+#endif
     Serial1.begin(MIDI_SERIAL1_BAUDRATE);
 #endif
 
@@ -525,20 +568,27 @@ void Midi_Setup()
     Serial2.begin(MIDI_SERIAL2_BAUDRATE);
 #endif /* MIDI_TX2_PIN */
 
-#else /* MIDI_RX2_PIN */
+#else /* ARDUINO_ARCH_RP2040 */
+
+#ifdef MIDI_RX2_PIN
 #ifdef MIDI_TX2_PIN
     Serial.printf("Setup Serial2 with %d baud with rx: %s%d and tx %s%d\n", MIDI_SERIAL2_BAUDRATE, PIN_CAPTION, MIDI_RX2_PIN, PIN_CAPTION, MIDI_TX2_PIN);
     Serial2.setTX(MIDI_TX2_PIN);
 #else /* MIDI_TX2_PIN */
     Serial.printf("Setup Serial2 with %d baud with rx: %s%d\n", MIDI_SERIAL2_BAUDRATE, PIN_CAPTION, MIDI_RX2_PIN);
 #endif /* MIDI_TX2_PIN */
     Serial2.setRX(MIDI_RX2_PIN);
+#else
+    Serial.printf("Setup Serial2 with %d baud with rx: Serial2.rx\n", MIDI_SERIAL2_BAUDRATE, PIN_CAPTION);
+#endif
     Serial2.begin(MIDI_SERIAL2_BAUDRATE);
-#endif /* MIDI_RX2_PIN */
+
+#endif /* ARDUINO_ARCH_RP2040 */
 
     MidiPort2.serial = &Serial2;
     Midi_PortSetup(&MidiPort2);
     Serial.printf("Setup MidiPort2 using Serial2\n");
+
 #endif /* MIDI_PORT2_ACTIVE */
 
 #ifdef USB_MIDI_ENABLED
@@ -552,13 +602,44 @@ void Midi_CheckMidiPort(struct midi_port_s *port)
     {
         uint8_t incomingByte = port->serial->read();
 
+#ifdef MIDI_SYSEX_ENABLED
+        if (port->sysexIncoming)
+        {
+
+            if (incomingByte == 0xF7)
+            {
+                Serial.printf("SysexDone\n");
+                port->sysexIncoming = false;
+                Midi_HandleSysEx(port->sysexBuf, port->sysexCnt);
+                port->sysexCnt = 0;
+                return;
+            }
+            else
+            {
+                port->sysexBuf[port->sysexCnt] = incomingByte;
+                port->sysexCnt++;
+                return;
+            }
+        }
+#endif
+
 #ifdef MIDI_DUMP_SERIAL2_TO_SERIAL
         Serial.printf("%02x", incomingByte);
 #endif
         /* ignore live messages */
         if ((incomingByte & 0xF0) == 0xF0)
         {
-            Midi_RealTimeMessage(incomingByte);
+#ifdef MIDI_SYSEX_ENABLED
+            if (incomingByte == 0xF0)
+            {
+                Serial.printf("SysexStart\n");
+                port->sysexIncoming = true;
+            }
+            else
+#endif
+            {
+                Midi_RealTimeMessage(incomingByte);
+            }
             return;
         }
 
@@ -616,6 +697,24 @@ void Midi_CheckMidiPort(struct midi_port_s *port)
     }
 }
 
+#ifdef MIDI_SYSEX_ENABLED
+void Midi_HandleSysEx(uint8_t *buf, uint8_t len)
+{
+#ifdef MIDI_SYSEX_DUMP
+    Serial.printf("SysExRecv (%d):\n", len);
+    for (int i = 0; i < len; i++)
+    {
+        Serial.printf("%02x", buf[i]);
+    }
+    Serial.printf("\n");
+#endif
+    if (midiMapping.sysEx != NULL)
+    {
+        midiMapping.sysEx(buf, len);
+    }
+}
+#endif
+
 /*
  * this function should be called continuously to ensure that incoming messages can be processed
  */