From a15f11ca412c533cf2012806359abc28e1f9a788 Mon Sep 17 00:00:00 2001
From: Tyson <tysonlt@gmail.com>
Date: Sun, 10 Feb 2019 18:47:13 +1100
Subject: [PATCH] Add debug statements

---
 src/AxeSystem.cpp          | 14 +++++++++++++-
 src/AxeSystem.h            |  4 ++++
 src/AxeSystem_Handlers.cpp | 36 ++++++++++++++++++++++++------------
 src/AxeSystem_Midi.cpp     | 15 ++++-----------
 4 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/src/AxeSystem.cpp b/src/AxeSystem.cpp
index a04e4df..c53e417 100644
--- a/src/AxeSystem.cpp
+++ b/src/AxeSystem.cpp
@@ -71,4 +71,16 @@ void AxeSystem::intToMidiBytes(const int number, byte *byte1, byte *byte2) {
 
 int AxeSystem::midiBytesToInt(const byte lsb, const byte msb) {
 	return lsb + (msb * BANK_SIZE);
-}
\ No newline at end of file
+}
+
+#ifdef AXE_DEBUG_SYSEX
+void AxeSystem::debugSysex(const byte *sysex, const byte length, const char *message) {
+	char buf[6];
+	DEBUGGER.print(message);
+	for (byte i=0; i<length; i++) {
+		snprintf(buf, 6, "0x%02X ", sysex[i]);
+		DEBUGGER.print(buf);
+	}
+	DEBUGGER.println();
+}
+#endif
\ No newline at end of file
diff --git a/src/AxeSystem.h b/src/AxeSystem.h
index cf08259..ad4fe53 100644
--- a/src/AxeSystem.h
+++ b/src/AxeSystem.h
@@ -185,6 +185,10 @@ class AxeSystem {
 		int midiBytesToInt(const byte, const byte);
 		bool filterChannel(byte message);
 
+		#ifdef AXE_DEBUG_SYSEX
+		void debugSysex(const byte *sysex, const byte length, const char *message);
+		#endif
+
 		AxePreset _preset, _incomingPreset;
 		AxeLooper _looper;
 		Version _firmwareVersion;
diff --git a/src/AxeSystem_Handlers.cpp b/src/AxeSystem_Handlers.cpp
index 18a1c5f..319f703 100644
--- a/src/AxeSystem_Handlers.cpp
+++ b/src/AxeSystem_Handlers.cpp
@@ -21,14 +21,7 @@ void AxeSystem::onSystemExclusive(const byte *sysex, const byte length) {
 	_lastSysexResponse = millis();
 
 	#ifdef AXE_DEBUG_SYSEX
-	char b[100];
-	snprintf(b, 100, "AxeSystem::onSystemExclusive(0x%02X): ", sysex[5]);
-	DEBUGGER.print(b);
-	for (byte i=1; i<length-1; i++) {
-		snprintf(b, 6, "0x%02X ", sysex[i]);
-		DEBUGGER.print(b);
-	}
-	DEBUGGER.println();
+	debugSysex(sysex, length, "<- AxeSystem::onSystemExclusive(): ");
 	#endif
 
 	switch (sysex[5]) {
@@ -52,7 +45,14 @@ void AxeSystem::onSystemExclusive(const byte *sysex, const byte length) {
 				requestSceneName();
 				requestEffectDetails();
 				checkIncomingPreset();
-			}
+			} else {
+				#ifdef AXE_DEBUG
+				DEBUGGER.print("Dropping stale preset name packet ");
+				DEBUGGER.print(number);
+				DEBUGGER.print(", waiting for ");
+				DEBUGGER.println(_incomingPreset.getPresetNumber());
+				#endif
+			} 
 			break;
 		}
 
@@ -67,7 +67,11 @@ void AxeSystem::onSystemExclusive(const byte *sysex, const byte length) {
 				_incomingPreset.copySceneName(buffer, max); //copy back out in case preset changed it
 				callSceneNameCallback(number, (const char*) buffer, max);
 				checkIncomingPreset();
-			}
+			} else {
+				#ifdef AXE_DEBUG
+				DEBUGGER.println("Ignoring SYSEX_REQUEST_SCENE_INFO, preset already complete");
+				#endif
+			} 
 			break;
 		}
 
@@ -76,7 +80,11 @@ void AxeSystem::onSystemExclusive(const byte *sysex, const byte length) {
 			if (!_incomingPreset.isComplete()) { //TODO is this necessary given guard in preset name case?
 				_incomingPreset.setSceneNumber(sysex[6] + 1);
 				checkIncomingPreset();
-			}
+			} else {
+				#ifdef AXE_DEBUG
+				DEBUGGER.println("Ignoring SYSEX_REQUEST_SCENE_NUMBER, preset already complete");
+				#endif
+			} 
 			break;
 		}
 
@@ -86,7 +94,11 @@ void AxeSystem::onSystemExclusive(const byte *sysex, const byte length) {
 				processEffectDump(sysex, length);
 				callEffectsReceivedCallback(&_incomingPreset);
 				checkIncomingPreset();
-			}
+			} else {
+				#ifdef AXE_DEBUG
+				DEBUGGER.println("Ignoring SYSEX_EFFECT_DUMP, preset already complete");
+				#endif
+			} 
 			break;
 		}
 
diff --git a/src/AxeSystem_Midi.cpp b/src/AxeSystem_Midi.cpp
index e407c8a..259a42f 100644
--- a/src/AxeSystem_Midi.cpp
+++ b/src/AxeSystem_Midi.cpp
@@ -1,4 +1,4 @@
-#include <AxeSystem.h>
+#include "AxeSystem.h"
 
 #define SER_AVLB _serial->available()
 #define SER_READ _serial->read()
@@ -98,6 +98,9 @@ void AxeSystem::sendSysEx(const byte *sysex, const byte length) {
 	for (byte i=0; i<length; i++) {
 		SER_SEND(sysex[i]);
 	}
+	#ifdef AXE_DEBUG_SYSEX     
+	debugSysex(sysex, length, "-> AxeSystem::sendSysEx():         ");
+	#endif
 }
 
 void AxeSystem::sendCommand(const byte command) {
@@ -135,16 +138,6 @@ void AxeSystem::sendCommand(const byte command, const byte *data, const byte par
 	//punch it!
 	sendSysEx(sysex, length);
 
-	#ifdef AXE_DEBUG_SYSEX
-	char buf[6];
-	Serial.print("SYSEX OUT: ");
-	for (byte i=0; i<length; i++) {
-		snprintf(buf, 6, "0x%02X ", sysex[i]);
-		Serial.print(buf);
-	}
-	Serial.println();
-	#endif
-
 }
 
 bool AxeSystem::isAxeSysEx(const byte *sysex, const byte length) {