Merge branch 'main' into UDP-broadcast
This commit is contained in:
@@ -28,7 +28,8 @@
|
||||
#include "log.h"
|
||||
#include "llfs.h"
|
||||
#include "lcd_api.h"
|
||||
#include "UDP_broadcast.h"
|
||||
#include "tftp.h"
|
||||
|
||||
/* USER CODE END Includes */
|
||||
|
||||
/* Private typedef -----------------------------------------------------------*/
|
||||
@@ -120,20 +121,17 @@ int main(void)
|
||||
BSP_QSPI_MemoryMappedMode();
|
||||
WRITE_REG(QUADSPI->LPTR, 0xFFF);
|
||||
|
||||
/* Clear terminal */
|
||||
printf(CLEAR_SCREEN);
|
||||
|
||||
/* Initialize the LCD */
|
||||
lcd_init(true);
|
||||
|
||||
/* Initialize the filesystem */
|
||||
llfs_init();
|
||||
|
||||
// Initialize the UDP broadcast service
|
||||
if (udp_broadcast_init(270,255) != ERR_OK || udp_broadcast_connection_init() != ERR_OK){
|
||||
LOG_WARN(TAG,"error initializing udp connection");
|
||||
}
|
||||
if (!udp_broadcast_set_owner_details("Joran", "Van Nieuwenhoven")){
|
||||
LOG_WARN(TAG,"error setting owner's details");
|
||||
}
|
||||
|
||||
/* Initialize the tftp server */
|
||||
tftp_server_init();
|
||||
/* USER CODE END 2 */
|
||||
|
||||
/* Infinite loop */
|
||||
@@ -144,7 +142,7 @@ int main(void)
|
||||
|
||||
/* USER CODE BEGIN 3 */
|
||||
MX_LWIP_Process();
|
||||
lcd_task();
|
||||
lcd_task();
|
||||
}
|
||||
/* USER CODE END 3 */
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user