Merge branch 'main' into LCD_API

This commit is contained in:
2023-11-09 15:01:36 +01:00
24 changed files with 5061 additions and 184 deletions

View File

@@ -22,6 +22,7 @@
/* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */
#define LOGGER_LEVEL_ALL
#include "log.h"
//#include "test_img.h"
@@ -36,7 +37,7 @@
/* Private define ------------------------------------------------------------*/
/* USER CODE BEGIN PD */
static const char *TAG = "main";
/* USER CODE END PD */
/* Private macro -------------------------------------------------------------*/
@@ -125,6 +126,7 @@ int main(void)
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
MX_LWIP_Process();
}
/* USER CODE END 3 */
}