start adjusting daisy for new pin assignments (#310)

* start adjusting daisy for new pin assignments
* adjust GPIO defs
* correct codec config and init
* remove pullup from patch.init switch
* update changelog

Author: dromer

CHANGELOG.md

@@ -23,6 +23,7 @@ Updates:
 
 * drop py3.8 - add py3.13
 * integrate json2daisy library, tests and documentation
+* move to libDaisy 8.x pin definitions
 
 0.13.4
 -----

hvcc/generators/c2daisy/json2daisy/json2daisy.py

@@ -304,6 +304,8 @@ def generate_header(board_description_dict: dict) -> 'tuple[str, dict]':
     ).from_string(header_str)
 
     rendered_header = header_env.render(replacements)
+    rendered_header_lines = rendered_header.splitlines()
+    rendered_header = "\n".join(line.rstrip() for line in rendered_header_lines) + "\n"
 
     # removing all unnecessary fields
     for comp in components:

hvcc/generators/c2daisy/json2daisy/resources/component_defs.json

@@ -12,13 +12,12 @@
 		]
 	},
 	"Switch": {
-		"map_init": "{name}.Init(som.GetPin({pin}), som.AudioCallbackRate(), {type}, {polarity}, {pull});",
+		"map_init": "{name}.Init(som.GetPin({pin}), som.AudioCallbackRate(), {type}, {polarity});",
 		"typename": "daisy::Switch",
 		"direction": "in",
 		"pin": "a",
 		"type": "daisy::Switch::TYPE_MOMENTARY",
 		"polarity": "daisy::Switch::POLARITY_INVERTED",
-		"pull": "daisy::Switch::PULL_UP",
 		"process": "{name}.Debounce();",
 		"updaterate": "{name}.SetUpdateRate(som.AudioCallbackRate());",
 		"mapping": [
@@ -127,7 +126,7 @@
 		]
 	},
 	"GateIn": {
-		"map_init": "dsy_gpio_pin {name}_pin = som.GetPin({pin});\n    {name}.Init(&{name}_pin, {invert});",
+		"map_init": "{name}.Init(som.GetPin({pin}), {invert});",
 		"typename": "daisy::GateIn",
 		"direction": "in",
 		"pin": "a",
@@ -221,16 +220,16 @@
 		]
 	},
 	"GateOut": {
-		"map_init": "{name}.pin  = som.GetPin({pin});\n    {name}.mode = {mode};\n    {name}.pull = {pull};\n    dsy_gpio_init(&{name});",
-		"typename": "dsy_gpio",
+		"map_init": "{name}.Init(som.GetPin({pin}), {mode}, {pull});",
+		"typename": "daisy::GPIO",
 		"direction": "out",
 		"pin": "a",
-		"mode": "DSY_GPIO_MODE_OUTPUT_PP",
-		"pull": "DSY_GPIO_NOPULL",
+		"mode": "daisy::GPIO::Mode::OUTPUT",
+		"pull": "daisy::GPIO::Pull::NOPULL",
 		"mapping": [
 			{
 				"name": "{name}",
-				"set": "dsy_gpio_write(&{class_name}.{name}, {value});",
+				"set": "{class_name}.{name}.Write({value});",
 				"where": "hook"
 			}
 		]

hvcc/generators/c2daisy/json2daisy/resources/component_defs_patchsm.json

@@ -12,13 +12,12 @@
 		]
 	},
 	"Switch": {
-		"map_init": "{name}.Init(daisy::patch_sm::DaisyPatchSM::{pin}, som.AudioCallbackRate(), {type}, {polarity}, {pull});",
+		"map_init": "{name}.Init(daisy::patch_sm::DaisyPatchSM::{pin}, som.AudioCallbackRate(), {type}, {polarity});",
 		"typename": "daisy::Switch",
 		"direction": "in",
 		"pin": "a",
 		"type": "daisy::Switch::TYPE_MOMENTARY",
 		"polarity": "daisy::Switch::POLARITY_INVERTED",
-		"pull": "daisy::Switch::PULL_UP",
 		"process": "{name}.Debounce();",
 		"updaterate": "{name}.SetUpdateRate(som.AudioCallbackRate());",
 		"mapping": [
@@ -221,17 +220,17 @@
 		]
 	},
 	"GateOut": {
-		"map_init": "{name}.pin  = daisy::patch_sm::DaisyPatchSM::{pin};\n\t\t{name}.mode = {mode};\n\t\t{name}.pull = {pull};\n\t\tdsy_gpio_init(&{name});",
-		"typename": "dsy_gpio",
+		"map_init": "{name}.Init(daisy::patch_sm::DaisyPatchSM::{pin}, {mode}, {pull});",
+		"typename": "daisy::GPIO",
 		"direction": "out",
 		"pin": "a",
 		"default_prefix": "som.",
-		"mode": "DSY_GPIO_MODE_OUTPUT_PP",
-		"pull": "DSY_GPIO_NOPULL",
+		"mode": "daisy::GPIO::Mode::OUTPUT",
+		"pull": "daisy::GPIO::Pull::NOPULL",
 		"mapping": [
 			{
 				"name": "{name}",
-				"set": "dsy_gpio_write(&{class_name}.{default_prefix}{name}, {value});"
+				"set": "{class_name}.{default_prefix}{name}.Write({value});"
 			}
 		]
 	},

