diff --git a/bsp_stm32h7_freertos/NUCLEO-H743ZI/Src/CMakeLists.txt b/bsp_stm32h7_freertos/NUCLEO-H743ZI/Src/CMakeLists.txt index 48a7c25..154d0b1 100644 --- a/bsp_stm32h7_freertos/NUCLEO-H743ZI/Src/CMakeLists.txt +++ b/bsp_stm32h7_freertos/NUCLEO-H743ZI/Src/CMakeLists.txt @@ -1,6 +1,6 @@ target_sources(${TARGET_NAME} PRIVATE freertos.c - hardware_init.c + hardware_init.cpp stm32h7xx_hal_timebase_tim.c stm32h7xx_nucleo.c lan8742.c diff --git a/bsp_stm32h7_freertos/NUCLEO-H743ZI/Src/hardware_init.c b/bsp_stm32h7_freertos/NUCLEO-H743ZI/Src/hardware_init.cpp similarity index 97% rename from bsp_stm32h7_freertos/NUCLEO-H743ZI/Src/hardware_init.c rename to bsp_stm32h7_freertos/NUCLEO-H743ZI/Src/hardware_init.cpp index 29f02ac..a0e6a41 100644 --- a/bsp_stm32h7_freertos/NUCLEO-H743ZI/Src/hardware_init.c +++ b/bsp_stm32h7_freertos/NUCLEO-H743ZI/Src/hardware_init.cpp @@ -8,6 +8,7 @@ #if OBSW_ADD_LWIP_COMPONENTS == 1 #include #include "example_common/stm32h7/networking/ethernetif.h" +#include "example_common/stm32h7/networking/app_ethernet.h" #include #include #include @@ -263,10 +264,10 @@ void Netif_Config(void) /* Registers the default network interface */ netif_set_default(&gnetif); - ethernet_link_status_updated(&gnetif); + networking::ethernetLinkStatusUpdated(&gnetif); #if LWIP_NETIF_LINK_CALLBACK - netif_set_link_callback(&gnetif, ethernet_link_status_updated); + netif_set_link_callback(&gnetif, networking::ethernetLinkStatusUpdated); #endif } diff --git a/bsp_stm32h7_freertos/core/ObjectFactory.cpp b/bsp_stm32h7_freertos/core/ObjectFactory.cpp index 0b0f936..cfdce0b 100644 --- a/bsp_stm32h7_freertos/core/ObjectFactory.cpp +++ b/bsp_stm32h7_freertos/core/ObjectFactory.cpp @@ -2,6 +2,7 @@ #include "OBSWConfig.h" #include "devices/devAddresses.h" #include "objects/systemObjectList.h" +#include "hardware_init.h" #include "mission/utility/TmFunnel.h" #include "mission/core/GenericFactory.h" @@ -57,7 +58,7 @@ void ObjectFactory::produce(void* args) { /* UDP Server */ new TmTcLwIpUdpBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR, objects::TM_STORE, objects::TC_STORE); - new UdpTcLwIpPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE); + new UdpTcLwIpPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE, &gnetif); #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */ ObjectFactory::produceGenericObjects(); diff --git a/example_common b/example_common index 0ad5c91..253780d 160000 --- a/example_common +++ b/example_common @@ -1 +1 @@ -Subproject commit 0ad5c91fc7ce64b04b1d9742a54929d79acfc722 +Subproject commit 253780d5d40c08284788b74e5964f6210ab4d641