Skip to content

Commit a3d36ba

Browse files
AxxAxxAxxAxx
committed
Implement pop-up telling why you cant start heating
1 parent f5f69ec commit a3d36ba

10 files changed

Lines changed: 44876 additions & 44797 deletions

File tree

‎AxxSolder_firmware/Core/Src/main.c‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ void get_thermocouple_temperature(){
360360
sensor_values.thermocouple_temperature = TC_temp*TC_temp*TC_COMPENSATION_X2_NT115 + TC_temp*TC_COMPENSATION_X1_NT115 + TC_COMPENSATION_X0_NT115;
361361
}
362362
sensor_values.thermocouple_temperature += flash_values.temperature_offset; // Add temperature offset value
363-
sensor_values.thermocouple_temperature = clamp(sensor_values.thermocouple_temperature ,0 ,999); // Clamp
364363
}
365364

366365
/* Sets the duty cycle of timer controlling the heater */
@@ -380,6 +379,16 @@ void heater_off(){
380379
set_heater_duty(0);
381380
}
382381

382+
void show_popup(char * text[80]){
383+
UG_FillFrame(10, 150, 225, 205, RGB_to_BRG(C_ORANGE));
384+
UG_FillFrame(15, 155, 220, 200, RGB_to_BRG(C_WHITE));
385+
LCD_PutStr(20, 150, text, FONT_arial_20X23, RGB_to_BRG(C_ORANGE), RGB_to_BRG(C_WHITE));
386+
HAL_Delay(2000);
387+
LCD_draw_main_screen();
388+
standby_state_written_to_LCD = 0;
389+
sleep_state_written_to_LCD = 0;
390+
}
391+
383392
void settings_menue(){
384393
/* If SW_1 is pressed during startup - Show SETTINGS and allow to release button. */
385394
if (HAL_GPIO_ReadPin (GPIOB, SW_1_Pin) == 1){
@@ -655,11 +664,13 @@ void handle_emergency_shutdown(){
655664

656665
/* Set state to EMERGENCY_SLEEP if iron is over max allowed temp */
657666
if((sensor_values.thermocouple_temperature > EMERGENCY_SHUTDOWN_TEMPERATURE) && (active_state == RUN)){
667+
show_popup("\n\n NO tip detected");
658668
change_state(EMERGENCY_SLEEP);
659669
beep();
660670
}
661671
/* Set state to EMERGENCY_SLEEP if input voltage is too low */
662-
if(sensor_values.bus_voltage <= MIN_BUSVOLTAGE){
672+
if((sensor_values.bus_voltage <= MIN_BUSVOLTAGE) && (active_state == RUN)){
673+
show_popup("\n\n Too Low voltage");
663674
change_state(EMERGENCY_SLEEP);
664675
}
665676
}

‎AxxSolder_firmware/Debug/AxxSolder.bin‎

144 Bytes
Binary file not shown.

‎AxxSolder_firmware/Debug/AxxSolder.elf‎

264 Bytes
Binary file not shown.

‎AxxSolder_firmware/Debug/AxxSolder.list‎

Lines changed: 43256 additions & 43195 deletions
Large diffs are not rendered by default.

‎AxxSolder_firmware/Debug/AxxSolder.map‎

Lines changed: 1527 additions & 1524 deletions
Large diffs are not rendered by default.

‎AxxSolder_firmware/Debug/Core/Src/main.cyclo‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,42 @@
66
../Core/Src/main.c:342:6:get_bus_voltage 1
77
../Core/Src/main.c:346:6:get_heater_current 1
88
../Core/Src/main.c:350:6:get_thermocouple_temperature 4
9-
../Core/Src/main.c:367:6:set_heater_duty 1
10-
../Core/Src/main.c:373:6:heater_on 1
11-
../Core/Src/main.c:379:6:heater_off 1
12-
../Core/Src/main.c:383:6:settings_menue 29
13-
../Core/Src/main.c:494:6:update_display 14
14-
../Core/Src/main.c:566:6:LCD_draw_main_screen 1
15-
../Core/Src/main.c:611:6:LCD_draw_earth_fault_popup 1
16-
../Core/Src/main.c:628:6:get_set_temperature 2
17-
../Core/Src/main.c:636:6:beep 2
18-
../Core/Src/main.c:644:6:handle_emergency_shutdown 9
19-
../Core/Src/main.c:668:6:handle_button_status 8
20-
../Core/Src/main.c:694:6:get_stand_status 12
21-
../Core/Src/main.c:727:6:get_handle_type 7
22-
../Core/Src/main.c:777:6:HAL_GPIO_EXTI_Callback 5
23-
../Core/Src/main.c:786:6:HAL_TIM_IC_CaptureCallback 3
24-
../Core/Src/main.c:793:6:HAL_TIM_PWM_PulseFinishedCallback 4
25-
../Core/Src/main.c:802:6:HAL_TIM_PeriodElapsedCallback 9
26-
../Core/Src/main.c:843:6:HAL_ADC_ConvCpltCallback 5
27-
../Core/Src/main.c:861:6:HAL_ADC_LevelOutOfWindowCallback 1
28-
../Core/Src/main.c:878:5:main 13
29-
../Core/Src/main.c:1073:6:SystemClock_Config 3
30-
../Core/Src/main.c:1121:13:MX_ADC1_Init 6
31-
../Core/Src/main.c:1207:13:MX_ADC2_Init 5
32-
../Core/Src/main.c:1290:13:MX_CRC_Init 2
33-
../Core/Src/main.c:1321:13:MX_I2C1_Init 4
34-
../Core/Src/main.c:1369:13:MX_SPI2_Init 2
35-
../Core/Src/main.c:1409:13:MX_TIM1_Init 6
36-
../Core/Src/main.c:1485:13:MX_TIM2_Init 3
37-
../Core/Src/main.c:1534:13:MX_TIM4_Init 4
38-
../Core/Src/main.c:1583:13:MX_TIM6_Init 3
39-
../Core/Src/main.c:1621:13:MX_TIM7_Init 4
40-
../Core/Src/main.c:1663:13:MX_TIM8_Init 3
41-
../Core/Src/main.c:1704:13:MX_TIM16_Init 2
42-
../Core/Src/main.c:1736:13:MX_TIM17_Init 3
43-
../Core/Src/main.c:1772:13:MX_USART1_UART_Init 5
44-
../Core/Src/main.c:1818:13:MX_DMA_Init 1
45-
../Core/Src/main.c:1840:13:MX_GPIO_Init 1
46-
../Core/Src/main.c:1915:6:Error_Handler 1
9+
../Core/Src/main.c:366:6:set_heater_duty 1
10+
../Core/Src/main.c:372:6:heater_on 1
11+
../Core/Src/main.c:378:6:heater_off 1
12+
../Core/Src/main.c:382:6:show_popup 1
13+
../Core/Src/main.c:392:6:settings_menue 29
14+
../Core/Src/main.c:503:6:update_display 14
15+
../Core/Src/main.c:575:6:LCD_draw_main_screen 1
16+
../Core/Src/main.c:620:6:LCD_draw_earth_fault_popup 1
17+
../Core/Src/main.c:637:6:get_set_temperature 2
18+
../Core/Src/main.c:645:6:beep 2
19+
../Core/Src/main.c:653:6:handle_emergency_shutdown 10
20+
../Core/Src/main.c:679:6:handle_button_status 8
21+
../Core/Src/main.c:705:6:get_stand_status 12
22+
../Core/Src/main.c:738:6:get_handle_type 7
23+
../Core/Src/main.c:788:6:HAL_GPIO_EXTI_Callback 5
24+
../Core/Src/main.c:797:6:HAL_TIM_IC_CaptureCallback 3
25+
../Core/Src/main.c:804:6:HAL_TIM_PWM_PulseFinishedCallback 4
26+
../Core/Src/main.c:813:6:HAL_TIM_PeriodElapsedCallback 9
27+
../Core/Src/main.c:854:6:HAL_ADC_ConvCpltCallback 5
28+
../Core/Src/main.c:872:6:HAL_ADC_LevelOutOfWindowCallback 1
29+
../Core/Src/main.c:889:5:main 13
30+
../Core/Src/main.c:1084:6:SystemClock_Config 3
31+
../Core/Src/main.c:1132:13:MX_ADC1_Init 6
32+
../Core/Src/main.c:1218:13:MX_ADC2_Init 5
33+
../Core/Src/main.c:1301:13:MX_CRC_Init 2
34+
../Core/Src/main.c:1332:13:MX_I2C1_Init 4
35+
../Core/Src/main.c:1380:13:MX_SPI2_Init 2
36+
../Core/Src/main.c:1420:13:MX_TIM1_Init 6
37+
../Core/Src/main.c:1496:13:MX_TIM2_Init 3
38+
../Core/Src/main.c:1545:13:MX_TIM4_Init 4
39+
../Core/Src/main.c:1594:13:MX_TIM6_Init 3
40+
../Core/Src/main.c:1632:13:MX_TIM7_Init 4
41+
../Core/Src/main.c:1674:13:MX_TIM8_Init 3
42+
../Core/Src/main.c:1715:13:MX_TIM16_Init 2
43+
../Core/Src/main.c:1747:13:MX_TIM17_Init 3
44+
../Core/Src/main.c:1783:13:MX_USART1_UART_Init 5
45+
../Core/Src/main.c:1829:13:MX_DMA_Init 1
46+
../Core/Src/main.c:1851:13:MX_GPIO_Init 1
47+
../Core/Src/main.c:1926:6:Error_Handler 1

‎AxxSolder_firmware/Debug/Core/Src/main.o‎

728 Bytes
Binary file not shown.

‎AxxSolder_firmware/Debug/Core/Src/main.su‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,42 @@
66
../Core/Src/main.c:342:6:get_bus_voltage 8 static
77
../Core/Src/main.c:346:6:get_heater_current 8 static
88
../Core/Src/main.c:350:6:get_thermocouple_temperature 24 static
9-
../Core/Src/main.c:367:6:set_heater_duty 24 static
10-
../Core/Src/main.c:373:6:heater_on 16 static
11-
../Core/Src/main.c:379:6:heater_off 8 static
12-
../Core/Src/main.c:383:6:settings_menue 80 static
13-
../Core/Src/main.c:494:6:update_display 24 static
14-
../Core/Src/main.c:566:6:LCD_draw_main_screen 24 static
15-
../Core/Src/main.c:611:6:LCD_draw_earth_fault_popup 24 static
16-
../Core/Src/main.c:628:6:get_set_temperature 16 static
17-
../Core/Src/main.c:636:6:beep 8 static
18-
../Core/Src/main.c:644:6:handle_emergency_shutdown 16 static
19-
../Core/Src/main.c:668:6:handle_button_status 16 static
20-
../Core/Src/main.c:694:6:get_stand_status 24 static
21-
../Core/Src/main.c:727:6:get_handle_type 24 static
22-
../Core/Src/main.c:777:6:HAL_GPIO_EXTI_Callback 16 static
23-
../Core/Src/main.c:786:6:HAL_TIM_IC_CaptureCallback 16 static
24-
../Core/Src/main.c:793:6:HAL_TIM_PWM_PulseFinishedCallback 16 static
25-
../Core/Src/main.c:802:6:HAL_TIM_PeriodElapsedCallback 16 static
26-
../Core/Src/main.c:843:6:HAL_ADC_ConvCpltCallback 16 static
27-
../Core/Src/main.c:861:6:HAL_ADC_LevelOutOfWindowCallback 16 static
28-
../Core/Src/main.c:878:5:main 112 static
29-
../Core/Src/main.c:1073:6:SystemClock_Config 88 static
30-
../Core/Src/main.c:1121:13:MX_ADC1_Init 56 static
31-
../Core/Src/main.c:1207:13:MX_ADC2_Init 72 static
32-
../Core/Src/main.c:1290:13:MX_CRC_Init 8 static
33-
../Core/Src/main.c:1321:13:MX_I2C1_Init 8 static
34-
../Core/Src/main.c:1369:13:MX_SPI2_Init 8 static
35-
../Core/Src/main.c:1409:13:MX_TIM1_Init 104 static
36-
../Core/Src/main.c:1485:13:MX_TIM2_Init 56 static
37-
../Core/Src/main.c:1534:13:MX_TIM4_Init 48 static
38-
../Core/Src/main.c:1583:13:MX_TIM6_Init 24 static
39-
../Core/Src/main.c:1621:13:MX_TIM7_Init 24 static
40-
../Core/Src/main.c:1663:13:MX_TIM8_Init 24 static
41-
../Core/Src/main.c:1704:13:MX_TIM16_Init 8 static
42-
../Core/Src/main.c:1736:13:MX_TIM17_Init 8 static
43-
../Core/Src/main.c:1772:13:MX_USART1_UART_Init 8 static
44-
../Core/Src/main.c:1818:13:MX_DMA_Init 16 static
45-
../Core/Src/main.c:1840:13:MX_GPIO_Init 48 static
46-
../Core/Src/main.c:1915:6:Error_Handler 4 static,ignoring_inline_asm
9+
../Core/Src/main.c:366:6:set_heater_duty 24 static
10+
../Core/Src/main.c:372:6:heater_on 16 static
11+
../Core/Src/main.c:378:6:heater_off 8 static
12+
../Core/Src/main.c:382:6:show_popup 32 static
13+
../Core/Src/main.c:392:6:settings_menue 80 static
14+
../Core/Src/main.c:503:6:update_display 24 static
15+
../Core/Src/main.c:575:6:LCD_draw_main_screen 24 static
16+
../Core/Src/main.c:620:6:LCD_draw_earth_fault_popup 24 static
17+
../Core/Src/main.c:637:6:get_set_temperature 16 static
18+
../Core/Src/main.c:645:6:beep 8 static
19+
../Core/Src/main.c:653:6:handle_emergency_shutdown 16 static
20+
../Core/Src/main.c:679:6:handle_button_status 16 static
21+
../Core/Src/main.c:705:6:get_stand_status 24 static
22+
../Core/Src/main.c:738:6:get_handle_type 24 static
23+
../Core/Src/main.c:788:6:HAL_GPIO_EXTI_Callback 16 static
24+
../Core/Src/main.c:797:6:HAL_TIM_IC_CaptureCallback 16 static
25+
../Core/Src/main.c:804:6:HAL_TIM_PWM_PulseFinishedCallback 16 static
26+
../Core/Src/main.c:813:6:HAL_TIM_PeriodElapsedCallback 16 static
27+
../Core/Src/main.c:854:6:HAL_ADC_ConvCpltCallback 16 static
28+
../Core/Src/main.c:872:6:HAL_ADC_LevelOutOfWindowCallback 16 static
29+
../Core/Src/main.c:889:5:main 112 static
30+
../Core/Src/main.c:1084:6:SystemClock_Config 88 static
31+
../Core/Src/main.c:1132:13:MX_ADC1_Init 56 static
32+
../Core/Src/main.c:1218:13:MX_ADC2_Init 72 static
33+
../Core/Src/main.c:1301:13:MX_CRC_Init 8 static
34+
../Core/Src/main.c:1332:13:MX_I2C1_Init 8 static
35+
../Core/Src/main.c:1380:13:MX_SPI2_Init 8 static
36+
../Core/Src/main.c:1420:13:MX_TIM1_Init 104 static
37+
../Core/Src/main.c:1496:13:MX_TIM2_Init 56 static
38+
../Core/Src/main.c:1545:13:MX_TIM4_Init 48 static
39+
../Core/Src/main.c:1594:13:MX_TIM6_Init 24 static
40+
../Core/Src/main.c:1632:13:MX_TIM7_Init 24 static
41+
../Core/Src/main.c:1674:13:MX_TIM8_Init 24 static
42+
../Core/Src/main.c:1715:13:MX_TIM16_Init 8 static
43+
../Core/Src/main.c:1747:13:MX_TIM17_Init 8 static
44+
../Core/Src/main.c:1783:13:MX_USART1_UART_Init 8 static
45+
../Core/Src/main.c:1829:13:MX_DMA_Init 16 static
46+
../Core/Src/main.c:1851:13:MX_GPIO_Init 48 static
47+
../Core/Src/main.c:1926:6:Error_Handler 4 static,ignoring_inline_asm

‎AxxSolder_firmware/Debug/Drivers/LCD/lcd.o‎

0 Bytes
Binary file not shown.

‎AxxSolder_firmware/Drivers/LCD/lcd.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@
131131
#elif (LCD_ROTATION == 1) || (LCD_ROTATION == 3)
132132
#define LCD_WIDTH 320
133133
#define LCD_HEIGHT 240
134+
#define LCD_X_SHIFT 0
135+
#define LCD_Y_SHIFT 0
134136
#endif
135137

136138
#endif

0 commit comments

Comments
 (0)