Merge remote-tracking branch 'origin/UXV_SR' into UXV_SR

This commit is contained in:
Frank Severinsen 2020-12-22 00:21:58 +01:00
commit 770b2cabbb
1 changed files with 1 additions and 4 deletions

View File

@ -157,7 +157,7 @@ void hw_setup_adc_channels(void) {
ADC_InjectedChannelConfig(ADC3, ADC_Channel_12, 3, ADC_SampleTime_15Cycles);
if (!dac_thread_running && conf->controller_id == 7) {
if (!dac_thread_running) {
chThdCreateStatic(dac_thread_wa, sizeof(dac_thread_wa), NORMALPRIO, dac_thread, NULL);
dac_thread_running = true;
}
@ -265,9 +265,6 @@ THD_FUNCTION(dac_thread, arg) {
RCC_APB1PeriphClockCmd(RCC_APB1Periph_DAC, ENABLE);
DAC->CR |= DAC_CR_EN2;
const float current_scaling_factor = MAX_CURRENT_SUM / 4096;
float current_sum = 0;