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

Merge pull request #29 from Sani7/LCD_API

Browse Source 
Switch all position params in LCD_API to uint32_t
This commit is contained in:
Sander Speetjens
2023-12-03 16:00:32 +01:00
parent 0cc34bfd6b a5bf40acf7
commit 0704473bc5
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/lcd_api.md
View File

@@ -104,7 +104,7 @@ void main(void) {
#### Drawing text on the screen #### Drawing text on the screen
```c ```c
void lcd_display_text(const char* text, uint16_t x_pos, uint16_t y_pos, uint32_t color, uint32_t bg_color, sFONT *font); void lcd_display_text(const char* text, uint32_t x_pos, uint32_t y_pos, uint32_t color, uint32_t bg_color, sFONT *font);
``` ```
```c ```c

2
project/Core/Inc/lcd_api.h
View File

@@ -105,7 +105,7 @@ void lcd_task(void);
* @param[in] bg_color Text background color * @param[in] bg_color Text background color
* @param[in] font Font size, see defines above in file * @param[in] font Font size, see defines above in file
*/ */
void lcd_display_text(const char* text, uint16_t x_pos, uint16_t y_pos, uint32_t color, uint32_t bg_color, sFONT *font); void lcd_display_text(const char* text, uint32_t x_pos, uint32_t y_pos, uint32_t color, uint32_t bg_color, sFONT *font);
/** /**
* @brief Draw BMP image on screen * @brief Draw BMP image on screen

2
project/Core/Src/lcd_api.c
View File

@@ -84,7 +84,7 @@ void lcd_task(void) {
} }
} }
void lcd_display_text(const char* text, uint16_t x_pos, uint16_t y_pos, uint32_t color, uint32_t bg_color, sFONT* font) { void lcd_display_text(const char* text, uint32_t x_pos, uint32_t y_pos, uint32_t color, uint32_t bg_color, sFONT* font) {
BSP_LCD_SelectLayer(1); BSP_LCD_SelectLayer(1);
LOG_INFO(TAG, "Display text: %s @x=%d,y=%d", text, x_pos, y_pos); LOG_INFO(TAG, "Display text: %s @x=%d,y=%d", text, x_pos, y_pos);