From 4a99e1e2eac7d2e4b820adc06981d7157a0bf44e Mon Sep 17 00:00:00 2001
From: RobertoHE <rober.herrera92@gmail.com>
Date: Thu, 5 Aug 2021 12:57:14 +0200
Subject: [PATCH] Removed size filter and added runningStatus enable

Previous size filter might add a 2-bytes full midi and other running status (other byte) like a 3-bytes full midi message wrongly. It may cause a bug depending if serial Parser accepts or not running status messages.
This commit removes that previous and unnecessary size filter but it still discriminte the size of message after this point:
https://github.com/lathoub/Arduino-BLE-MIDI/blob/2f48b0f25bf469a8bac42bc5e84107b1f0ddd0c3/test/msvc/ConsoleApplication2.cpp#L78-L91

If #define RUNNINGSTATUS_ENABLE is commented, it will transform all incoming runningStatus messages in full midi messages. Else, it will put in the buffer the same info that it had received (runningStatus will be not transformated).
I recommend not use runningStatus by default. Only use if parser accepts runningStatus and your application has a so high transmission rate.
---
 test/msvc/ConsoleApplication2.cpp | 111 ++++++++++++++++++------------
 1 file changed, 67 insertions(+), 44 deletions(-)

diff --git a/test/msvc/ConsoleApplication2.cpp b/test/msvc/ConsoleApplication2.cpp
index f6faa9e..ffa28de 100644
--- a/test/msvc/ConsoleApplication2.cpp
+++ b/test/msvc/ConsoleApplication2.cpp
@@ -9,6 +9,8 @@ typedef unsigned char byte;
 
 #define CHECK_BIT(var,pos) (!!((var) & (1<<(pos))))
 
+//#define RUNNINGSTATUS_ENABLE
+
 void transmitMIDIonDIN(byte status, byte data1, byte data2)
 {
     std::cout << "0x" << std::hex << (int)status;
@@ -75,57 +77,70 @@ void receive(byte* buffer, size_t length)
             rPtr++;
 
 		if(!runningStatusContinuation){
-			// look at l and r pointers and decode by size.
-			if (rPtr - lPtr < 1) {
-				// Time code or system or "2 bytes" running Message
-				transmitMIDIonDIN(buffer[lPtr], 0, 0);
-			}
-			else if (rPtr - lPtr < 2) {
-				transmitMIDIonDIN(buffer[lPtr], buffer[lPtr + 1], 0);
-			}
-			else if (rPtr - lPtr < 3) {
-				transmitMIDIonDIN(buffer[lPtr], buffer[lPtr + 1], buffer[lPtr + 2]);
-			}
-			else {
-				// Too much data
-				// If not System Common or System Real-Time, send it as running status
+			// If not System Common or System Real-Time, send it as running status
 
-				auto midiType = lastStatus & 0xF0;
-				if (sysExContinuation)
-					midiType = 0xF0;
+			auto midiType = lastStatus & 0xF0;
+			if (sysExContinuation)
+				midiType = 0xF0;
 
-				switch (midiType)
+			switch (midiType)
+			{
+			
+			// 3 bytes
+			case 0x80:
+			case 0x90:
+			case 0xA0:
+			case 0xB0:
+			case 0xE0:
+#ifndef RUNNINGSTATUS_ENABLE
+				for (auto i = lPtr; i < rPtr; i = i + 2)
 				{
-				case 0x80:
-				case 0x90:
-				case 0xA0:
-				case 0xB0:
-				case 0xE0:
-					for (auto i = lPtr; i < rPtr; i = i + 2)
-					{
-						transmitMIDIonDIN(lastStatus, buffer[i + 1], buffer[i + 2]);
-					}
-					break;
-				case 0xC0:
-				case 0xD0:
-					for (auto i = lPtr; i < rPtr; i = i + 1)
-					{
-						transmitMIDIonDIN(lastStatus, buffer[i + 1], 0);
-					}
-					break;
-				case 0xF0:
-					transmitMIDIonDIN(buffer[lPtr], 0, 0);
-					for (auto i = lPtr; i < rPtr; i++)
-						transmitMIDIonDIN(buffer[i + 1], 0, 0);
 
-					break;
-
-				default:
-					break;
+					transmitMIDIonDIN(lastStatus, buffer[i + 1], buffer[i + 2]);
 				}
+#else
+				transmitMIDIonDIN(lastStatus, 0, 0);
+				for (auto i = lPtr; i < rPtr; i = i + 2)
+				{
+
+					transmitMIDIonDIN(buffer[i + 1], buffer[i + 2], 0);
+				}
+#endif
+				break;
+				
+			// 2 bytes
+			case 0xC0:
+			case 0xD0:
+#ifndef RUNNINGSTATUS_ENABLE
+				for (auto i = lPtr; i < rPtr; i = i + 1)
+				{
+					transmitMIDIonDIN(lastStatus, buffer[i + 1], 0);
+				}
+#else
+				transmitMIDIonDIN(lastStatus, 0, 0);
+				for (auto i = lPtr; i < rPtr; i = i + 1)
+				{
+
+					transmitMIDIonDIN(buffer[i + 1], 0 , 0);
+				}
+#endif
+				break;
+			// 1 byte or n bytes
+			case 0xF0:
+				transmitMIDIonDIN(buffer[lPtr], 0, 0);
+				for (auto i = lPtr; i < rPtr; i++)
+					transmitMIDIonDIN(buffer[i + 1], 0, 0);
+
+				break;
+
+			default:
+				break;
 			}
-		}else
+		}
+		else
 		{
+			
+#ifndef RUNNINGSTATUS_ENABLE
 			auto midiType = lastStatus & 0xF0;
             if (sysExContinuation)
                 midiType = 0xF0;
@@ -155,6 +170,14 @@ void receive(byte* buffer, size_t length)
             default:
                 break;
             }
+#else					
+			transmitMIDIonDIN(lastStatus, 0, 0);
+			
+			for (auto i = lPtr; i <= rPtr; i++)
+            {
+                transmitMIDIonDIN(buffer[i], 0, 0);
+            }
+#endif			
 			runningStatusContinuation = false;
 		}