Merge branch 'dev' into feature/28-profile-parser

This commit is contained in:
Mario Hüttel 2021-04-04 19:35:52 +02:00
commit 8576bf4231

View File

@ -232,7 +232,7 @@ int adc_pt1000_get_current_resistance(float *resistance)
*resistance = adc_pt1000_apply_calibration(pt1000_res_raw_lf);
if (safety_controller_get_flags_by_mask(ERR_FLAG_MEAS_ADC_OFF | ERR_FLAG_MEAS_ADC_OVERFLOW |
ERR_FLAG_MEAS_ADC_WATCHDOG)) {
ERR_FLAG_MEAS_ADC_WATCHDOG | ERR_FLAG_TIMING_MEAS_ADC)) {
ret_val = -100;
goto return_value;
}