sani7/2023-Webservices_And_Applications
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modbus_tcp

Browse Source 
Move duplicate common code outside of the image draw part
This commit is contained in:
Sander Speetjens
2023-11-28 13:06:29 +01:00
parent 0ca78c93ef
commit fe08ae3109
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
project/Core/Src/modbus_tcp.c
View File

@@ -96,14 +96,14 @@ static err_t modbus_incoming_data(void* arg, struct tcp_pcb* pcb, struct pbuf* p
llfs_file_t file_list[number_of_files]; llfs_file_t file_list[number_of_files];
number_of_files = llfs_file_list(file_list, number_of_files, NULL); number_of_files = llfs_file_list(file_list, number_of_files, NULL);
lcd_clear_text();
lcd_clear_images();
lcd_stop_all_gifs();
lcd_display_text(text, 10, 10, text_foreground_color, result_background,
LCD_FONT24);
if (number_of_files < registers[REG_IMAGE_NR]) { if (number_of_files < registers[REG_IMAGE_NR]) {
lcd_clear_text();
lcd_clear_images();
lcd_stop_all_gifs();
lcd_display_text(text, 10, 10, text_foreground_color, result_background,
LCD_FONT24);
lcd_display_text("FILE NOT IN FILESYSTEM", 10, 75, LCD_RED, LCD_BLACK, LCD_FONT24); lcd_display_text("FILE NOT IN FILESYSTEM", 10, 75, LCD_RED, LCD_BLACK, LCD_FONT24);
} else { } else {
const char* ext = strrchr(file_list[registers[REG_IMAGE_NR] - 1].name, '.'); const char* ext = strrchr(file_list[registers[REG_IMAGE_NR] - 1].name, '.');
@@ -111,17 +111,8 @@ static err_t modbus_incoming_data(void* arg, struct tcp_pcb* pcb, struct pbuf* p
// No valid extension found // No valid extension found
} }
if (strcmp(ext, ".gif") == 0) { if (strcmp(ext, ".gif") == 0) {
lcd_clear_text();
lcd_clear_images();
lcd_stop_all_gifs();
lcd_display_text(text, 10, 10, text_foreground_color, result_background, LCD_FONT24);
lcd_gif_t* gif = lcd_draw_gif_from_fs(file_list[registers[REG_IMAGE_NR] - 1].name, 0, 75); // GIF on screen lcd_gif_t* gif = lcd_draw_gif_from_fs(file_list[registers[REG_IMAGE_NR] - 1].name, 0, 75); // GIF on screen
} else if (strcmp(ext, ".bmp") == 0) { } else if (strcmp(ext, ".bmp") == 0) {
lcd_clear_text();
lcd_clear_images();
lcd_stop_all_gifs();
lcd_display_text(text, 10, 10, text_foreground_color, result_background, LCD_FONT24);
lcd_draw_img_from_fs(file_list[registers[REG_IMAGE_NR] - 1].name, 0, 75); // BMP on screen lcd_draw_img_from_fs(file_list[registers[REG_IMAGE_NR] - 1].name, 0, 75); // BMP on screen
} }
} }