updated test script

Author: lathoub

test/Ethernet.h

@@ -3,6 +3,8 @@
 
 #include "Arduino.h"
 
+#define DEFAULT_CONTROL_PORT 5004
+
 class EthernetUDP
 {
     Deque<byte, 4096> _buffer;
@@ -313,8 +315,10 @@ class EthernetUDP
     {
         size = min(size, _buffer.size());
 
-        for (size_t i = 0; i < size; i++)
-            buffer[i] = _buffer.pop_front();
+        for (size_t i = 0; i < size; i++) {
+            buffer[i] = _buffer.front();
+            _buffer.pop_front();
+        }
 
         return size;
     };

test/IPAddress.h

@@ -9,4 +9,9 @@ class IPAddress
     IPAddress(uint32_t address) { }
     IPAddress(int address) { }
     IPAddress(const uint8_t *address) {};
+
+    bool operator==(const IPAddress&) const { return true; }
+    bool operator!=(const IPAddress&) const { return true; }
 };
+
+const IPAddress INADDR_NONE(0, 0, 0, 0);

test/NoteOn.cpp

@@ -6,7 +6,7 @@
 #include "AppleMIDI.h"
 
 unsigned long t0 = millis();
-bool isConnected--;
+bool isConnected = false;
 
 byte sysex14[] = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0x20, 0x20, 0x38, 0x39, 0x37, 0x33, 0x50, 0xF7 };
 byte sysex15[] = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0x20, 0x20, 0x38, 0x39, 0x37, 0x33, 0x50, 0x4D, 0xF7 };
@@ -33,15 +33,15 @@ APPLEMIDI_CREATE_DEFAULTSESSION_INSTANCE();
 // rtpMIDI session. Device connected
 // -----------------------------------------------------------------------------
 void OnAppleMidiConnected(const APPLEMIDI_NAMESPACE::ssrc_t & ssrc, const char* name) {
-  isConnected++;
+  isConnected = true;
   DBG(F("Connected to session"), ssrc, name);
 }
 
 // -----------------------------------------------------------------------------
 // rtpMIDI session. Device disconnected
 // -----------------------------------------------------------------------------
 void OnAppleMidiDisconnected(const APPLEMIDI_NAMESPACE::ssrc_t & ssrc) {
-  isConnected--;
+  isConnected = false;
   DBG(F("Disconnected"), ssrc);
 }
 
@@ -107,7 +107,7 @@ void begin()
 
     AppleMIDI.setHandleConnected(OnAppleMidiConnected);
     AppleMIDI.setHandleDisconnected(OnAppleMidiDisconnected);
-    AppleMIDI.setHandleReceivedMidi(OnAppleMidiByte);
+ //   AppleMIDI.setHandleReceivedMidi(OnAppleMidiByte);
 
     MIDI.setHandleNoteOn(OnMidiNoteOn);
     MIDI.setHandleNoteOff(OnMidiNoteOff);
@@ -123,7 +123,7 @@ void loop()
 
     // send a note every second
      // (dont cáll delay(1000) as it will stall the pipeline)
-     if ((isConnected > 0) && (millis() - t0) > 10000)
+     if ((isConnected) && (millis() - t0) > 10000)
      {
        t0 = millis();
 

test/TestParser.vcxproj

@@ -76,6 +76,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>C:\Users\bart\Documents\Arduino\libraries\arduino_midi_library-master\src;C:\Users\bart\Documents\Arduino\libraries\Arduino-AppleMIDI-Library\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -87,8 +88,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>
-      </AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Users\bart\Documents\Arduino\libraries\Arduino-AppleMIDI-Library\src;C:\Users\bart\Documents\Arduino\libraries\arduino_midi_library-master\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>Default</LanguageStandard>
     </ClCompile>
     <Link>
@@ -131,6 +131,7 @@
   <ItemGroup>
     <ClInclude Include="Arduino.h" />
     <ClInclude Include="Ethernet.h" />
+    <ClInclude Include="IPAddress.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

test/TestParser.vcxproj.filters

@@ -22,5 +22,8 @@
     <ClInclude Include="Ethernet.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="IPAddress.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>