From eec15df271cfa79a46f3f9604502655f3178f31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Sun, 27 Sep 2020 22:13:49 +0200 Subject: [PATCH] Fix code style --- stm-firmware/adc-meas.c | 4 +++- .../include/reflow-controller/safety/watchdog.h | 4 ++-- stm-firmware/safety/watchdog.c | 12 ++++++------ stm-firmware/shell.c | 3 ++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/stm-firmware/adc-meas.c b/stm-firmware/adc-meas.c index 9d99403..4a9f0e3 100644 --- a/stm-firmware/adc-meas.c +++ b/stm-firmware/adc-meas.c @@ -309,7 +309,9 @@ static inline __attribute__((optimize("O3"))) void adc_pt1000_filter(float adc_p safety_controller_ack_flag_with_key(ERR_FLAG_MEAS_ADC_UNSTABLE, MEAS_ADC_SAFETY_FLAG_KEY); } - pt1000_res_raw_lf = (1.0f-filter_alpha) * pt1000_res_raw_lf + filter_alpha * ADC_TO_RES(adc_prefiltered_value); + pt1000_res_raw_lf = (1.0f - filter_alpha) * pt1000_res_raw_lf + + filter_alpha * ADC_TO_RES(adc_prefiltered_value); + safety_controller_report_timing(ERR_TIMING_MEAS_ADC); } diff --git a/stm-firmware/include/reflow-controller/safety/watchdog.h b/stm-firmware/include/reflow-controller/safety/watchdog.h index f248547..021b838 100644 --- a/stm-firmware/include/reflow-controller/safety/watchdog.h +++ b/stm-firmware/include/reflow-controller/safety/watchdog.h @@ -42,8 +42,8 @@ int watchdog_ack(uint32_t magic); /** * @brief Check if reset was generated by the watchdog. - * @note This also clears the relevant flag, so the function will reutrn false when called a second time - * @return + * @note This also clears the relevant flag, so the function will return false when called a second time + * @return true, if reset was generated by the watchdog */ bool watchdog_check_reset_source(void); diff --git a/stm-firmware/safety/watchdog.c b/stm-firmware/safety/watchdog.c index 3bdb05a..f9e4ed8 100644 --- a/stm-firmware/safety/watchdog.c +++ b/stm-firmware/safety/watchdog.c @@ -52,17 +52,17 @@ int watchdog_setup(uint8_t prescaler) /** - Wait for the oscillator to be ready */ while (!(RCC->CSR & RCC_CSR_LSIRDY)); - if (prescaler == 4) + if (prescaler == 4U) prescaler_reg_val = 0UL; - else if (prescaler == 8) + else if (prescaler == 8U) prescaler_reg_val = 1UL; - else if (prescaler == 16) + else if (prescaler == 16U) prescaler_reg_val = 2UL; - else if (prescaler == 32) + else if (prescaler == 32U) prescaler_reg_val = 3UL; - else if (prescaler == 64) + else if (prescaler == 64U) prescaler_reg_val = 4UL; - else if (prescaler == 128) + else if (prescaler == 128U) prescaler_reg_val = 5UL; else prescaler_reg_val = 6UL; diff --git a/stm-firmware/shell.c b/stm-firmware/shell.c index dbc08c8..24ca4ff 100644 --- a/stm-firmware/shell.c +++ b/stm-firmware/shell.c @@ -433,7 +433,8 @@ static shellmatta_retCode_t shell_cmd_read_flags(const shellmatta_handle_t handl shellmatta_printf(handle, "Inactive\r\n"); } else { shellmatta_printf(handle, " valid from %-8.2f to %-8.2f", amon_info.min, amon_info.max); - shellmatta_printf(handle, "\tchecked %llu ms ago\r\n", systick_get_global_tick() - amon_info.timestamp); + shellmatta_printf(handle, "\tchecked %llu ms ago\r\n", + systick_get_global_tick() - amon_info.timestamp); } }