From b508d8ae9030b0ad0f22c465a41508562c4cb27a Mon Sep 17 00:00:00 2001 From: Katherine Whitlock Date: Sat, 27 May 2023 19:23:16 -0400 Subject: [PATCH] Update daisy::patch_sm to use GPIO --- src/daisy_patch_sm.cpp | 18 ++++-------------- src/daisy_patch_sm.h | 4 ++-- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/daisy_patch_sm.cpp b/src/daisy_patch_sm.cpp index 2a5102934..69f8e4e53 100644 --- a/src/daisy_patch_sm.cpp +++ b/src/daisy_patch_sm.cpp @@ -234,23 +234,13 @@ namespace patch_sm } /** Fixed-function Digital I/O */ - user_led.mode = DSY_GPIO_MODE_OUTPUT_PP; - user_led.pull = DSY_GPIO_NOPULL; - user_led.pin = PIN_USER_LED; - dsy_gpio_init(&user_led); + user_led.Init(PIN_USER_LED, GPIO::Mode::OUTPUT); //gate_in_1.Init((dsy_gpio_pin *)&DaisyPatchSM::B10); gate_in_1.Init(B10); gate_in_2.Init(B9); - gate_out_1.mode = DSY_GPIO_MODE_OUTPUT_PP; - gate_out_1.pull = DSY_GPIO_NOPULL; - gate_out_1.pin = B5; - dsy_gpio_init(&gate_out_1); - - gate_out_2.mode = DSY_GPIO_MODE_OUTPUT_PP; - gate_out_2.pull = DSY_GPIO_NOPULL; - gate_out_2.pin = B6; - dsy_gpio_init(&gate_out_2); + gate_out_1.Init(B5, GPIO::Mode::OUTPUT); + gate_out_2.Init(B6, GPIO::Mode::OUTPUT); /** DAC init */ pimpl_->InitDac(); @@ -400,7 +390,7 @@ namespace patch_sm void DaisyPatchSM::SetLed(bool state) { - dsy_gpio_write(&user_led, state); + user_led.Write(state); } bool DaisyPatchSM::ValidateSDRAM() diff --git a/src/daisy_patch_sm.h b/src/daisy_patch_sm.h index 58018c59b..6a9eb401c 100644 --- a/src/daisy_patch_sm.h +++ b/src/daisy_patch_sm.h @@ -251,10 +251,10 @@ namespace patch_sm DacHandle dac; /** Dedicated Function Pins */ - dsy_gpio user_led; + GPIO user_led; AnalogControl controls[ADC_LAST]; GateIn gate_in_1, gate_in_2; - dsy_gpio gate_out_1, gate_out_2; + GPIO gate_out_1, gate_out_2; class Impl;