Skip to content

Commit f31b854

Browse files
committed
Implement setting to make startup temperature previous temperature
1 parent 01b0286 commit f31b854

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

AxxSolder_firmware/Core/Inc/main.h

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ typedef struct{
5555
double temp_cal_450;
5656
double serial_debug_print;
5757
double displayed_temp_filter;
58+
double startup_temp_is_previous_temp;
5859
}Flash_values;
5960

6061
/* USER CODE END Includes */

AxxSolder_firmware/Core/Src/main.c

+10-3
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,11 @@ Flash_values default_flash_values = {.startup_temperature = 330,
291291
.temp_cal_400 = 400,
292292
.temp_cal_450 = 450,
293293
.serial_debug_print = 0,
294-
.displayed_temp_filter = 5};
294+
.displayed_temp_filter = 5,
295+
.startup_temp_is_previous_temp = 0};
295296

296297
/* List of names for settings menu */
297-
#define menu_length 25
298+
#define menu_length 26
298299
char menu_names[menu_length][30] = { "Startup Temp °C ",
299300
"Temp Offset °C ",
300301
"Standby Temp °C ",
@@ -317,6 +318,7 @@ char menu_names[menu_length][30] = { "Startup Temp °C ",
317318
"Temp cal 450 ",
318319
"Serial DEBUG ",
319320
"Disp Temp. filter ",
321+
"Start at prev. temp ",
320322
"-Load Default- ",
321323
"-Save and Reboot- ",
322324
"-Exit no Save- "};
@@ -443,6 +445,11 @@ uint16_t RGB_to_BRG(uint16_t color){
443445
void change_state(mainstates new_state){
444446
sensor_values.previous_state = sensor_values.current_state;
445447
sensor_values.current_state = new_state;
448+
if((sensor_values.current_state == RUN) && (flash_values.startup_temp_is_previous_temp == 1)){
449+
flash_values.startup_temperature = sensor_values.set_temperature;
450+
FlashWrite(&flash_values);
451+
}
452+
446453
if((sensor_values.current_state == RUN) && (flash_values.GPIO4_ON_at_run == 1)){
447454
HAL_GPIO_WritePin(GPIOB, USR_4_Pin, GPIO_PIN_SET);
448455
}
@@ -633,7 +640,7 @@ void settings_menu(){
633640
((double*)&flash_values)[menu_cursor_position] = (float)old_value + (float)(TIM2->CNT - 1000.0) / 2.0 - (float)menu_cursor_position;
634641
}
635642

636-
if ((menu_cursor_position == 5) || (menu_cursor_position == 8) || (menu_cursor_position == 11) || (menu_cursor_position == 12) || (menu_cursor_position == 13) || (menu_cursor_position == 20)){
643+
if ((menu_cursor_position == 5) || (menu_cursor_position == 8) || (menu_cursor_position == 11) || (menu_cursor_position == 12) || (menu_cursor_position == 13) || (menu_cursor_position == 20) || (menu_cursor_position == 22)){
637644
((double*)&flash_values)[menu_cursor_position] = fmod(round(fmod(fabs(((double*)&flash_values)[menu_cursor_position]), 2)), 2);
638645
}
639646
else if (menu_cursor_position == 9){

0 commit comments

Comments
 (0)