RP2040, ESP8266

Author: pschatzmann

library.properties

@@ -3,7 +3,7 @@ version=0.1
 author=Phil Schatzmann
 maintainer=Phil Schatzmann <[email protected]>
 sentence=Arduino Audio Tools - Midi Support
-paragraph=Midi over Serial, Bluetooth, BLE and TCP/IP
+paragraph=Midi over Serial, Bluetooth, BLE and TCP/IP, Apple MIDI
 category=Signal Input/Output
 url=https://github.com/pschatzmann/arduino-midi
 architectures=*

src/AppleMidiServer.cpp

@@ -34,7 +34,7 @@ bool AppleMidiServer :: begin(IPAddress adress, int control_port, int data_port_
     setupMDns(control_port);
     applemidi_init((apple_midi_cb_t) applemidi_callback_midi_message_received, (apple_midi_cb_t) applemidi_if_send_udp_datagram);
     int data_port = data_port_opt > 0 ? data_port_opt : control_port+1;
-    MIDI_LOGI("MIDI using address: %s port: %d",adress.toString().c_str(), control_port);
+    MIDI_LOGI("MIDI using address: %s port: %d",toStr(adress), control_port);
     // listen for udp on port
     udpControl.begin(control_port);
     udpData.begin(data_port);
@@ -43,6 +43,13 @@ bool AppleMidiServer :: begin(IPAddress adress, int control_port, int data_port_
     return status>=0;
 }
 
+const char* AppleMidiServer :: toStr(IPAddress &adress){
+    static char networ_str[10];
+    //adress.toString() is not supported on all environemnts
+    sprintf(networ_str,"%u.%u.%u.%u",adress[0],adress[1],adress[2],adress[3]);
+    return networ_str;
+}
+
 void AppleMidiServer :: end(){
     MIDI_LOGI( __PRETTY_FUNCTION__);
     udpControl.stop();

src/AppleMidiServer.h

@@ -73,13 +73,16 @@ class AppleMidiServer : public MidiCommon  {
         virtual void writeData(MidiMessage *msg, int len);
         /// Setup MDNS apple-midi service
         virtual void setupMDns(int port);
+        /// provides the network address as string
+        const char* toStr(IPAddress &adress);
         /// Activate apple midi debug messages
         void setupLogger();
         /// Callback method to parse midi message
         static void applemidi_callback_midi_message_received(uint8_t port, uint32_t timestamp, uint8_t midi_status, uint8_t *remaining_message, size_t len, size_t continued_sysex_pos);
         /// Callback method to send UDP message with the help of the Arduino API
         static int32_t applemidi_if_send_udp_datagram(uint8_t *ip_addr, uint16_t port, uint8_t *tx_data, size_t tx_len);
 
+
 };
 
 }

src/ConfigMidi.h

@@ -1,14 +1,25 @@
 #pragma once
 
 #define MIDI_ACTIVE true
+#define NAMESPACE_ACTIVE true
 
-#if defined(ESP32) || defined(ESP8266)
+#if defined(ESP32) 
 #  define MIDI_BLE_ACTIVE true
 #  define APPLE_MIDI_ACTIVE true
 #  define MDNS_ACTIVE true
+#  define UDP_ACTIVE true
+#  define TCP_ACTIVE true
+#elif defined(ESP8266)
+#  define MIDI_BLE_ACTIVE false
+#  define APPLE_MIDI_ACTIVE true
+#  define MDNS_ACTIVE false
+#  define UDP_ACTIVE true
+#  define TCP_ACTIVE true
 #else
-#  define APPLE_MIDI_ACTIVE false
+#  define APPLE_MIDI_ACTIVE true
 #  define MIDI_BLE_ACTIVE false
 #  define MDNS_ACTIVE false
+#  define UDP_ACTIVE true
+#  define TCP_ACTIVE true
 #endif
 

src/Midi.h

@@ -7,9 +7,15 @@
 #include "MidiBleClient.h"		
 #include "MidiBleServer.h"		
 #include "MidiBleParser.h"
+#if TCP_ACTIVE
 #include "MidiIpServer.h"
+#endif
+#if UDP_ACTIVE
 #include "MidiUdpServer.h"
+#endif
 #if APPLE_MIDI_ACTIVE
 #include "AppleMidiServer.h"
 #endif
+#if NAMESPACE_ACTIVE
 using namespace midi;
+#endif

src/MidiIpServer.h

@@ -36,22 +36,25 @@ class MidiIpServer : public MidiServer {
                 return false;
             }
 
-            p_wifi_server = new WiFiServer(serverPort);
+            if (p_wifi_server==nullptr){
+                p_wifi_server = new WiFiServer(serverPort);
+            }
             p_wifi_server->begin();
             MIDI_LOGI("server started on port %d", serverPort);
             return true;
         }
 
         void end() {
             if (p_wifi_server!=nullptr){
-                p_wifi_server->stopAll();
+                delete p_wifi_server;
+                p_wifi_server = nullptr;
             }
         }
 
         void loop() {
             if (p_wifi_server!=nullptr){
                 if (!client.connected()){
-                    client = p_wifi_server->accept();
+                    client = p_wifi_server->available();
                     if (client.connected()){
                         MIDI_LOGI("MidiIpServer->connected");
                         in.setup(&client, new MidiParser(p_action), true);

src/MidiUdp.cpp

@@ -1,6 +1,6 @@
-#ifdef ESP32
-
 #include <MidiUdp.h>
+#ifdef MIDI_ACTIVE
+
 #include "MidiLogger.h"
 
 namespace midi {

src/MidiUdp.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "ArdConfig.h"
-#ifdef ESP32
+#ifdef MIDI_ACTIVE
 
 #include <WiFi.h>
 #include <WiFiClient.h>

src/apple-midi/applemidi.c

@@ -36,8 +36,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
-#include <arpa/inet.h>
-
 
 // from https://en.wikipedia.org/wiki/RTP-MIDI#Apple's_session_protocol
 #define APPLEMIDI_COMMAND_INVITATION            0x494e  // IN

src/apple-midi/applemidi.h

@@ -40,6 +40,20 @@ extern "C" {
 #include <stdint.h>
 #include <string.h>
 
+#ifndef htons
+#define htons(x) ( ((x)<< 8 & 0xFF00) | \
+                   ((x)>> 8 & 0x00FF) )
+#define ntohs(x) htons(x)
+#endif
+
+#ifndef htonl
+#define htonl(x) ( ((x)<<24 & 0xFF000000UL) | \
+                   ((x)<< 8 & 0x00FF0000UL) | \
+                   ((x)>> 8 & 0x0000FF00UL) | \
+                   ((x)>>24 & 0x000000FFUL) )
+#define ntohl(x) htonl(x)
+#endif
+
 
 #ifndef APPLEMIDI_DEFAULT_DEBUG_LEVEL
 #define APPLEMIDI_DEFAULT_DEBUG_LEVEL 1