Merge branch 'develop' into HEAD

Author: antisvin

.github/workflows/c-cpp.yml

@@ -0,0 +1,29 @@
+name: C/C++ CI
+
+on:
+  push:
+    branches: [ master, develop ]
+  pull_request:
+    branches: [ master, develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Setup arm-none-eabi-gcc
+      uses: fiam/arm-none-eabi-gcc@v1
+      with:
+        release: '9-2020-q2' # The arm-none-eabi-gcc release to use.
+    - name: Setup emsdk
+      uses: mymindstorm/setup-emsdk@v7
+      with:
+        version: 2.0.10
+    - name: make
+      run: make
+    - name: make check
+      run: make check

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "Libraries/DaisySP"]
+	path = Libraries/DaisySP
+	url = https://github.com/electro-smith/DaisySP.git
+	branch = master

FaustCode/owl.cpp

@@ -39,7 +39,7 @@
 #include "Patch.h"
 #include "VoltsPerOctave.h"
 
-// We have to undefine min/max from Owl's basicmaths.h, otherwise they cause
+// We have to undefine min/max from OWL's basicmaths.h, otherwise they cause
 // errors when Faust calls functions with the same names in std:: namespace
 #undef min
 #undef max
@@ -54,10 +54,11 @@
 #include "faust/gui/UI.h"
 #include "faust/gui/meta.h"
 
