diff options
| author | Clyne Sullivan <clyne@bitgloo.com> | 2020-08-25 21:01:08 -0400 |
|---|---|---|
| committer | Clyne Sullivan <clyne@bitgloo.com> | 2020-08-25 21:01:08 -0400 |
| commit | 7077b8d448a847f593402381be5244f86eae75e8 (patch) | |
| tree | b4aec8dc916e282c014d352c39c08eb76b8a08c2 /source | |
| parent | dccf7ed52d4d5fc73f5db57c0ccfb4faf8588c16 (diff) | |
stable signal handling towards 100kHz
Diffstat (limited to 'source')
| -rw-r--r-- | source/adc.cpp | 8 | ||||
| -rw-r--r-- | source/dac.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/adc.cpp b/source/adc.cpp index 1f65e68..c912a7e 100644 --- a/source/adc.cpp +++ b/source/adc.cpp @@ -29,7 +29,7 @@ static void adc_read_callback(ADCDriver *); .cfgr2 = 0, .tr1 = ADC_TR(0, 4095), .smpr = { - ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_247P5), 0 + ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_2P5), 0 }, .sqr = { ADC_SQR1_SQ1_N(ADC_CHANNEL_IN5), @@ -38,7 +38,7 @@ static void adc_read_callback(ADCDriver *); }; constexpr static const GPTConfig gpt_config = { - .frequency = 1000000, + .frequency = 4000000, .callback = nullptr, .cr2 = TIM_CR2_MMS_1, /* TRGO */ .dier = 0 @@ -65,7 +65,7 @@ namespace adc adc_is_read_finished = false; adc_group_config.circular = false; adcStartConversion(adcd, &adc_group_config, buffer, count); - gptStartContinuous(gptd, 100); // 10kHz + gptStartContinuous(gptd, 2); while (!adc_is_read_finished); return buffer; } @@ -77,7 +77,7 @@ namespace adc adc_operation_func = operation_func; adc_group_config.circular = true; adcStartConversion(adcd, &adc_group_config, buffer, count); - gptStartContinuous(gptd, 100); // 10kHz + gptStartContinuous(gptd, 2); } void read_stop() diff --git a/source/dac.cpp b/source/dac.cpp index 644689e..6d5950e 100644 --- a/source/dac.cpp +++ b/source/dac.cpp @@ -28,7 +28,7 @@ constexpr static const DACConversionGroup dac_group_config = { }; constexpr static const GPTConfig gpt_config = { - .frequency = 1000000, + .frequency = 4000000, .callback = nullptr, .cr2 = TIM_CR2_MMS_1, /* TRGO */ .dier = 0 @@ -48,7 +48,7 @@ namespace dac void write_start(dacsample_t *buffer, size_t count) { dacStartConversion(dacd, &dac_group_config, buffer, count); - gptStartContinuous(gptd, 100); + gptStartContinuous(gptd, 2); } void write_stop() |