From 40bc58bdd9a7ce84984935839c1a589194018d35 Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Mon, 13 Nov 2023 18:21:14 +0100 Subject: [PATCH] TFTP Update mocs, header and fix an error --- project/Core/Src/tftp.c | 2 +- tests/mocs.c | 4 ++++ tests/tftp_server.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/project/Core/Src/tftp.c b/project/Core/Src/tftp.c index b27bb0a..765b597 100644 --- a/project/Core/Src/tftp.c +++ b/project/Core/Src/tftp.c @@ -144,7 +144,7 @@ void tftp_close(void* handle) { if (handle == &virt_file[1]) { // TODO: waiting on pr of tim to merge so we can use the bmp lcd function lcd_clear(LCD_COLOR_BLACK); - lcd_display_text("show me what you got virtImage.raw", 0, 0, LCD_COLOR_BLACK, LCD_COLOR_WHITE, LCD_FONT16); + lcd_display_text((uint8_t*)"show me what you got virtImage.raw", 0, 0, LCD_COLOR_BLACK, LCD_COLOR_WHITE, LCD_FONT16); } if (handle == &virt_file[2]) { diff --git a/tests/mocs.c b/tests/mocs.c index cb8dab5..da69c34 100644 --- a/tests/mocs.c +++ b/tests/mocs.c @@ -20,4 +20,8 @@ int tftp_init(struct tftp_context* context) { void lcd_display_text(uint8_t* text, uint16_t x_pos, uint16_t y_pos, uint32_t color, uint32_t bg_color, sFONT *font) { +} + +void lcd_clear(uint32_t color) { + } \ No newline at end of file diff --git a/tests/tftp_server.h b/tests/tftp_server.h index 27fde1c..45a1d8c 100644 --- a/tests/tftp_server.h +++ b/tests/tftp_server.h @@ -37,6 +37,7 @@ void tftp_cleanup(void); uint32_t logger_get_timestamp(void); int tftp_init(struct tftp_context* context); void lcd_display_text(uint8_t* text, uint16_t x_pos, uint16_t y_pos, uint32_t color, uint32_t bg_color, sFONT *font); +void lcd_clear(uint32_t color); #ifdef __cplusplus }