removed AppleMIDI_Debug.h from standard build

lathoub · lathoub · commit 44267dedaa6e · 2021-12-05T17:07:43.000+01:00
bring AppleMIDI_Debug.h explicitly in examples
example define SerialMon for debugging
diff --git a/examples/AVR_Callbacks/AVR_Callbacks.ino b/examples/AVR_Callbacks/AVR_Callbacks.ino
@@ -1,9 +1,10 @@
 #include <Ethernet.h>
 
+#define SerialMon Serial
+#include <AppleMIDI_Debug.h>
+
 #define ONE_PARTICIPANT
 #define USE_EXT_CALLBACKS
-#define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
 #include <AppleMIDI.h>
 
 // Enter a MAC address for your controller below.
diff --git a/examples/AVR_Directory/AVR_Directory.ino b/examples/AVR_Directory/AVR_Directory.ino
@@ -1,8 +1,9 @@
 #include <Ethernet.h>
 
-#define USE_DIRECTORY
 #define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
+#include <AppleMIDI_Debug.h>
+
+#define USE_DIRECTORY
 #include <AppleMIDI.h>
 
 // Enter a MAC address for your controller below.
diff --git a/examples/AVR_E3_NoteOnOffEverySec/AVR_E3_NoteOnOffEverySec.ino b/examples/AVR_E3_NoteOnOffEverySec/AVR_E3_NoteOnOffEverySec.ino
@@ -1,7 +1,8 @@
 #include <Ethernet3.h> // from https://github.com/sstaub/Ethernet3
 
 #define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
+#include <AppleMIDI_Debug.h>
+
 #include <AppleMIDI.h>
 
 // Enter a MAC address for your controller below.
diff --git a/examples/AVR_Initiator/AVR_Initiator.ino b/examples/AVR_Initiator/AVR_Initiator.ino
@@ -1,8 +1,9 @@
 #include <Ethernet.h>
 
-#define APPLEMIDI_INITIATOR
 #define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
+#include <AppleMIDI_Debug.h>
+
+#define APPLEMIDI_INITIATOR
 #include <AppleMIDI.h>
 
 // Enter a MAC address for your controller below.
diff --git a/examples/AVR_MultipleSessions/AVR_MultipleSessions.ino b/examples/AVR_MultipleSessions/AVR_MultipleSessions.ino
@@ -1,7 +1,8 @@
 #include <Ethernet.h>
 
 #define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
+#include <AppleMIDI_Debug.h>
+
 #include <AppleMIDI.h>
 
 // Enter a MAC address for your controller below.
diff --git a/examples/AVR_NonDefaultSession/AVR_NonDefaultSession.ino b/examples/AVR_NonDefaultSession/AVR_NonDefaultSession.ino
@@ -1,7 +1,8 @@
 #include <Ethernet.h>
 
 #define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
+#include <AppleMIDI_Debug.h>
+
 #include <AppleMIDI.h>
 
 // Enter a MAC address for your controller below.
diff --git a/examples/AVR_NoteOnOffEverySec/AVR_NoteOnOffEverySec.ino b/examples/AVR_NoteOnOffEverySec/AVR_NoteOnOffEverySec.ino
@@ -1,7 +1,8 @@
 #include <Ethernet.h>
 
 #define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
+#include <AppleMIDI_Debug.h>
+
 #include <AppleMIDI.h>
 
 // Enter a MAC address for your controller below.
diff --git a/examples/AVR_ReceivedRawMidiData/AVR_ReceivedRawMidiData.ino b/examples/AVR_ReceivedRawMidiData/AVR_ReceivedRawMidiData.ino
@@ -1,8 +1,9 @@
 #include <Ethernet.h>
 
-#define USE_EXT_CALLBACKS
 #define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
+#include <AppleMIDI_Debug.h>
+
+#define USE_EXT_CALLBACKS
 #include <AppleMIDI.h>
 
 // Enter a MAC address for your controller below.
diff --git a/examples/AVR_SysEx/AVR_SysEx.ino b/examples/AVR_SysEx/AVR_SysEx.ino
@@ -1,7 +1,8 @@
 #include <Ethernet.h>
 
 #define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
+#include <AppleMIDI_Debug.h>
+
 #include <AppleMIDI.h>
 
 // Enter a MAC address for your controller below.
diff --git a/examples/ESP32_NoteOnOffEverySec/ESP32_NoteOnOffEverySec.ino b/examples/ESP32_NoteOnOffEverySec/ESP32_NoteOnOffEverySec.ino
@@ -3,7 +3,8 @@
 #include <WiFiUdp.h>
 
 #define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
