Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Daisy board definitions to use new Pin system #581

Merged
merged 11 commits into from
Jun 13, 2023
Merged

Update Daisy board definitions to use new Pin system #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1b85e84
Update DaisyPatch to use new Pin system
stellar-aria May 21, 2023
e43f28e
Update DaisyField
stellar-aria May 27, 2023
0083bbd
Update DaisyVersio
stellar-aria May 27, 2023
4b910dc
Update DaisyPod
stellar-aria May 27, 2023
b5904fa
Update DaisyPetal
stellar-aria May 27, 2023
e81050c
update DaisyLegio
stellar-aria May 27, 2023
5c30e60
Update daisy::patch_sm
stellar-aria May 27, 2023
feb013c
Convert dsy_gpio_pin type operator to constexpr
stellar-aria May 29, 2023
a76199b
Move externally-namespaced Pin definitions into DaisyPatchSM
stellar-aria Jun 3, 2023
b8c3968
Style Compliance
stellar-aria Jun 3, 2023
67021f3
Style compliance for src/daisy_patch_sm.h
stellar-aria Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/daisy_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,10 @@ struct Pin
* This allows the new Pin type to be used in place of the older, dsy_gpio_pin
* type.
*/
operator dsy_gpio_pin() const
constexpr operator dsy_gpio_pin() const
{
return dsy_pin(static_cast<dsy_gpio_port>(port), pin);
return dsy_gpio_pin{.port = static_cast<dsy_gpio_port>(port),
.pin = pin};
}
};

Expand Down
100 changes: 48 additions & 52 deletions src/daisy_field.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,40 +32,40 @@
//#define CV3_ADC_PIN 23 /**< & */
//#define CV4_ADC_PIN 22 /**< & */

using namespace daisy;

// Rev2 Pins
#define PIN_GATE_IN 0
#define PIN_SPI_CS 7
#define PIN_SPI_SCK 8
#define PIN_OLED_CMD 9
#define PIN_SPI_MOSI 10
#define PIN_I2C_SCL 11
#define PIN_I2C_SDA 12
#define PIN_MIDI_OUT 13
#define PIN_MIDI_IN 14
#define PIN_GATE_OUT 15
#define PIN_ADC_POT_MUX 16
#define PIN_ADC_CV_1 17
#define PIN_ADC_CV_2 18
#define PIN_MUX_SEL_2 19
#define PIN_MUX_SEL_1 20
#define PIN_MUX_SEL_0 21
#define PIN_CD4021_D1 26
#define PIN_CD4021_CS 27
#define PIN_CD4021_CLK 28
#define PIN_SW_2 29
#define PIN_SW_1 30
constexpr Pin PIN_GATE_IN = seed::D0;
constexpr Pin PIN_SPI_CS = seed::D7;
constexpr Pin PIN_SPI_SCK = seed::D8;
constexpr Pin PIN_OLED_CMD = seed::D9;
constexpr Pin PIN_SPI_MOSI = seed::D10;
constexpr Pin PIN_I2C_SCL = seed::D11;
constexpr Pin PIN_I2C_SDA = seed::D12;
constexpr Pin PIN_MIDI_OUT = seed::D13;
constexpr Pin PIN_MIDI_IN = seed::D14;
constexpr Pin PIN_GATE_OUT = seed::D15;
constexpr Pin PIN_ADC_POT_MUX = seed::D16;
constexpr Pin PIN_ADC_CV_1 = seed::D17;
constexpr Pin PIN_ADC_CV_2 = seed::D18;
constexpr Pin PIN_MUX_SEL_2 = seed::D19;
constexpr Pin PIN_MUX_SEL_1 = seed::D20;
constexpr Pin PIN_MUX_SEL_0 = seed::D21;
constexpr Pin PIN_CD4021_D1 = seed::D26;
constexpr Pin PIN_CD4021_CS = seed::D27;
constexpr Pin PIN_CD4021_CLK = seed::D28;
constexpr Pin PIN_SW_2 = seed::D29;
constexpr Pin PIN_SW_1 = seed::D30;

// IT LOOKS LIKE THESE MAY NEED TO GET SWAPPED.....
#define PIN_DAC_2 22 // Jumped on Rev2 from 24
#define PIN_DAC_1 23 // Jumped on Rev2 from 25
#define PIN_ADC_CV_4 24 // Jumped on Rev2 from 22
#define PIN_ADC_CV_3 25 // Jumped on Rev2 from 23

using namespace daisy;
constexpr Pin PIN_DAC_2 = seed::D22; // Jumped on Rev2 from 24
constexpr Pin PIN_DAC_1 = seed::D23; // Jumped on Rev2 from 25
constexpr Pin PIN_ADC_CV_4 = seed::D24; // Jumped on Rev2 from 22
constexpr Pin PIN_ADC_CV_3 = seed::D25; // Jumped on Rev2 from 23

