small updates

Author: todbot

README.md

@@ -1,7 +1,11 @@
 # pico_test_synth
 
-A simple [Raspberry Pi Pico RP2040](https://www.raspberrypi.com/documentation/microcontrollers/raspberry-pi-pico.html)-based
-synth to experiment with [`synthio`](https://github.com/todbot/circuitpython-synthio-tricks).
+A simple 
+[Raspberry Pi Pico RP2040](https://www.raspberrypi.com/documentation/microcontrollers/raspberry-pi-pico.html)-based
+synth to experiment with [`synthio`](https://github.com/todbot/circuitpython-synthio-tricks) and [Mozzi](https://github.com/sensorium/Mozzi).
+
+<a href="https://www.tindie.com/stores/todbot/products/pico_test_synth?ref=offsite_badges&utm_source=sellers_todbot&utm_medium=badges&utm_campaign=badge_small"><img src="https://d2ss6ovg47m0r5.cloudfront.net/badges/tindie-smalls.png" alt="I sell on Tindie" width="200" height="55"></a>
+
 
 <img src="./docs/pico_test_synth_case1_web.jpg" width=500>
 <img src="./docs/pico_test_synth2.jpg" width=500>

arduino/hwtest/hwtest2_guitest/SynthPatch.h

@@ -0,0 +1,107 @@
+#ifndef SYNTHPATCH_H
+#define SYNTHPATCH_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <typeinfo>
+
+enum ParamType { Range,
+                 Choice };
+
+#define ParamRange(name, desc, val, ... /* min, max, fmt */) \
+  Param(Range, name, desc, val, ##__VA_ARGS__)
+
+#define ParamChoice(name, desc, val, choice_strs, num_choices) \
+  Param(Choice, name, desc, val, 0, num_choices, "%s", choice_strs)
+
+/*!
+ *  @brief A Param is a value that can be set/get, with a range (if type Range) 
+ *  or from a list of choices (if type Choice)
+ */
+class Param {
+public:
+  /*!
+   *  @brief  Instantiate a Param from another Param
+   *  @param  p a Param object
+   */
+  Param(Param* p) {
+    type = p->type;
+    name = p->name;
+    desc = p->desc;
+    val = p->val;
+    minval = p->minval;
+    maxval = p->maxval;
+    fmt = p->fmt;
+    choice_strs = p->choice_strs;
+  }
+
+  /*!
+   *   @brief  Instantiates a Param object
+   *   @param  aname
+   *           name of this Param
+   *   @param  aval
+   *           the current value of this Param
+   */
+  Param(ParamType atype,
+        const char* aname, const char* adesc, float aval, float aminval = 0, float amaxval = 255,
+        const char* afmt = "%.0f", const char** achoice_strs = NULL) {
+    type = atype;
+    name = aname;
+    desc = adesc;
+    val = aval;
+    minval = aminval;
+    maxval = amaxval;
+    fmt = afmt;
+    choice_strs = achoice_strs;
+  }
+
+  // return the 0.0-1.0 "percentage" the val is in between minval and maxval
+  float percent() {
+    return (val - minval) / (maxval - minval);
+  }
+
+  // set val based on the "percentage" it should be between minval and maxval
+  void set_percent(float pct) {
+    val = pct * (maxval - minval) + minval;
+  }
+ 
+  // turn the Param's value into a string,
+  void val_to_str(char* s, int slen) {
+    if (choice_strs != NULL) {  // it's a ParamChoice
+      snprintf(s, slen, "%s", choice_strs[(int)val]);
+    } else {
+      snprintf(s, slen, fmt, val);  // else ParamRange
+    }
+  }
+
+  ParamType type;            // type of this param, Range or Choice
+  const char* name;          // name of param
+  const char* desc;
+  float val;                 // value of param, even if a byte value from 0-255
+  float minval;              // the minimum allowed value
+  float maxval;              // maximum allowed value, or num_choices
+  const char* fmt;           // how to format the value as a string
+  const char** choice_strs;  // list of choices, if it's a ParamChoice
+};
+
+
+/*!
+ *  @brief A Patch is a collection of Params with a name
+ */
+class Patch {
+public:
+  Patch(const char* aname, Param* aparams, int nparams) {
+    strncpy(name, aname, 20);
+    num_params = nparams;
+    params = (Param*)malloc(sizeof(Param) * nparams);
+    for (int i = 0; i < nparams; i++) {
+      params[i] = Param(aparams[i]);
+    }
+  }
+  char name[20];
+  Param* params;
+  int num_params;
+};
+
+#endif

arduino/hwtest/hwtest2_guitest/SynthUI.h

@@ -1,6 +1,8 @@
 #ifndef SYNTHUI_H
 #define SYNTHUI_H
 
+#include <stdio.h>
+#include <stdarg.h>
 #include <Adafruit_GFX.h>
 
 #define KEY_NONE 0    // No key presses are detected
@@ -11,62 +13,17 @@
 #define KEY_CANCEL 5  // Cancel key is pressed (navigate to the previous (parent) menu page, exit edit mode without saving the variable, exit context loop if allowed within context's settings)
 #define KEY_OK 6      // Ok/Apply key is pressed (toggle bool menu item, enter edit mode of the associated non-bool variable, exit edit mode with saving the variable, execute code associated with button)
 
-class Param {
-public:
-  // construct a Param from another Param
-  Param(Param* p) {
-    name = p->name;
-    val = p->val;
-    minval = p->minval;
-    maxval = p->maxval;
-    fmt = p->fmt;
-  }
-
-  Param(const char* aname, float aval, float aminval = 0, float amaxval = 255, const char* afmt = "%.0f") {
-    name = aname;
-    val = aval;
-    minval = aminval;
-    maxval = amaxval;
-    fmt = afmt;
-  }
-  // return the 0.0-1.0 "percentage" the val is in between minval and maxval
-  float percent() {
-    return (val - minval) / (maxval - minval);
-  }
-  // set val based on the "percentage" it should be between minval and maxval
-  void set_percent(float pct) {
-    val = pct * (maxval - minval) + minval;
-  }
-
-  const char* name; // name of param
-  float val;        // value of param, even if a byte value from 0-255
-  float minval;     // the minimum allowed value 
-  float maxval;     // maximum allowed value
-  const char* fmt;  // how to format the value as a string
-};
-
-class Patch {
-public:
-  Patch(const char* aname, Param* aparams, int nparams) {
-    snprintf(name, 20, aname);
-    num_params = nparams;
-    params = (Param*) malloc(sizeof(Param) * nparams);
-    for(int i=0; i<nparams; i++ ) {
-      params[i] = Param(aparams[i]);
-    }
-  }
-  char name[20];
-  Param* params;
-  int num_params;
-};
-
 
 class SynthUI {
 public:
   SynthUI(Adafruit_GFX* adisplay) {
     display = adisplay;
   }
 
+  void set_font(const GFXfont* fnt = NULL) {
+    display->setFont(fnt);
+  }
+  
   /** 
    * Print text at a given x,y, using an optionally specified font
    */
@@ -77,6 +34,15 @@ class SynthUI {
     display->print(str);
   }
 
+  void print_textf(int x, int y, const char* fmt, ...) {
+    char buf[80];
+    va_list va;
+    va_start(va, fmt);
+    vsnprintf(buf, 80, fmt, va);
+    va_end(va);
+    print_text(x, y, buf);
+  }
+
   /** 
    * Draw vertical slider with a "thumb" position identifying value
    * thumpos ranges 0.0-1.0