Skip to content

Commit cb1aefc

Browse files
committed
make Displayed Temperature moving average filter length a user setting
1 parent 94b8955 commit cb1aefc

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

AxxSolder_firmware/Core/Inc/main.h

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ typedef struct{
5454
double temp_cal_400;
5555
double temp_cal_450;
5656
double serial_debug_print;
57+
double displayed_temp_filter;
5758
}Flash_values;
5859

5960
/* USER CODE END Includes */

AxxSolder_firmware/Core/Src/main.c

+9-4
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,12 @@ Flash_values default_flash_values = {.startup_temperature = 330,
289289
.temp_cal_350 = 350,
290290
.temp_cal_400 = 400,
291291
.temp_cal_450 = 450,
292-
.serial_debug_print = 0};
292+
.serial_debug_print = 0,
293+
.displayed_temp_filter = 5};
293294

294295
/* List of names for settings menu */
295-
#define menu_length 24
296-
char menu_names[menu_length][29] = { "Startup Temp °C ",
296+
#define menu_length 25
297+
char menu_names[menu_length][30] = { "Startup Temp °C ",
297298
"Temp Offset °C ",
298299
"Standby Temp °C ",
299300
"Standby Time [min] ",
@@ -314,6 +315,7 @@ char menu_names[menu_length][29] = { "Startup Temp °C ",
314315
"Temp cal 400 ",
315316
"Temp cal 450 ",
316317
"Serial DEBUG ",
318+
"Disp Temp. filter ",
317319
"-Load Default- ",
318320
"-Save and Reboot- ",
319321
"-Exit no Save- "};
@@ -633,6 +635,9 @@ void settings_menu(){
633635
else if (menu_cursor_position == 9){
634636
((double*)&flash_values)[menu_cursor_position] = fmod(round(fmod(fabs(((double*)&flash_values)[menu_cursor_position]), 4)), 4);
635637
}
638+
else if (menu_cursor_position == 21){
639+
((double*)&flash_values)[menu_cursor_position] = 1 + fmod(round(fmod(fabs(((double*)&flash_values)[menu_cursor_position]), 10)), 10);
640+
}
636641
else if (menu_cursor_position == 1){
637642
((double*)&flash_values)[menu_cursor_position] = round(((double*)&flash_values)[menu_cursor_position]);
638643
}
@@ -1416,7 +1421,7 @@ int main(void)
14161421

14171422
/* initialize moving average functions */
14181423
Moving_Average_Init(&thermocouple_temperature_filter_struct,2);
1419-
Moving_Average_Init(&thermocouple_temperature_filtered_filter_struct,50);
1424+
Moving_Average_Init(&thermocouple_temperature_filtered_filter_struct,flash_values.displayed_temp_filter*10);
14201425
Moving_Average_Init(&requested_power_filtered_filter_struct,20);
14211426
Moving_Average_Init(&mcu_temperature_filter_struct,100);
14221427
Moving_Average_Init(&input_voltage_filterStruct,25);
Binary file not shown.

0 commit comments

Comments
 (0)