diff --git a/.gitmodules b/.gitmodules index 5da5407..79ad8b5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "Modules/embfmt"] path = Modules/embfmt - url = git@epagris.com:epagris/embfmt.git + url = https://gitea.epagris.com/epagris/embfmt [submodule "Modules/lwip"] path = Modules/lwip url = https://github.com/lwip-tcpip/lwip.git [submodule "Modules/etherlib"] path = Modules/etherlib - url = git@epagris.com:epagris/EtherLib.git + url = https://gitea.epagris.com/epagris/EtherLib [submodule "Drivers/stm32f7xx-hal-driver"] path = Drivers/stm32f7xx-hal-driver url = https://github.com/STMicroelectronics/stm32f7xx-hal-driver.git [submodule "Modules/flexptp"] path = Modules/flexptp - url = git@epagris.com:epagris/flexPTP.git + url = https://github.com/epagris/flexPTP diff --git a/Inc/lwipopts.h b/Inc/lwipopts.h index e5debd6..9f3e18b 100644 --- a/Inc/lwipopts.h +++ b/Inc/lwipopts.h @@ -38,6 +38,7 @@ * NO_SYS==1: Provides VERY minimal functionality. Otherwise, * use lwIP facilities. */ +#include #define NO_SYS 0 /* ---------- Memory options ---------- */ @@ -95,6 +96,9 @@ a lot of data that needs to be copied, this should be set high. */ #define LWIP_SUPPORT_CUSTOM_PBUF 1 /* --------- Ethernet hooks --------- */ +struct netif; +struct pbuf; +extern int8_t hook_unknown_ethertype(struct pbuf *pbuf, struct netif *netif); #define LWIP_HOOK_UNKNOWN_ETH_PROTOCOL(pbuf,netif) hook_unknown_ethertype(pbuf,netif) /* ---------- IPv4 options ---------- */ diff --git a/LICENSE b/LICENSE index 0b6be49..9ec73a2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 András Wiesner +Copyright (c) 2025 András Wiesner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Modules/CMakeLists.txt b/Modules/CMakeLists.txt index 191c258..4998c7f 100644 --- a/Modules/CMakeLists.txt +++ b/Modules/CMakeLists.txt @@ -59,4 +59,5 @@ set(FLEXPTP_INCLUDES ${include_dirs} ${LWIP_DIR}/src/include ${LWIP_PORT_DIR}/in set(FLEXPTP_CPU_PARAMS ${cpu_PARAMS}) set(FLEXPTP_COMPILE_DEFS ${symbols_c_SYMB}) add_subdirectory(flexptp) +target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC ${FLEXPTP_INCLUDE_EXPORT}) target_link_libraries(${CMAKE_PROJECT_NAME} flexptp) diff --git a/Modules/flexptp b/Modules/flexptp index 0dc576d..33b40f2 160000 --- a/Modules/flexptp +++ b/Modules/flexptp @@ -1 +1 @@ -Subproject commit 0dc576d1b79381eb00ff6c71d45257c0db8ff4b4 +Subproject commit 33b40f2eed4b2c725cbc2a9ed30b4fc928755878 diff --git a/README.md b/README.md index 88fcf54..4a020a0 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,5 @@ # STM32 NUCLEO-F746ZG flexPTP demo - - ![flexPTP CLI](NUCLEO-F746ZG.gif) ## What's this? @@ -21,7 +18,7 @@ Still not clear what is it useful for? No worries, it's a behind-the-scenes supp > To acquire the full source tree after cloning the repo, please fetch the linked *submodules* as well: ``` -git clone https://gitea.epagris.com/epagris/flexPTP-demo-NUCLEO-F746ZG.git +git clone https://github.com/epagris/flexPTP-demo-NUCLEO-F746ZG.git cd flexPTP-demo-NUCLEO-F746ZG git submodule init git submodule update @@ -154,7 +151,7 @@ ptp log {def|corr|ts|info|locked|bmca} {on|off} Turn on or off logging time [ns] Print time ptp master [[un]prefer] [clockid] Master clock settings ptp info Print PTP info -ptp domain [domain] Print or get PTP domain +ptp domain [domain] Print or set PTP domain ptp addend [addend] Print or set addend ptp transport [{ipv4|802.3}] Set or get PTP transport layer ptp delmech [{e2e|p2p}] Set or get PTP delay mechanism @@ -192,7 +189,7 @@ ptp priority [ ] Print or set clock priority f ## License -The project is created by András Wiesner (Epagris) in 2025 and published under the MIT license. Contributions are welcome! :) +The project was created by András Wiesner (Epagris) in 2025 and published under the MIT license. Contributions are welcome! :)