-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Integration #1
base: master
Are you sure you want to change the base?
Integration #1
Changes from all commits
eb72731
a6206ba
887f852
1d7797c
99f5009
43f046a
db0d5c9
ae81e3c
57f8730
5ee0448
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,3 +17,6 @@ | |
**/.vscode/launch.json | ||
**/.vscode/settings.json | ||
!**/.vscode/extensions.json | ||
|
||
*.Identifier | ||
.stm32env |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,25 @@ | ||
/*INCLUDES*/ | ||
|
||
#include "bsp.h" | ||
#include "ili9488.h" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In future improvements of the code you should end up in a state where the file that contains the control code doesn't depend on level drivers, i.e. you will lose the You can close this comment, just keep in mind it. |
||
#include "lvgl_callbacks.h" | ||
#include "lvgl.h" | ||
#include "main.h" | ||
#include "screens.h" | ||
|
||
#include <math.h> | ||
#include <stdbool.h> | ||
#include <string.h> | ||
#include "bsp.h" | ||
|
||
/*CUSTOM DEFINE*/ | ||
|
||
#define ON 1 | ||
#define ON 1 | ||
#define OFF 0 | ||
Comment on lines
+16
to
17
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. where do you use this defines? |
||
|
||
typedef enum | ||
{ | ||
ERROR_NONE = 0, | ||
ERROR_CAN_WDG, | ||
ERROR_INIT_BTN | ||
} error_t; | ||
// Commenta se non si sta usando lo schermo LCD ILI9488 | ||
#define USE_ILI9488 | ||
|
||
typedef enum { ERROR_NONE = 0, ERROR_CAN_WDG, ERROR_INIT_BTN } error_t; | ||
|
||
/*CUSTOM FUNCTIONS PROTOTYPES*/ | ||
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Enable the watchdog, otherwise you will forget it! |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -477,3 +477,25 @@ void MCB_send_msg(uint32_t id) { | |
} | ||
|
||
/*---------- Private Functions -----------------------------------------------*/ | ||
|
||
/* LCD TFT SCREEN ILI9488 ####################################################*/ | ||
|
||
/*---------- Private define -----------------.--------------------------------*/ | ||
|
||
/*---------- Private macro ------------------.--------------------------------*/ | ||
|
||
/*---------- Private variables --------------.--------------------------------*/ | ||
enum LCD_TFT_Device{CS, RST, DC, LCD_TFT_Device_NUM}; | ||
static const struct GPIO_Tuple LCD_TFT_Device_to_GPIO_Tuple_map[LCD_TFT_Device_NUM] = { | ||
[CS] = {.GPIO_Port = LCD_TFT_CS_GPIO_OUT_GPIO_Port, .GPIO_Pin = LCD_TFT_CS_GPIO_OUT_Pin}, | ||
[DC] = {.GPIO_Port = LCD_TFT_DC_GPIO_OUT_GPIO_Port, .GPIO_Pin = LCD_TFT_DC_GPIO_OUT_Pin}, | ||
[RST] = {.GPIO_Port = LCD_TFT_RST_GPIO_OUT_GPIO_Port, .GPIO_Pin = LCD_TFT_RST_GPIO_OUT_Pin}, | ||
}; | ||
Comment on lines
+488
to
+493
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This construct here is used improperly: the array-map construct is used to make dictionaries/maps of similar things (for example |
||
|
||
/*---------- Private function prototypes ----.--------------------------------*/ | ||
|
||
/*---------- Exported Variables -------------.--------------------------------*/ | ||
|
||
/*---------- Exported Functions ----------------------------------------------*/ | ||
|
||
/*---------- Private Functions -----------------------------------------------*/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this lines