From c02d988350856ec0114ea7def49f1c91d199daaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Sun, 15 Nov 2020 23:36:52 +0100 Subject: [PATCH] Issue #21: Adapt calibration routine to new calibration format --- stm-firmware/calibration.c | 6 +++--- stm-firmware/include/reflow-controller/calibration.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stm-firmware/calibration.c b/stm-firmware/calibration.c index 81dd815..35f3509 100644 --- a/stm-firmware/calibration.c +++ b/stm-firmware/calibration.c @@ -30,9 +30,9 @@ enum calibration_shell_state {CAL_START = 0, CAL_WAIT_RES1, CAL_MEAS_RES1, CAL_WAIT_RES2, CAL_MEAS_RES2}; void calibration_calculate(float low_measured, float low_setpoint, float high_measured, float high_setpoint, - float *sens_deviation, float *sens_corrected_offset) + float *sens_deviation, float *offset) { - if (!sens_deviation || !sens_corrected_offset) + if (!sens_deviation || !offset) return; float delta_y; @@ -45,7 +45,7 @@ void calibration_calculate(float low_measured, float low_setpoint, float high_me sens_corr_mult = delta_x / delta_y; *sens_deviation = sens_corr_mult - 1.0f; - *sens_corrected_offset = low_setpoint - low_measured * sens_corr_mult; + *offset = (high_setpoint * low_measured - low_setpoint * high_measured) / (high_setpoint - low_setpoint); } diff --git a/stm-firmware/include/reflow-controller/calibration.h b/stm-firmware/include/reflow-controller/calibration.h index cb7fd2e..78ab5f3 100644 --- a/stm-firmware/include/reflow-controller/calibration.h +++ b/stm-firmware/include/reflow-controller/calibration.h @@ -27,7 +27,7 @@ #include void calibration_calculate(float low_measured, float low_setpoint, float high_measured, float high_setpoint, - float *sens_deviation, float *sens_corrected_offset); + float *sens_deviation, float *offset); float *calibration_acquire_data_start(uint32_t count, volatile int *flag);