Compare commits
2 Commits
e06c9f7ddc
...
227562cf3c
Author | SHA1 | Date | |
---|---|---|---|
227562cf3c | |||
58937b46f6 |
@ -199,12 +199,12 @@ void adc_pt1000_set_resistance_calibration(float offset, float sensitivity_devia
|
||||
|
||||
void adc_pt1000_get_resistance_calibration(float *offset, float *sensitivity_deviation, bool *active)
|
||||
{
|
||||
if (!offset || !sensitivity_deviation || !active)
|
||||
return;
|
||||
|
||||
*offset = pt1000_offset;
|
||||
*sensitivity_deviation = pt1000_sens_dev;
|
||||
*active = calibration_active;
|
||||
if (offset)
|
||||
*offset = pt1000_offset;
|
||||
if (sensitivity_deviation)
|
||||
*sensitivity_deviation = pt1000_sens_dev;
|
||||
if (active)
|
||||
*active = calibration_active;
|
||||
}
|
||||
|
||||
static inline float adc_pt1000_apply_calibration(float raw_resistance)
|
||||
|
@ -44,6 +44,7 @@
|
||||
#include <fatfs/ff.h>
|
||||
#include <reflow-controller/reflow-menu.h>
|
||||
#include <reflow-controller/safety/safety-controller.h>
|
||||
#include <reflow-controller/settings/settings.h>
|
||||
|
||||
static void setup_nvic_priorities(void)
|
||||
{
|
||||
@ -191,7 +192,12 @@ static void zero_ccm_ram(void)
|
||||
|
||||
int main(void)
|
||||
{
|
||||
bool cal_active;
|
||||
float offset;
|
||||
float sens;
|
||||
int status;
|
||||
bool sd_card_mounted = false;
|
||||
bool sd_old;
|
||||
shellmatta_handle_t shell_handle;
|
||||
int menu_wait_request;
|
||||
uint64_t quarter_sec_timestamp = 0ULL;
|
||||
@ -204,7 +210,25 @@ int main(void)
|
||||
while (1) {
|
||||
|
||||
if (systick_ticks_have_passed(quarter_sec_timestamp, 250)) {
|
||||
sd_old = sd_card_mounted;
|
||||
sd_card_mounted = mount_sd_card_if_avail(sd_card_mounted);
|
||||
|
||||
if (sd_old != sd_card_mounted) {
|
||||
led_set(0, 1);
|
||||
} else {
|
||||
led_set(0, 0);
|
||||
}
|
||||
|
||||
if (sd_card_mounted && !sd_old) {
|
||||
adc_pt1000_get_resistance_calibration(NULL, NULL, &cal_active);
|
||||
if (!cal_active) {
|
||||
status = settings_load_calibration(&sens, &offset);
|
||||
if (!status) {
|
||||
adc_pt1000_set_resistance_calibration(offset, sens, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
quarter_sec_timestamp = systick_get_global_tick();
|
||||
}
|
||||
|
||||
|
@ -161,7 +161,7 @@ int sd_card_settings_try_load_calibration(float *sens_deviation, float *offset)
|
||||
{
|
||||
char path[128];
|
||||
int status;
|
||||
int ret = -2;
|
||||
int ret = 0;
|
||||
|
||||
if (!sens_deviation || !offset)
|
||||
return -1000;
|
||||
|
Loading…
x
Reference in New Issue
Block a user