inline debug statements

Author: lathoub

src/AppleMIDI_Debug.h

@@ -1,29 +1,31 @@
 #pragma once
 
 #ifdef SerialMon
-namespace {
-static void AM_DBG_SETUP(unsigned long baud) {
+static inline void AM_DBG_SETUP(unsigned long baud) {
   SerialMon.begin(baud);
-  while (!SerialMon);
+  const unsigned long timeout_ms = 2000;
+  const unsigned long start_ms = millis();
+  while (!SerialMon && (millis() - start_ms) < timeout_ms) {
+    // Avoid hard lock on boards without native USB or no host.
+  }
 }
 
 template <typename T>
-static void AM_DBG_PLAIN(T last) {
+static inline void AM_DBG_PLAIN(T last) {
   SerialMon.println(last);
 }
 
 template <typename T, typename... Args>
-static void AM_DBG_PLAIN(T head, Args... tail) {
+static inline void AM_DBG_PLAIN(T head, Args... tail) {
   SerialMon.print(head);
   SerialMon.print(' ');
   AM_DBG_PLAIN(tail...);
 }
 
 template <typename... Args>
-static void AM_DBG(Args... args) {
+static inline void AM_DBG(Args... args) {
   AM_DBG_PLAIN(args...);
 }
-}  // namespace
 #else
 #define AM_DBG_SETUP(...)
 #define AM_DBG_PLAIN(...)

src/rtp_Defs.h

@@ -15,7 +15,7 @@ BEGIN_APPLEMIDI_NAMESPACE
 // first octet
 #define RTP_P_FIELD 0x20
 #define RTP_X_FIELD 0x10
-#define RTP_CC_FIELD 0xF
+#define RTP_CC_FIELD 0x0F
 
 // second octet
 #define RTP_M_FIELD 0x80
@@ -25,7 +25,7 @@ BEGIN_APPLEMIDI_NAMESPACE
 #define PAYLOADTYPE_RTPMIDI 97
 
 /* Version is the first 2 bits of the first octet*/
-#define RTP_VERSION(octet) ((octet) >> 6)
+#define RTP_VERSION(octet) (((octet) >> 6) & 0x03)
 
 /* Padding is the third bit; No need to shift, because true is any value
 other than 0! */