-static float fFreq, fGain, fGate;
+static float fKey, fFreq, fGain, fGate;
 static float fBend = 1.0f;
 
 class MonoVoiceAllocator {
+    float& key;
     float& freq;
     float& gain;
     float& gate;
@@ -66,8 +67,9 @@ class MonoVoiceAllocator {
     uint8_t lastNote = 0;
 
 public:
-    MonoVoiceAllocator(float& fq, float& gn, float& gt, float& bd)
-        : freq(fq)
+    MonoVoiceAllocator(float& ky, float& fq, float& gn, float& gt, float& bd)
+        : key(ky)
+        , freq(fq)
         , gain(gn)
         , gate(gt)
         , bend(bd) {
@@ -114,6 +116,7 @@ class MonoVoiceAllocator {
     void noteOn(uint8_t note, uint16_t velocity, uint16_t delay) {
         if (lastNote < 16)
             notes[lastNote++] = note;
+	key = note;
         freq = noteToHz(note);
         gain = velocityToGain(velocity);
         gate = 1.0f;
@@ -130,11 +133,12 @@ class MonoVoiceAllocator {
                 notes[i] = notes[i + 1];
                 i++;
             }
-            freq = noteToHz(notes[lastNote - 1]);
+	    key = notes[lastNote - 1];
+            freq = noteToHz(key);
         }
         else {
             gate = 0.0f;
-            lastNote = 0;
+            lastNote = 0;	    
         }
     }
     void allNotesOff() {
@@ -153,8 +157,7 @@ enum ParserState {
  * To enable MIDI in current patch, add this to source Faust file:
  *     declare options "[midi:on]";
  *
- * You can also add descrpiption to be displayed with debugMessage function like
- * this:
+ * You can also add a description to be displayed like this:
  *     declare message "Hello World";
  *
  * To add V/Oct scaling support, use something likes this:
@@ -251,8 +254,8 @@ class MetaData : public Meta {
 
 /**************************************************************************************
  *
- * OwlParameter : object used by OwlUI to ensures the connection between an Owl
- * parameter and a Faust widget
+ * OwlParameter : object used by OwlUI to ensures the connection between an OWL
+ * parameter and a FAUST widget
  *
  ***************************************************************************************/
 
@@ -374,8 +377,8 @@ class OwlCheckbox : public OwlParameterBase {
  * OwlUI : Faust User Interface builder. Passed to buildUserInterface OwlU
  * ensures the mapping between owl parameters and faust widgets. It relies on
  * specific metadata "...[OWL:PARAMETER_X]..." in widget's label for that. For
- * example any faust widget with metadata [OWL:PARAMETER_B] will be controlled
- * by PARAMETER_B (the second knob).
+ * example any faust widget with metadata [OWL:B] will be controlled by
+ * PARAMETER_B (the second knob).
  *
  ***************************************************************************************/
 
@@ -384,7 +387,7 @@ class OwlCheckbox : public OwlParameterBase {
 #define NO_PARAMETER ((PatchParameterId)-1)
 #define NO_BUTTON ((PatchButtonId)-1)
 
-MonoVoiceAllocator allocator(fFreq, fGain, fGate, fBend);
+MonoVoiceAllocator allocator(fKey, fFreq, fGain, fGate, fBend);
 VoltsPerOctave* fVOctInput;
 VoltsPerOctave* fVOctOutput;
 
@@ -410,6 +413,10 @@ class OwlUI : public UI {
                 fParameterTable[fParameterIndex++] =
                     new OwlVariable(fPatch, &fBend, zone, label, init, lo, hi);
             }
+            else if (meta.midiOn && strcasecmp(label, "key") == 0) {
+                fParameterTable[fParameterIndex++] =
+                    new OwlVariable(fPatch, &fKey, zone, label, init, lo, hi);
+            }
             else if (fParameter != NO_PARAMETER) {
                 fParameterTable[fParameterIndex++] =
                     new OwlParameter(fPatch, fParameter, zone, label, init, lo, hi);
@@ -424,19 +431,7 @@ class OwlUI : public UI {
         if(label[strlen(label) - 1] != '>')
             debugMessage("Add '>' character for output parameters");
         if (fParameterIndex < MAXOWLPARAMETERS) {
-            if (meta.midiOn && strcasecmp(label, "freq") == 0) {
-                fParameterTable[fParameterIndex++] =
-                    new OwlVariable(fPatch, &fFreq, zone, label, lo, lo, hi, true);
-            }
-            else if (meta.midiOn && strcasecmp(label, "gain") == 0) {
-                fParameterTable[fParameterIndex++] =
-                    new OwlVariable(fPatch, &fGain, zone, label, lo, lo, hi, true);
-            }
-            else if (meta.midiOn && strcasecmp(label, "bend") == 0) {
-                fParameterTable[fParameterIndex++] =
-                    new OwlVariable(fPatch, &fBend, zone, label, lo, lo, hi, true);
-            }
-            else if (fParameter != NO_PARAMETER) {
+	    if (fParameter != NO_PARAMETER) {
                 fParameterTable[fParameterIndex++] = new OwlParameter(
                     fPatch, fParameter, zone, label, lo, lo, hi, true);
             }
@@ -503,7 +498,7 @@ class OwlUI : public UI {
             delete fVOctOutput;
     }
 
-    // should be called before compute() to update widget's zones registered as Owl parameters
+    // should be called before compute() to update widget's zones registered as OWL parameters
     void update() {
         for (int i = 0; i < fParameterIndex; i++)
             fParameterTable[i]->update();
@@ -565,7 +560,6 @@ class OwlUI : public UI {
         if (strcasecmp(k, "OWL") == 0) {
             if (strncasecmp(id, "PARAMETER_", 10) == 0)
                 id += 10;
-
             if (strlen(id) == 1) {
                 // Single char parameter name.
                 // Note that we can use I - P as aliases for AA-AH.
@@ -610,7 +604,7 @@ class OwlUI : public UI {
                                 std::min(int(PARAMETER_DH), param_tmp + *id - '0'));
                         }
                     }
-                    else if (param_tmp == PARAMETER_B && *id >= '0' && *id <= '9') {
+                    else if (param_tmp == PARAMETER_B && *id > '0' && *id <= '9') {
                         fButton = PatchButtonId(BUTTON_A + *id - '1');
                     }
                     else {
@@ -633,12 +627,13 @@ class OwlUI : public UI {
             else if (strcasecmp(id, "PUSH") == 0)
                 fButton = PUSHBUTTON;
         }
-        else if (strcasecmp(k, "midi") == 0) {
-            // todo!
-            // if (strcasecmp(id,"pitchwheel") == 0)  fParameter = PARAMETER_G;
-            // // mapped to pitch wheel declare(&fHslider1, "midi",
-            // "pitchwheel"); declare(&fButton1, "midi", "ctrl 64");
-        }
+        // else if (strcasecmp(k, "midi") == 0) {
+	//   if (strcasecmp(id, "pitchwheel") == 0){ // PB
+	//   }else if (strcasecmp(id, "ctrl") == 0){ // CC
+	//   }else if (strcasecmp(id, "chanpress") == 0){ // AT
+	//   }else if (strcasecmp(id, "pgm") == 0){ // PC
+	//   }
+        // }
     }
 
     // -- V/Oct

GenSource/GenPatch.hpp

@@ -155,11 +155,12 @@ class GenPatch : public Patch {
   CommonState *context;
   GenParameterBase* params[GEN_OWL_MAX_PARAM_COUNT];
   size_t param_count = 0;
- float freq = 440.0f;
- float gain = 0.0f;
- float gate = 0.0f;
- float bend = 1.0;
+  float freq = 440.0f;
+  float gain = 0.0f;
+  float gate = 0.0f;
+  float bend = 1.0;
   MonoVoiceAllocator allocator;
+  float** buffers;
 public:
   GenPatch() : allocator(freq, gain, gate, bend) {
     context = (CommonState*)gen::create(getSampleRate(), getBlockSize());
@@ -195,12 +196,23 @@ class GenPatch : public Patch {
 	params[param_count++] = new GenParameter(this, context, name, (PatchParameterId)index, i);
       }
     }
+    buffers = new float*[gen::num_outputs()];
+    size_t channels = getNumberOfChannels();
+    debugMessage("SR/CH/BS", (int)getSampleRate(), getNumberOfChannels(), getBlockSize());
+    char name[] = "Out0>";
+    for(int ch=channels; ch<gen::num_outputs(); ++ch){
+      buffers[ch] = new float[getBlockSize()];
+      name[3] = '1'+ch;
+      registerParameter((PatchParameterId)(PARAMETER_F+(ch-channels)), name);
+    }
   }
 
   ~GenPatch() {
     gen::destroy(context);
     for(int i=0; i<param_count; ++i)
       delete params[i];
+    for(int i=getNumberOfChannels(); i<gen::num_outputs(); ++i)
+      delete[] buffers[i];
   }
 
   void processMidi(MidiMessage msg){
@@ -210,8 +222,15 @@ class GenPatch : public Patch {
   void processAudio(AudioBuffer &buffer) {
     for(int i=0; i<param_count; ++i)
       params[i]->update(this, context);
-    float* outputs[] = {buffer.getSamples(0), buffer.getSamples(1) };
-    gen::perform(context, outputs, 2, outputs, 2, buffer.getSize());
+    size_t channels = buffer.getChannels();
+    size_t ch;
+    for(ch=0; ch<channels; ++ch)
+      buffers[ch] = buffer.getSamples(ch);
+    gen::perform(context, buffers, channels, buffers, gen::num_outputs(), buffer.getSize());
+    for(int ch=channels; ch<gen::num_outputs(); ++ch){
+      float avg = FloatArray(buffers[ch], buffer.getSize()).getMean();
+      setParameterValue((PatchParameterId)(PARAMETER_F+(ch-channels)), avg);
+    }
   }
 };
 

LibSource/FloatArray.cpp

@@ -410,11 +410,8 @@ void FloatArray::noise(){
 void FloatArray::noise(float min, float max){
   float amplitude = fabsf(max-min);
   float offset = min;
-  ASSERT(getSize()>10, "10<getSize");
-  ASSERT(size==getSize(), "getSize");
-  for(size_t n=0; n<size; n++){
-    data[n]=(rand()/(RAND_MAX+1.0f)) * amplitude + offset;
-  }
+  for(size_t n=0; n<size; n++)
+    data[n] = randf() * amplitude + offset;
 }
 
 

LibSource/MidiStatus.h

@@ -18,7 +18,7 @@ enum MidiStatus {
   RESERVED_F4                   = 0xF4,
   RESERVED_F5                   = 0xF5,
   TUNE_REQUEST                  = 0xF6,
-  SYSEX_EOX                     = 0xF7,		
+  SYSEX_EOX                     = 0xF7,
   SYSTEM_REAL_TIME		= 0xF8,
   TIMING_CLOCK		        = 0xF8,
   RESERVED_F9                   = 0xF9,

LibSource/NoiseOscillator.h

@@ -24,7 +24,7 @@ class WhiteNoiseOscillator : public Oscillator {
     // https://en.wikipedia.org/wiki/Single-precision_floating-point_format
     return x.f;
 #else
-    return (rand()/(RAND_MAX+1.0f)) * 2 - 1;
+    return (rand()/(float)RAND_MAX) * 2 - 1;
 #endif
   }
 

LibSource/Patch.cpp

@@ -6,6 +6,7 @@
 #include "PatchProcessor.h"
 #include "basicmaths.h"
 #include "main.h"
+#include "message.h"
 
 AudioBuffer::~AudioBuffer(){}
 
@@ -28,6 +29,13 @@ int Patch::getBlockSize(){
   return getProgramVector()->audio_blocksize;
 }
 
+int Patch::getNumberOfChannels(){
+  uint8_t format = getProgramVector()->audio_format;
+  if((format & 0xf0) == AUDIO_FORMAT_24B32 && (format & 0x0f) > 0)
+    return format & 0x0f;
+  return 2;
+}
+
 float Patch::getParameterValue(PatchParameterId pid){
   //  return getInitialisingPatchProcessor()->getParameterValue(pid);
   // if(pid < getProgramVector()->parameters_size)
@@ -84,6 +92,13 @@ void Patch::sendMidi(MidiMessage msg){
 
 #endif /* USE_MIDI_CALLBACK */
 
+Resource* Patch::getResource(const char* name){
+  Resource* resource = Resource::load(name);
+  if(resource == NULL)
+    error(CONFIGURATION_ERROR_STATUS, "Missing Resource");
+  return resource;
+}
+
 #include "MemoryBuffer.hpp"
 AudioBuffer* AudioBuffer::create(int channels, int samples){
   return new ManagedMemoryBuffer(channels, samples);

LibSource/Patch.h

@@ -3,6 +3,7 @@
 
 #include "device.h"
 #include "basicmaths.h"
+#include "Resource.h"
 #include "FloatArray.h"
 #include "PatchParameter.h"
 #include "SmoothValue.h"
@@ -57,6 +58,7 @@ class Patch {
   int getSamplesSinceButtonPressed(PatchButtonId bid);
   void setButton(PatchButtonId bid, uint16_t value, uint16_t samples=0);
   int getBlockSize();
+  int getNumberOfChannels();
   float getSampleRate();
   AudioBuffer* createMemoryBuffer(int channels, int samples);
   float getElapsedBlockTime();
@@ -69,6 +71,12 @@ class Patch {
   virtual void processMidi(MidiMessage msg);
   virtual void sendMidi(MidiMessage msg);
 #endif /* USE_MIDI_CALLBACK */
+  /**
+   * Get a resource (such as a stored FloatArray) from the firmware.
+   * If the resource does not exist, this raises an error.
+   * If the resource exists but is not memory mapped, this will allocate new memory.
+   */
+  Resource* getResource(const char* name);
 };
 
 #endif // __Patch_h__

LibSource/PitchDetector.h

@@ -47,7 +47,7 @@ class FourierPitchDetector{
   int getSize(){
     return fft.getSize();
   }
-  void setsamplingRate(float asamplingRate){
+  void setSamplingRate(float asamplingRate){
     samplingRate=asamplingRate;
   }
   void setMinFrequency(float aMinFrequency){