static constexpr I2CHandle::Config field_led_i2c_config
= {I2CHandle::Config::Peripheral::I2C_1,
{{DSY_GPIOB, 8}, {DSY_GPIOB, 9}},
{Pin(PORTB, 8), Pin(PORTB, 9)},
I2CHandle::Config::Speed::I2C_1MHZ};

static LedDriverPca9685<2, true>::DmaBuffer DMA_BUFFER_MEM_SECTION
Expand All @@ -79,31 +79,30 @@ void DaisyField::Init(bool boost)
seed.SetAudioBlockSize(48);

// Switches
uint8_t sw_pin[] = {PIN_SW_1, PIN_SW_2};
uint8_t adc_pin[] = {PIN_ADC_CV_1,
PIN_ADC_CV_2,
PIN_ADC_CV_3,
PIN_ADC_CV_4,
PIN_ADC_POT_MUX};
Pin sw_pin[] = {PIN_SW_1, PIN_SW_2};
Pin adc_pin[] = {PIN_ADC_CV_1,
PIN_ADC_CV_2,
PIN_ADC_CV_3,
PIN_ADC_CV_4,
PIN_ADC_POT_MUX};

for(size_t i = 0; i < SW_LAST; i++)
{
dsy_gpio_pin p = seed.GetPin(sw_pin[i]);
sw[i].Init(p);
sw[i].Init(sw_pin[i]);
}

// ADCs
AdcChannelConfig adc_cfg[CV_LAST + 1];
for(size_t i = 0; i < CV_LAST; i++)
{
adc_cfg[i].InitSingle(seed.GetPin(adc_pin[i]));
adc_cfg[i].InitSingle(adc_pin[i]);
}
// POT MUX
adc_cfg[CV_LAST].InitMux(seed.GetPin(PIN_ADC_POT_MUX),
8,
seed.GetPin(PIN_MUX_SEL_0),
seed.GetPin(PIN_MUX_SEL_1),
seed.GetPin(PIN_MUX_SEL_2));
adc_cfg[CV_LAST].InitMux(PIN_ADC_POT_MUX, // Pin
8, // Channels
PIN_MUX_SEL_0,
PIN_MUX_SEL_1,
PIN_MUX_SEL_2);
seed.adc.Init(adc_cfg, 5);

// Order of pots on the hardware connected to mux.
Expand All @@ -119,18 +118,17 @@ void DaisyField::Init(bool boost)

// Keyboard
ShiftRegister4021<2>::Config keyboard_cfg;
keyboard_cfg.clk = seed.GetPin(PIN_CD4021_CLK);
keyboard_cfg.latch = seed.GetPin(PIN_CD4021_CS);
keyboard_cfg.data[0] = seed.GetPin(PIN_CD4021_D1);
keyboard_cfg.clk = PIN_CD4021_CLK;
keyboard_cfg.latch = PIN_CD4021_CS;
keyboard_cfg.data[0] = PIN_CD4021_D1;
keyboard_sr_.Init(keyboard_cfg);

// OLED
OledDisplay<SSD130x4WireSpi128x64Driver>::Config display_config;

display_config.driver_config.transport_config.pin_config.dc
= seed.GetPin(PIN_OLED_CMD);
display_config.driver_config.transport_config.pin_config.dc = PIN_OLED_CMD;
display_config.driver_config.transport_config.pin_config.reset
= {DSY_GPIOX, 0}; // Not a real pin...
= Pin(PORTX, 0); // Not a real pin...

display.Init(display_config);

Expand All @@ -142,13 +140,11 @@ void DaisyField::Init(bool boost)
led_driver.Init(i2c, addr, field_led_dma_buffer_a, field_led_dma_buffer_b);

// Gate In
dsy_gpio_pin gate_in_pin;
gate_in_pin = seed.GetPin(PIN_GATE_IN);
gate_in.Init(&gate_in_pin);
gate_in.Init(PIN_GATE_IN);
// Gate Out
gate_out.mode = DSY_GPIO_MODE_OUTPUT_PP;
gate_out.pull = DSY_GPIO_NOPULL;
gate_out.pin = seed.GetPin(PIN_GATE_OUT);
gate_out.pin = PIN_GATE_OUT;
dsy_gpio_init(&gate_out);

//midi
Expand Down
68 changes: 31 additions & 37 deletions src/daisy_legio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@

using namespace daisy;

#define PIN_SW_ENC 1
#define PIN_TRIG_GATE 18
#define PIN_TOGGLE3_RIGHT_A 30
#define PIN_TOGGLE3_RIGHT_B 29
#define PIN_TOGGLE3_LEFT_A 17
#define PIN_TOGGLE3_LEFT_B 15
#define PIN_ENC_A 2
#define PIN_ENC_B 3

#define PIN_LED_LEFT_R 28
#define PIN_LED_LEFT_G 6
#define PIN_LED_LEFT_B 5
#define PIN_LED_RIGHT_R 26
#define PIN_LED_RIGHT_G 25
#define PIN_LED_RIGHT_B 24

