Merge branch 'main' into Modbus_TCP_Obe

This commit is contained in:
2023-11-26 22:32:44 +01:00
6 changed files with 1093 additions and 4 deletions

View File

@@ -28,8 +28,10 @@
#include "log.h"
#include "llfs.h"
#include "lcd_api.h"
#include "mqtt_application.h"
#include "tftp.h"
#include "modbus_tcp.h"
#include "UDP_broadcast.h"
/* USER CODE END Includes */
@@ -133,9 +135,21 @@ int main(void)
/* Initialize the tftp server */
tftp_server_init();
/* Initialize Modbus*/
modbus_init();
/* Initialize the MQTT application */
mqtt_application_init();
// Initialize the UDP broadcast service
if (udp_broadcast_init(10,255) != ERR_OK){
LOG_WARN(TAG,"error initializing udp connection, check warnings from udp_broadcast_init() or udp_broadcast_connection_init()");
}
if (udp_broadcast_set_owner_details("Joran", "Van Nieuwenhoven") != ERR_OK){
LOG_WARN(TAG,"error setting owner's details");
}
/* USER CODE END 2 */
@@ -143,10 +157,10 @@ int main(void)
/* USER CODE BEGIN WHILE */
while (1)
{
/* USER CODE END WHILE */
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
MX_LWIP_Process();
/* USER CODE BEGIN 3 */
MX_LWIP_Process();
lcd_task();
}
/* USER CODE END 3 */