Skip to content

Commit 520e752

Browse files
esdenesden
committed
Updated to the new DAC api.
1 parent 0bbafd6 commit 520e752

5 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ static void adc_setup(void)
118118
static void dac_setup(void)
119119
{
120120
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO5);
121-
dac_disable(CHANNEL_2);
122-
dac_disable_waveform_generation(CHANNEL_2);
123-
dac_enable(CHANNEL_2);
124-
dac_set_trigger_source(DAC_CR_TSEL2_SW);
121+
dac_disable(DAC1, DAC_CHANNEL2);
122+
dac_disable_waveform_generation(DAC1, DAC_CHANNEL2);
123+
dac_enable(DAC1, DAC_CHANNEL2);
124+
dac_set_trigger_source(DAC1, DAC_CR_TSEL2_SW);
125125
}
126126

127127
static uint16_t read_adc_naiive(uint8_t channel)
@@ -150,8 +150,8 @@ int main(void)
150150
while (1) {
151151
uint16_t input_adc0 = read_adc_naiive(0);
152152
uint16_t target = input_adc0 / 2;
153-
dac_load_data_buffer_single(target, RIGHT12, CHANNEL_2);
154-
dac_software_trigger(CHANNEL_2);
153+
dac_load_data_buffer_single(DAC1, target, DAC_ALIGN_RIGHT12, DAC_CHANNEL2);
154+
dac_software_trigger(DAC1, DAC_CHANNEL2);
155155
uint16_t input_adc1 = read_adc_naiive(1);
156156
printf("tick: %d: adc0= %u, target adc1=%d, adc1=%d\n",
157157
j++, input_adc0, target, input_adc1);

‎examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ static void adc_setup(void)
109109
static void dac_setup(void)
110110
{
111111
gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO5);
112-
dac_disable(CHANNEL_2);
113-
dac_disable_waveform_generation(CHANNEL_2);
114-
dac_enable(CHANNEL_2);
115-
dac_set_trigger_source(DAC_CR_TSEL2_SW);
112+
dac_disable(DAC1, DAC_CHANNEL2);
113+
dac_disable_waveform_generation(DAC1, DAC_CHANNEL2);
114+
dac_enable(DAC1, DAC_CHANNEL2);
115+
dac_set_trigger_source(DAC1, DAC_CR_TSEL2_SW);
116116
}
117117

118118
static uint16_t read_adc_naiive(uint8_t channel)
@@ -143,8 +143,8 @@ int main(void)
143143
while (1) {
144144
uint16_t input_adc0 = read_adc_naiive(0);
145145
uint16_t target = input_adc0 / 2;
146-
dac_load_data_buffer_single(target, RIGHT12, CHANNEL_2);
147-
dac_software_trigger(CHANNEL_2);
146+
dac_load_data_buffer_single(DAC1, target, DAC_ALIGN_RIGHT12, DAC_CHANNEL2);
147+
dac_software_trigger(DAC1, DAC_CHANNEL2);
148148
uint16_t input_adc1 = read_adc_naiive(1);
149149
printf("tick: %d: adc0= %u, target adc1=%d, adc1=%d\n",
150150
j++, input_adc0, target, input_adc1);

‎examples/stm32/f4/stm32f4-discovery/dac-dma/dac-dma.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static void dma_setup(void)
9191
DMA_SxCR_DIR_MEM_TO_PERIPHERAL);
9292
/* The register to target is the DAC1 8-bit right justified data
9393
register */
94-
dma_set_peripheral_address(DMA1, DMA_STREAM5, (uint32_t) &DAC_DHR8R1);
94+
dma_set_peripheral_address(DMA1, DMA_STREAM5, (uint32_t) &DAC_DHR8R1(DAC1));
9595
/* The array v[] is filled with the waveform data to be output */
9696
dma_set_memory_address(DMA1, DMA_STREAM5, (uint32_t) waveform);
9797
dma_set_number_of_data(DMA1, DMA_STREAM5, 256);
@@ -107,10 +107,10 @@ static void dac_setup(void)
107107
rcc_periph_clock_enable(RCC_DAC);
108108
/* Setup the DAC channel 1, with timer 2 as trigger source.
109109
* Assume the DAC has woken up by the time the first transfer occurs */
110-
dac_trigger_enable(CHANNEL_1);
111-
dac_set_trigger_source(DAC_CR_TSEL1_T2);
112-
dac_dma_enable(CHANNEL_1);
113-
dac_enable(CHANNEL_1);
110+
dac_trigger_enable(DAC1, DAC_CHANNEL1);
111+
dac_set_trigger_source(DAC1, DAC_CR_TSEL1_T2);
112+
dac_dma_enable(DAC1, DAC_CHANNEL1);
113+
dac_enable(DAC1, DAC_CHANNEL1);
114114
}
115115

