syx sound send is working

Author: Yatao Li

.gitignore

@@ -15,4 +15,4 @@ avr/cores/megacommand/**/*.d
 avr/cores/megacommand/**/*.hex
 avr/cores/megacommand/**/*.elf
 avr/cores/megacommand/**/*.a
-
+sym_*.txt

avr/cores/megacommand/MCL/SoundBrowserPage.cpp

@@ -4,14 +4,17 @@
 const char *c_sound_root = "/Sounds/MD";
 const char *c_snd_suffix = ".snd";
 const char *c_wav_suffix = ".wav";
+const char *c_syx_suffix = ".syx";
 
 const char *c_snd_name = "SOUND";
 const char *c_wav_name = "WAV";
+const char *c_syx_name = "SYSEX";
 
 static bool s_query_returned = false;
 
 #define FT_SND 0
 #define FT_WAV 1
+#define FT_SYX 2
 
 #define PA_NEW 0
 #define PA_SELECT 1
@@ -37,9 +40,11 @@ void SoundBrowserPage::init() {
 
   filetypes[0] = c_snd_suffix;
   filetypes[1] = c_wav_suffix;
+  filetypes[2] = c_syx_suffix;
   filetype_names[0] = c_snd_name;
   filetype_names[1] = c_wav_name;
-  filetype_max = FT_WAV;
+  filetype_names[2] = c_syx_name;
+  filetype_max = FT_SYX;
 
   if (show_samplemgr) {
     strcpy(title, "MD-ROM");
@@ -55,8 +60,7 @@ void SoundBrowserPage::init() {
     strcpy(match, ".snd");
     strcpy(title, "Sounds");
     show_dirs = true;
-    show_save = true;
-    //show_save = (filetype_idx == FT_SND);
+    show_save = (filetype_idx != FT_SYX);
     show_filemenu = true;
     show_new_folder = true;
     show_overwrite = true;
@@ -118,14 +122,23 @@ void SoundBrowserPage::load_sound() {
   }
 }
 
-// send current selected wav file to slot
-void SoundBrowserPage::send_wav(int slot) {
+// send current selected sample file to slot
+void SoundBrowserPage::send_sample(int slot, bool is_syx) {
+  bool success;
   if (file.isOpen()) {
     char temp_entry[FILE_ENTRY_SIZE];
     file.getName(temp_entry, FILE_ENTRY_SIZE);
     file.close();
-    midi_sds.sendWav(temp_entry, slot, /* show progress */ true);
-    gfx.alert("Sample sent", temp_entry);
+    if (is_syx) {
+      success = midi_sds.sendSyx(temp_entry, slot);
+    } else {
+      success = midi_sds.sendWav(temp_entry, slot, /* show progress */ true);
+    }
+    if (success) {
+      gfx.alert("Sample sent", temp_entry);
+    } else {
+      gfx.alert("Send failed", temp_entry);
+    }
   }
 }
 
@@ -181,6 +194,7 @@ void SoundBrowserPage::on_select(const char *__) {
       load_sound();
       break;
     case FT_WAV:
+    case FT_SYX:
       pending_action = PA_SELECT;
       show_samplemgr = true;
       show_ram_slots = false;
@@ -190,12 +204,12 @@ void SoundBrowserPage::on_select(const char *__) {
   } else {
     auto slot = encoders[1]->cur;
     switch (pending_action) {
-    case PA_NEW:
-      recv_wav(slot);
-      break;
-    case PA_SELECT:
-      send_wav(slot);
-      break;
+      case PA_NEW:
+        recv_wav(slot);
+        break;
+      case PA_SELECT:
+        send_sample(slot, (filetype_idx == FT_SYX));
+        break;
     }
     show_samplemgr = false;
     init();

avr/cores/megacommand/MCL/SoundBrowserPage.h

@@ -29,7 +29,7 @@ class SoundBrowserPage : public FileBrowserPage, public MidiSysexListenerClass {
   void cleanup();
   void save_sound();
   void load_sound();
-  void send_wav(int slot);
+  void send_sample(int slot, bool is_syx);
   void recv_wav(int slot);
 
   // MidiSysexListenerClass

avr/cores/megacommand/Midi/MidiSDS.cpp

@@ -1,4 +1,5 @@
 #include "MCL_impl.h"
+#include "MidiSysexFile.h"
 
 void MidiSDSClass::sendGeneralMessage(uint8_t type) {
   uint8_t data[6] = {0xF0, 0x7E, 0x00, 0x00, 0x00, 0xF7};
@@ -41,6 +42,21 @@ void MidiSDSClass::sendDumpRequest(uint16_t slot) {
   MidiUart.sendRaw(data, 7);
 }
 
+uint8_t MidiSDSClass::waitForHandshake() {
+  uint8_t rep;
+wait:
+  rep = waitForMsg();
+  if (rep == MIDI_SDS_ACK) {
+    hand_shake_state = true;
+  } else if (rep == MIDI_SDS_WAIT) {
+    goto wait;
+  } else {
+    // HandShake disabled.
+    hand_shake_state = false;
+  }
+  return rep;
+}
+
 uint8_t MidiSDSClass::waitForMsg(uint16_t timeout) {
 
   MidiSDSSysexListener.msgType = 255;
@@ -56,6 +72,7 @@ uint8_t MidiSDSClass::waitForMsg(uint16_t timeout) {
            (MidiSDSSysexListener.msgType == 255));
   return MidiSDSSysexListener.msgType;
 }
+
 void MidiSDSClass::cancel() {
   DEBUG_PRINTLN(F("cancelling transmission"));
   wav_file.close();
@@ -93,6 +110,95 @@ static void _setName(const char *filename, uint16_t slot) {
   MD.setSampleName(slot, name);
 }
 
+bool MidiSDSClass::sendSyx(const char *filename, uint16_t sample_number) {
+  MidiSysexFile file;
+  uint8_t buf[256];
+  int szbuf;
+  bool ret = true;
+  uint8_t reply;
+  uint32_t fsize;
+  int show_progress = 0;
+  uint8_t n_retry = 0;
+
+  if (state != SDS_READY || !file.open(filename, O_READ)) {
+    return false;
+  }
+
+  file.seekEnd();
+  fsize = file.position();
+  file.seek(0);
+
+  // 1st packet: sysex request.
+  szbuf = file.readPacket(buf, sizeof(buf));
+  if (szbuf == -1 || buf[1] != 0x7E || buf[3] != 0x01) {
+    ret = false;
+    goto cleanup;
+  }
+  buf[4] = sample_number & 0x7F;
+  buf[5] = (sample_number >> 7) & 0x7F;
+  MidiUart.sendRaw(buf, szbuf);
+  state = SDS_SEND;
+  reply = waitForHandshake();
+  if (reply == MIDI_SDS_CANCEL) {
+    ret = false;
+    goto cleanup;
+  }
+
+  oled_display.clearDisplay();
+
+  while(true) {
+    const uint32_t pos = file.position();
+    DEBUG_PRINT("pos = ");
+    DEBUG_PRINTLN(pos);
+    DEBUG_PRINT("fsize = ");
+    DEBUG_PRINTLN(fsize);
+    if (pos >= fsize) {
+      break;
+    }
+    if (++show_progress > 10) {
+      show_progress = 0;
+      mcl_gui.draw_progress("Sending sample", pos * 80 / fsize ,80);
+    }
+    szbuf = file.readPacket(buf, sizeof(buf));
+    if (szbuf == -1) {
+      ret = false;
+      goto cleanup;
+    }
+    n_retry = 0;
+retry:
+    MidiUart.sendRaw(buf, szbuf);
+    if (!hand_shake_state) {
+      delay(200);
+    } else if (buf[1] == 0x7E && buf[3] == 0x02) {
+      reply = waitForMsg(20);
+      switch (reply) {
+        case 255: // nothing came back
+          hand_shake_state = false;
+          goto retry;
+        case MIDI_SDS_WAIT:
+          reply = waitForMsg();
+          if (reply != MIDI_SDS_ACK) {
+            ret = false;
+            goto cleanup;
+          }
+        case MIDI_SDS_ACK:
+          break;
+        default:
+          if(n_retry++ > 3) {
+            ret = false;
+            goto cleanup;
+          }
+          goto retry;
+      }
+    } // otherwise, don't expect ACK reply (maybe MD-specific name-setting command)
+  }
+  // later packets
+
+cleanup:
+  file.close();
+  state = SDS_READY;
+  return ret;
+}
 
 bool MidiSDSClass::sendWav(const char *filename, uint16_t sample_number, bool show_progress) {
   if (state != SDS_READY) {
@@ -125,19 +231,11 @@ bool MidiSDSClass::sendWav(const char *filename, uint16_t sample_number, bool sh
   uint8_t rep = 0;
 
   midi_sds.state = SDS_SEND;
-wait:
-  rep = waitForMsg();
-  if (rep == MIDI_SDS_ACK) {
-    hand_shake_state = true;
-  } else if (rep == MIDI_SDS_CANCEL) {
+  rep = waitForHandshake();
+  if (rep == MIDI_SDS_CANCEL) {
     cancel();
     wav_file.close();
     return false;
-  } else if (rep == MIDI_SDS_WAIT) {
-    goto wait;
-  } else {
-    // HandShake disabled.
-    hand_shake_state = false;
   }
 
   _setName(filename, sample_number);

avr/cores/megacommand/Midi/MidiSDS.h

@@ -50,6 +50,8 @@ class MidiSDSClass {
 
   void setSampleRate(uint32_t hz) { samplePeriod = (uint32_t)1000000000 / hz; }
   uint8_t waitForMsg(uint16_t timeout = 2000);
+  uint8_t waitForHandshake();
+  bool sendSyx(const char *filename, uint16_t sample_number);
   bool sendWav(const char *filename, uint16_t sample_number, bool show_progress = false);
   bool sendSamples(bool show_progress);
   bool recvWav(const char *filename, uint16_t sample_number /* always show progress */);

avr/cores/megacommand/Midi/MidiSysexFile.cpp

@@ -0,0 +1,13 @@
+#include "MidiSysexFile.h"
+
+int MidiSysexFile::readPacket(uint8_t* buf, size_t szbuf) {
+  uint8_t *p = buf;
+  do {
+    *p = FatFile::read();
+  } while (*p++ != 0xF7 && --szbuf > 0);
+  if(buf[0] == 0xF0 && p[-1] == 0xF7) {
+    return p - buf;
+  } else {
+    return -1;
+  }
+}

avr/cores/megacommand/Midi/MidiSysexFile.h

@@ -1,64 +1,11 @@
-#ifndef MIDISYSEXFILE_H__
-#define MIDISYSEXFILE_H__
-
-#include "MidiUart.h"
-
-class MidiSysexFile {
+#pragma once
+#include "MCLSd.h"
 
+class MidiSysexFile: public File {
 public:
-  MidiUartClass *uart;
-  File file;
-
-  MidiSysexFile(MidiClass *_midi) { uart = (MidiUartClass*)_midi->uart; }
-
-  bool send(char *file_name) {
-
-    bool ret;
-    ret = file.open(file_name, O_READ);
-
-    if (!ret) {
-      DEBUG_PRINTLN("Could not open SYSEX file:");
-      DEBUG_PRINTLN(file_name);
-      return false;
-    }
-
-    uint8_t buf[512];
-
-    uint32_t file_size = file.fileSize();
-
-    uint32_t bytes_read = 0;
-
-    while (bytes_read < file_size) {
-
-      uint16_t len;
-
-      if (file_size - bytes_read < 512) {
-        len = file_size - bytes_read;
-      } else {
-        len = 512;
-      }
-
-      if (mcl_sd.read_data(&buf, len, &file)) {
-        bytes_read += len;
-      } else {
-        DEBUG_PRINTLN("failed to send");
-        return false;
-      }
-
-      if (bytes_read == 0 && buf[0] != 0xF0) {
-        DEBUG_PRINTLN("incorrect file type");
-        return false;
-      }
-      for (uint8_t c = 0; c < len; c++) {
-        while (uart->txRb.isFull())
-          ;
-        uart->m_putc(buf[c]);
-      }
-    }
 
-    return true;
-  }
-  bool recv();
+  MidiSysexFile() : File() {}
+  // returns -1 if a sysex packet cannot be read.
+  int readPacket(uint8_t* buf, size_t szbuf);
 };
 
-#endif /* MIDISYSEXFILE_H__ */

syms.ps1

@@ -27,8 +27,7 @@ function parse-symbol($line) {
   } catch {}
 }
 
-Set-Location sketch
-$lines = $(avr-objdump -x build/MIDICtrl20_MegaCommand.avr.mega\sketch.ino.elf)
+$lines = $(avr-objdump -x bin\sketch.ino.elf)
 $header = $lines | Select-Object -First 37
 $symbols = $lines | Select-Object -Skip 38 | %{ parse-symbol($_) }
 
@@ -52,4 +51,3 @@ echo "Total compressable object size: $comp_total_size"
 
 $data | Out-GridView
 $bss | Out-GridView
-Set-Location ..