hvcc/generators/c2daisy/json2daisy/templates/daisy.h

@@ -24,97 +24,97 @@ struct Daisy{{ name|capitalize }} {
   /** Initializes the board according to the JSON board description
    *  \param boost boosts the clock speed from 400 to 480 MHz
    */
-  void Init(bool boost=true) 
+  void Init(bool boost=true)
   {
     {% if som == 'seed' %}
     som.Configure();
     som.Init(boost);
     {% else %}
     som.Init();
     {% endif %}
-    {% if init != '' %} 
+    {% if init != '' %}
 
-    {{init}} 
+    {{init}}
     {% endif %}
     {% if i2c != '' %}
 
     // i2c
-    {{ i2c }} 
+    {{ i2c }}
     {% endif %}
-    {% if PCA9685 != '' %} 
+    {% if PCA9685 != '' %}
 
     // LED Drivers
-    {{ PCA9685 }} 
+    {{ PCA9685 }}
     {% endif %}
-    {% if Switch != '' %} 
+    {% if Switch != '' %}
 
     // Switches
-    {{ Switch }} 
+    {{ Switch }}
     {% endif %}
     {% if Switch3 != '' %}
 
     // SPDT Switches
-    {{ Switch3 }} 
+    {{ Switch3 }}
     {% endif %}
-    {% if CD4021 != '' %} 
+    {% if CD4021 != '' %}
 
     // Muxes
-    {{ CD4021 }} 
+    {{ CD4021 }}
     {% endif %}
-    {% if GateIn != '' %} 
+    {% if GateIn != '' %}
 
     // Gate ins
-    {{ GateIn }} 
+    {{ GateIn }}
     {% endif %}
-    {% if Encoder != '' %} 
+    {% if Encoder != '' %}
 
     // Rotary encoders
-    {{ Encoder }} 
+    {{ Encoder }}
     {% endif %}
-    {% if init_single != '' %} 
+    {% if init_single != '' %}
 
     // Single channel ADC initialization
-    {{ init_single }} 
+    {{ init_single }}
     {% endif %}
     {% if som == 'seed' %}
     {% if analogcount > 0 %}
     som.adc.Init(cfg, ANALOG_COUNT);
     {% endif %}
     {% endif %}
-    {% if ctrl_init != '' %} 
+    {% if ctrl_init != '' %}
 
     // AnalogControl objects
-    {{ ctrl_init }} 
+    {{ ctrl_init }}
     {% endif %}
-    {% if CD4051AnalogControl != '' %} 
+    {% if CD4051AnalogControl != '' %}
 
     // Multiplexed AnlogControl objects
-    {{ CD4051AnalogControl }} 
+    {{ CD4051AnalogControl }}
     {% endif %}
-    {% if Led != '' %} 
+    {% if Led != '' %}
 
     // LEDs
-    {{ Led }} 
+    {{ Led }}
     {% endif %}
     {% if RgbLed != '' %}
 
-    // RBG LEDs 
-    {{ RgbLed }} 
+    // RBG LEDs
+    {{ RgbLed }}
     {% endif %}
-    {% if GateOut != '' %} 
+    {% if GateOut != '' %}
 
     // Gate outs
-    {{ GateOut }} 
+    {{ GateOut }}
     {% endif %}
     {% if CVOuts != '' %}
 
-    // DAC 
-    {{ CVOuts }} 
+    // DAC
+    {{ CVOuts }}
     {% endif %}
     {% if display != '' %}
 
     // Display
-    {{ display }} 
+    {{ display }}
     {% endif %}
     {% if MotorShield != '' %}
 
@@ -204,11 +204,11 @@ struct Daisy{{ name|capitalize }} {
     sai_config[0].b_sync          = daisy::SaiHandle::Config::Sync::SLAVE;
     sai_config[0].a_dir           = daisy::SaiHandle::Config::Direction::TRANSMIT;
     sai_config[0].b_dir           = daisy::SaiHandle::Config::Direction::RECEIVE;
-    sai_config[0].pin_config.fs   = {DSY_GPIOE, 4};
-    sai_config[0].pin_config.mclk = {DSY_GPIOE, 2};
-    sai_config[0].pin_config.sck  = {DSY_GPIOE, 5};
-    sai_config[0].pin_config.sa   = {DSY_GPIOE, 6};
-    sai_config[0].pin_config.sb   = {DSY_GPIOE, 3};
+    sai_config[0].pin_config.fs   = daisy::Pin(daisy::PORTE, 4);
+    sai_config[0].pin_config.mclk = daisy::Pin(daisy::PORTE, 2);
+    sai_config[0].pin_config.sck  = daisy::Pin(daisy::PORTE, 5);
+    sai_config[0].pin_config.sa   = daisy::Pin(daisy::PORTE, 6);
+    sai_config[0].pin_config.sb   = daisy::Pin(daisy::PORTE, 3);
 
     {% for codec in external_codecs %}
     sai_config[{{loop.index}}].periph          = daisy::SaiHandle::Config::Peripheral::{{codec.periph}};
@@ -231,15 +231,16 @@ struct Daisy{{ name|capitalize }} {
     sai_handle[{{loop.index}}].Init(sai_config[{{loop.index}}]);
     {% endfor %}
 
-    dsy_gpio_pin codec_reset_pin = som.GetPin(29);
-    daisy::Ak4556::Init(codec_reset_pin);
+    daisy::Pin codec_reset_pin = som.GetPin(29);
+    daisy::Ak4556 codec;
+    codec.Init(codec_reset_pin);
 
     daisy::AudioHandle::Config cfg;
     cfg.blocksize  = 48;
     cfg.samplerate = daisy::SaiHandle::Config::SampleRate::SAI_48KHZ;
     cfg.postgain   = 0.5f;
     som.audio_handle.Init(
-      cfg, 
+      cfg,
       sai_handle[0]
       {% for codec in external_codecs %}
       ,sai_handle[{{loop.index}}]
@@ -255,20 +256,20 @@ struct Daisy{{ name|capitalize }} {
   }
 
   /** Handles all the controls processing that needs to occur at the block rate
-   * 
+   *
    */
-  void ProcessAllControls() 
+  void ProcessAllControls()
   {
-    {% if process != '' %} 
-    {{ process }} 
+    {% if process != '' %}
+    {{ process }}
     {% endif %}
     {% if som != 'seed' %}
     som.ProcessAllControls();
     {% endif %}
   }
 
   /** Handles all the maintenance processing. This should be run last within the audio callback.
-   * 
+   *
    */
   void PostProcess()
   {
@@ -279,7 +280,7 @@ struct Daisy{{ name|capitalize }} {
   }
 
   /** Handles processing that shouldn't occur in the audio block, such as blocking transfers
-   * 
+   *
    */
   void LoopProcess()
   {
@@ -289,7 +290,7 @@ struct Daisy{{ name|capitalize }} {
   /** Sets the audio sample rate
    *  \param sample_rate the new sample rate in Hz
    */
-  void SetAudioSampleRate(size_t sample_rate) 
+  void SetAudioSampleRate(size_t sample_rate)
   {
     {% if som == 'seed' or som == 'petal_125b_sm' %}
     daisy::SaiHandle::Config::SampleRate enum_rate;
@@ -313,13 +314,13 @@ struct Daisy{{ name|capitalize }} {
   /** Sets the audio block size
    *  \param block_size the new block size in words
    */
-  inline void SetAudioBlockSize(size_t block_size) 
+  inline void SetAudioBlockSize(size_t block_size)
   {
     som.SetAudioBlockSize(block_size);
   }
 
   /** Starts up the audio callback process with the given callback
-   * 
+   *
    */
   inline void StartAudio(daisy::AudioHandle::AudioCallback cb)
   {