116116
/*--------------------------------------------------------------------*/

‎examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ static void adc_setup(void)
110110
static void dac_setup(void)
111111
{
112112
gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO5);
113-
dac_disable(CHANNEL_2);
114-
dac_disable_waveform_generation(CHANNEL_2);
115-
dac_enable(CHANNEL_2);
116-
dac_set_trigger_source(DAC_CR_TSEL2_SW);
113+
dac_disable(DAC1, DAC_CHANNEL2);
114+
dac_disable_waveform_generation(DAC1, DAC_CHANNEL2);
115+
dac_enable(DAC1, DAC_CHANNEL2);
116+
dac_set_trigger_source(DAC1, DAC_CR_TSEL2_SW);
117117
}
118118

119119
static uint16_t read_adc_naiive(uint8_t channel)
@@ -144,8 +144,8 @@ int main(void)
144144
while (1) {
145145
uint16_t input_adc0 = read_adc_naiive(0);
146146
uint16_t target = input_adc0 / 2;
147-
dac_load_data_buffer_single(target, RIGHT12, CHANNEL_2);
148-
dac_software_trigger(CHANNEL_2);
147+
dac_load_data_buffer_single(DAC1, target, DAC_ALIGN_RIGHT12, DAC_CHANNEL2);
148+
dac_software_trigger(DAC1, DAC_CHANNEL2);
149149
uint16_t input_adc1 = read_adc_naiive(1);
150150
printf("tick: %d: adc0= %u, target adc1=%d, adc1=%d\n",
151151
j++, input_adc0, target, input_adc1);

‎examples/stm32/f4/stm32f429i-discovery/dac-dma/dac-dma.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static void dma_setup(void)
9292
DMA_SxCR_DIR_MEM_TO_PERIPHERAL);
9393
/* The register to target is the DAC1 8-bit right justified data
9494
register */
95-
dma_set_peripheral_address(DMA1, DMA_STREAM5, (uint32_t) &DAC_DHR8R1);
95+
dma_set_peripheral_address(DMA1, DMA_STREAM5, (uint32_t) &DAC_DHR8R1(DAC1));
9696
/* The array v[] is filled with the waveform data to be output */
9797
dma_set_memory_address(DMA1, DMA_STREAM5, (uint32_t) waveform);
9898
dma_set_number_of_data(DMA1, DMA_STREAM5, 256);
@@ -108,10 +108,10 @@ static void dac_setup(void)
108108
rcc_periph_clock_enable(RCC_DAC);
109109
/* Setup the DAC channel 1, with timer 2 as trigger source.
110110
* Assume the DAC has woken up by the time the first transfer occurs */
111-
dac_trigger_enable(CHANNEL_1);
112-
dac_set_trigger_source(DAC_CR_TSEL1_T2);
113-
dac_dma_enable(CHANNEL_1);
114-
dac_enable(CHANNEL_1);
111+
dac_trigger_enable(DAC1, DAC_CHANNEL1);
112+
dac_set_trigger_source(DAC1, DAC_CR_TSEL1_T2);
113+
dac_dma_enable(DAC1, DAC_CHANNEL1);
114+
dac_enable(DAC1, DAC_CHANNEL1);
115115
}
116116

117117
/*--------------------------------------------------------------------*/

0 commit comments

Comments
 (0)