Merge branch 'develop'

Author: Martin Klang

FaustCode/owl.cpp

@@ -396,8 +396,8 @@ class OwlUI : public UI {
 
     void addOutputOwlParameter(
         const char* label, FAUSTFLOAT* zone, FAUSTFLOAT lo, FAUSTFLOAT hi) {
-        if(label[strlen(label) - 1] == '>')
-  	    debugMessage("Add '>' character for output parameters");
+        if(label[strlen(label) - 1] != '>')
+            debugMessage("Add '>' character for output parameters");
         if (fParameterIndex < MAXOWLPARAMETERS) {
             if (meta.midiOn && strcasecmp(label, "freq") == 0) {
                 fParameterTable[fParameterIndex++] =
@@ -414,14 +414,14 @@ class OwlUI : public UI {
             else if (fParameter != NO_PARAMETER) {
                 fParameterTable[fParameterIndex++] = new OwlParameter(
                     fPatch, fParameter, zone, label, lo, lo, hi, true);
-	    }
-	    else if(fButton != NO_BUTTON){
-	        fParameterTable[fParameterIndex++] = new OwlButton(
-		    fPatch, fButton, zone, label, true);
-	    }
-	}
-	fParameter = NO_PARAMETER;
-	fButton = NO_BUTTON;
+            }
+            else if(fButton != NO_BUTTON){
+                fParameterTable[fParameterIndex++] = new OwlButton(
+                fPatch, fButton, zone, label, true);
+            }
+        }
+        fParameter = NO_PARAMETER;
+        fButton = NO_BUTTON;
     }
 
     void addOwlButton(const char* label, FAUSTFLOAT* zone) {
@@ -435,7 +435,7 @@ class OwlUI : public UI {
                     new OwlButton(fPatch, fButton, zone, label);
             }
         }
-	fParameter = NO_PARAMETER;
+        fParameter = NO_PARAMETER;
         fButton = NO_BUTTON; // clear current button ID
     }
 
@@ -572,8 +572,8 @@ class OwlUI : public UI {
                     }
                     else if (param_tmp == PARAMETER_B && *id >= '0' && *id <= '9') {
                         fButton = PatchButtonId(BUTTON_A + *id - '1');
-		    }
-		    else {
+                    }
+                    else {
                         // Inc to skip 1-character params
                         param_tmp++;
                         // This is first character for groups of 8 params

LibSource/VoltsPerOctave.h

@@ -21,6 +21,9 @@ class VoltsPerOctave {
   void setTune(float octaves){
     tune = octaves;
   }
+  void setMidiNote(float note){
+    tune = (note-69)/12.0f; // 440Hz == A4 == MIDI Note 69
+  }
   float getFrequency(float sample){
     return voltsToHertz(sampleToVolts(sample) + tune);
   }
@@ -33,6 +36,12 @@ class VoltsPerOctave {
   static float voltsToHertz(float volts){
     return 440.f * exp2f(volts);
   }
+  static float hertzToNote(float freq){
+    return 12 * log2f(freq/440.f) + 69;
+  }
+  static float noteToHertz(float note){
+    return 440.0f * exp2f((note - 69) / 12);
+  }
   float voltsToSample(float volts){
     return volts / multiplier + offset;
   }

Source/flash.ld

@@ -16,8 +16,8 @@ MEMORY
   PATCHFLASH (rx)  : ORIGIN = 0x08040000, LENGTH = 128K   /* Sector 6 */ /* total Flash memory is 1Mb */
   CCMHEAP (rw)     : ORIGIN = 0x10004000, LENGTH = 32K
   CCMRAM (rw)      : ORIGIN = 0x1000c000, LENGTH = 16K    /* total CCM is 64kb */
-  LOADERRAM (rwx)  : ORIGIN = 0x20000000, LENGTH = 48K
-  PATCHRAM (rwx)   : ORIGIN = 0x2000c000, LENGTH = 64K    /* total RAM is 112kb */
+  FIRMWARERAM (rwx): ORIGIN = 0x20000000, LENGTH = 48K
+  PATCHRAM (rwx)   : ORIGIN = 0x2000c000, LENGTH = 144K   /* total RAM is 192kb */
   NVRAM (rw)       : ORIGIN = 0x40024000, LENGTH = 4K
   EXTRAM (rx)      : ORIGIN = 0x68000000, LENGTH = 1M
 }

common.mk

@@ -2,7 +2,7 @@
 DSPLIB=Libraries/CMSIS/DSP_Lib/Source
 
 # Tool path
-TOOLROOT ?= Tools/gcc-arm-none-eabi-9-2019-q4-major/bin/
+TOOLROOT ?= Tools/gcc-arm-none-eabi-9-2020-q2-update/bin/
 
 CMSIS ?= Libraries/CMSIS/Include/