mhu/reflow-oven-control-sw
2
0
Fork 0
Code Issues 4 Pull Requests Releases 4 Wiki Activity

Compare commits

base: mhu:bb39c4b6e07720b5b1bcb319d33823d34a2bfeed
Branches Tags
mhu:dev
mhu:temp-profile-checker
mhu:master
mhu:jenkins
mhu:error-mem-viewer
mhu:v0.5-1
mhu:v0.5
mhu:v0.4
mhu:v0.3
mhu:v0.2-test
mhu:v0.1-hardware-test
..
compare: mhu:e37001e3c480a6ef51cd4a9af0bea709cd8cafd1
Branches Tags
mhu:temp-profile-checker
mhu:dev
mhu:master
mhu:jenkins
mhu:error-mem-viewer
mhu:v0.5-1
mhu:v0.5
mhu:v0.4
mhu:v0.3
mhu:v0.2-test
mhu:v0.1-hardware-test

No commits in common. "bb39c4b6e07720b5b1bcb319d33823d34a2bfeed" and "e37001e3c480a6ef51cd4a9af0bea709cd8cafd1" have entirely different histories.
bb39c4b6e0 ... e37001e3c4

2 changed files with 27 additions and 29 deletions
Show Stats Expand all files Collapse all files

53
stm-firmware/calibration.c
View File

@ -92,7 +92,7 @@ static float calculate_mean(float *values, uint32_t count)
} while (--loop_cnt > 0); } while (--loop_cnt > 0);
} }
return sum / (float)count; return sum/(float)count;
} }
static float calculate_standard_deviation(float *values, uint32_t count, float mean) static float calculate_standard_deviation(float *values, uint32_t count, float mean)
@ -103,36 +103,35 @@ static float calculate_standard_deviation(float *values, uint32_t count, float m
float res; float res;
switch (remainder) { switch (remainder) {
case 0: do { case 0: do { sum += (*values - mean) * (*values - mean);
sum += (*values - mean) * (*values - mean); values++;
values++; /* FALLTHRU */
/* FALLTHRU */ case 7: sum += (*values - mean) * (*values - mean);
case 7: sum += (*values - mean) * (*values - mean); values++;
values++; /* FALLTHRU */
/* FALLTHRU */ case 6: sum += (*values - mean) * (*values - mean);
case 6: sum += (*values - mean) * (*values - mean); values++;
values++; /* FALLTHRU */
/* FALLTHRU */ case 5: sum += (*values - mean) * (*values - mean);
case 5: sum += (*values - mean) * (*values - mean); values++;
values++; /* FALLTHRU */
/* FALLTHRU */ case 4: sum += (*values - mean) * (*values - mean);
case 4: sum += (*values - mean) * (*values - mean); values++;
values++; /* FALLTHRU */
/* FALLTHRU */ case 3: sum += (*values - mean) * (*values - mean);
case 3: sum += (*values - mean) * (*values - mean); values++;
values++; /* FALLTHRU */
/* FALLTHRU */ case 2: sum += (*values - mean) * (*values - mean);
case 2: sum += (*values - mean) * (*values - mean); values++;
values++; /* FALLTHRU */
/* FALLTHRU */ case 1: sum += (*values - mean) * (*values - mean);
case 1: sum += (*values - mean) * (*values - mean); values++;
values++; /* FALLTHRU */
/* FALLTHRU */
} while (--loop_cnt > 0); } while (--loop_cnt > 0);
} }
sum /= (float)count; sum /= (float)count;
/* Compute the square root using the FPU. /* Compute the square roor using the FPU.
* The constraint 't' tells GCC to use a floating point register * The constraint 't' tells GCC to use a floating point register
*/ */
__asm__ __volatile__("vsqrt.f32 %0, %1" : "=t"(res) : "t"(sum)); __asm__ __volatile__("vsqrt.f32 %0, %1" : "=t"(res) : "t"(sum));

3
stm-firmware/settings/settings-sd-card.c
View File

@ -151,8 +151,7 @@ int sd_card_settings_try_load_calibration(float *sens_deviation, float *offset)
} while (res != CONFIG_PARSER_END_REACHED && } while (res != CONFIG_PARSER_END_REACHED &&
res != CONFIG_PARSER_GENERIC_ERR && res != CONFIG_PARSER_GENERIC_ERR &&
res != CONFIG_PARSER_IOERR && res != CONFIG_PARSER_IOERR);
res != CONFIG_PARSER_PARAM_ERR);
config_parser_close_file(p); config_parser_close_file(p);