+#include <AppleMIDI_Debug.h>
+
 #include <AppleMIDI.h>
 
 char ssid[] = "ssid"; //  your network SSID (name)
diff --git a/examples/ESP32_W5500_Callbacks/ESP32_W5500_Callbacks.ino b/examples/ESP32_W5500_Callbacks/ESP32_W5500_Callbacks.ino
@@ -1,9 +1,10 @@
 #include "ETH_Helper.h"
 
+#define SerialMon Serial
+#include <AppleMIDI_Debug.h>
+
 #define ONE_PARTICIPANT
 #define USE_EXT_CALLBACKS
-#define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
 #include <AppleMIDI.h>
 
 unsigned long t1 = millis();
diff --git a/examples/ESP8266_NoteOnOffEverySec/ESP8266_NoteOnOffEverySec.ino b/examples/ESP8266_NoteOnOffEverySec/ESP8266_NoteOnOffEverySec.ino
@@ -3,7 +3,8 @@
 #include <WiFiUdp.h>
 
 #define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
+#include <AppleMIDI_Debug.h>
+
 #include <AppleMIDI.h>
 
 char ssid[] = "ssid"; //  your network SSID (name)
diff --git a/examples/ESP8266_NoteOnOffEverySec_softAP_mDNS/ESP8266_NoteOnOffEverySec_softAP_mDNS.ino b/examples/ESP8266_NoteOnOffEverySec_softAP_mDNS/ESP8266_NoteOnOffEverySec_softAP_mDNS.ino
@@ -12,7 +12,8 @@
 #include <WiFiUdp.h>
 
 #define SerialMon Serial
-#define APPLEMIDI_DEBUG SerialMon
+#include <AppleMIDI_Debug.h>
+
 #include <AppleMIDI.h>
 
 char ssid[] = "ssid"; //  your network SSID (name)
diff --git a/examples/Teensy41_NoteOnOffEverySec/Teensy41_NoteOnOffEverySec.ino b/examples/Teensy41_NoteOnOffEverySec/Teensy41_NoteOnOffEverySec.ino
@@ -1,8 +1,9 @@
 #include <NativeEthernet.h>
 
 #define SerialMon Serial
+#include <AppleMIDI_Debug.h>
+
 #define USE_EXT_CALLBACKS
-#define APPLEMIDI_DEBUG SerialMon
 #include <AppleMIDI.h>
 
 // Enter a MAC address for your controller below.
diff --git a/examples/wESP32_NoteOnOffEverySec/wESP32_NoteOnOffEverySec.ino b/examples/wESP32_NoteOnOffEverySec/wESP32_NoteOnOffEverySec.ino
@@ -1,6 +1,7 @@
 #define SerialMon Serial
+#include <AppleMIDI_Debug.h>
+
 #define USE_EXT_CALLBACKS
-#define APPLEMIDI_DEBUG SerialMon
 #include <AppleMIDI.h>
 
 #include "./ETH_Helper.h"
diff --git a/src/AppleMIDI.h b/src/AppleMIDI.h
@@ -7,8 +7,6 @@ using namespace MIDI_NAMESPACE;
 
 #include <IPAddress.h>
 
-#include "AppleMIDI_Debug.h"
-
 #include "AppleMIDI_PlatformBegin.h"
 #include "AppleMIDI_Defs.h"
 #include "AppleMIDI_Settings.h"
diff --git a/src/AppleMIDI_Debug.h b/src/AppleMIDI_Debug.h
@@ -1,21 +1,21 @@
 #pragma once
 
-#ifdef APPLEMIDI_DEBUG
+#ifdef SerialMon
 namespace {
 static void DBG_SETUP(unsigned long baud) {
-  APPLEMIDI_DEBUG.begin(baud);
-  while (!APPLEMIDI_DEBUG);
+  SerialMon.begin(baud);
+  while (!SerialMon);
 }
 
 template <typename T>
 static void DBG_PLAIN(T last) {
-  APPLEMIDI_DEBUG.println(last);
+  SerialMon.println(last);
 }
 
 template <typename T, typename... Args>
 static void DBG_PLAIN(T head, Args... tail) {
-  APPLEMIDI_DEBUG.print(head);
-  APPLEMIDI_DEBUG.print(' ');
+  SerialMon.print(head);
+  SerialMon.print(' ');
   DBG_PLAIN(tail...);
 }
 