#define PIN_ADC_PITCH0 22
#define PIN_ADC_PITCH1 23
#define PIN_ADC_CV0 19
#define PIN_ADC_CV1 21
constexpr Pin PIN_SW_ENC = seed::D1;
constexpr Pin PIN_TRIG_GATE = seed::D18;
constexpr Pin PIN_TOGGLE3_RIGHT_A = seed::D30;
constexpr Pin PIN_TOGGLE3_RIGHT_B = seed::D29;
constexpr Pin PIN_TOGGLE3_LEFT_A = seed::D17;
constexpr Pin PIN_TOGGLE3_LEFT_B = seed::D15;
constexpr Pin PIN_ENC_A = seed::D2;
constexpr Pin PIN_ENC_B = seed::D3;

constexpr Pin PIN_LED_LEFT_R = seed::D28;
constexpr Pin PIN_LED_LEFT_G = seed::D6;
constexpr Pin PIN_LED_LEFT_B = seed::D5;
constexpr Pin PIN_LED_RIGHT_R = seed::D26;
constexpr Pin PIN_LED_RIGHT_G = seed::D25;
constexpr Pin PIN_LED_RIGHT_B = seed::D24;

constexpr Pin PIN_ADC_PITCH0 = seed::D22;
constexpr Pin PIN_ADC_PITCH1 = seed::D23;
constexpr Pin PIN_ADC_CV0 = seed::D19;
constexpr Pin PIN_ADC_CV1 = seed::D21;

void DaisyLegio::Init(bool boost)
{
Expand All @@ -31,33 +31,30 @@ void DaisyLegio::Init(bool boost)
seed.SetAudioBlockSize(48);
float blockrate_ = seed.AudioSampleRate() / (float)seed.AudioBlockSize();

uint8_t toggle_pina[] = {PIN_TOGGLE3_LEFT_A, PIN_TOGGLE3_RIGHT_A};
uint8_t toggle_pinb[] = {PIN_TOGGLE3_LEFT_B, PIN_TOGGLE3_RIGHT_B};
uint8_t ledr_pin[] = {PIN_LED_LEFT_R, PIN_LED_RIGHT_R};
uint8_t ledg_pin[] = {PIN_LED_LEFT_G, PIN_LED_RIGHT_G};
uint8_t ledb_pin[] = {PIN_LED_LEFT_B, PIN_LED_RIGHT_B};
uint8_t adc_pin[] = {PIN_ADC_PITCH0, PIN_ADC_CV0, PIN_ADC_CV1};
Pin toggle_pina[] = {PIN_TOGGLE3_LEFT_A, PIN_TOGGLE3_RIGHT_A};
Pin toggle_pinb[] = {PIN_TOGGLE3_LEFT_B, PIN_TOGGLE3_RIGHT_B};
Pin ledr_pin[] = {PIN_LED_LEFT_R, PIN_LED_RIGHT_R};
Pin ledg_pin[] = {PIN_LED_LEFT_G, PIN_LED_RIGHT_G};
Pin ledb_pin[] = {PIN_LED_LEFT_B, PIN_LED_RIGHT_B};
Pin adc_pin[] = {PIN_ADC_PITCH0, PIN_ADC_CV0, PIN_ADC_CV1};

// push-button encoder
encoder.Init(seed.GetPin(PIN_ENC_A),
seed.GetPin(PIN_ENC_B),
seed.GetPin(PIN_SW_ENC));
encoder.Init(PIN_ENC_A, PIN_ENC_B, PIN_SW_ENC);

// gate CV gate
dsy_gpio_pin gate_gpio = seed.GetPin(PIN_TRIG_GATE);
gate.Init(&gate_gpio, false);
gate.Init(PIN_TRIG_GATE, false);

// 3-position switches
for(size_t i = 0; i < SW_LAST; i++)
{
sw[i].Init(seed.GetPin(toggle_pina[i]), seed.GetPin(toggle_pinb[i]));
sw[i].Init(toggle_pina[i], toggle_pinb[i]);
}

// ADC
AdcChannelConfig adc_cfg[CONTROL_LAST];
for(size_t i = 0; i < CONTROL_LAST; i++)
{
adc_cfg[i].InitSingle(seed.GetPin(adc_pin[i]));
adc_cfg[i].InitSingle(adc_pin[i]);
}
seed.adc.Init(adc_cfg, CONTROL_LAST);

Expand All @@ -69,10 +66,7 @@ void DaisyLegio::Init(bool boost)
// RGB LEDs
for(size_t i = 0; i < LED_LAST; i++)
{
dsy_gpio_pin r = seed.GetPin(ledr_pin[i]);
dsy_gpio_pin g = seed.GetPin(ledg_pin[i]);
dsy_gpio_pin b = seed.GetPin(ledb_pin[i]);
leds[i].Init(r, g, b, true);
leds[i].Init(ledr_pin[i], ledg_pin[i], ledb_pin[i], true);
}
}

Expand Down
Loading