#292

vanvught · Dec 22, 2024 · 5a712f1 · 5a712f1
1 parent 187223e
commit 5a712f1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 13 deletions.
diff --git a/lib-network/Makefile.BCM b/lib-network/Makefile.BCM
@@ -1,6 +1,8 @@
 DEFINES=NDEBUG
 
-EXTRA_INCLUDES=../lib-display/include ../lib-properties/include
+EXTRA_INCLUDES=
+
+EXTRA_SRCDIR=
 
 ifeq ($(findstring ESP8266,$(MAKE_FLAGS)), ESP8266)
 	EXTRA_SRCDIR+=src/esp8266 src/esp8266/rpi src/params

diff --git a/lib-network/Makefile.H3 b/lib-network/Makefile.H3
@@ -1,6 +1,6 @@
 DEFINES=NDEBUG
 
-EXTRA_INCLUDES=../lib-display/include ../lib-properties/include
+EXTRA_INCLUDES=
 
 EXTRA_SRCDIR=
 

diff --git a/lib-network/Makefile.Linux b/lib-network/Makefile.Linux
@@ -1,6 +1,6 @@
 #DEFINES=NDEBUG
 
-EXTRA_INCLUDES=../lib-properties/include
+EXTRA_INCLUDES=
 
 EXTRA_SRCDIR=src/net/apps/tftp
 

diff --git a/lib-network/Rules.mk b/lib-network/Rules.mk
@@ -1,6 +1,8 @@
 $(info $$MAKE_FLAGS [${MAKE_FLAGS}])
 $(info $$DEFINES [${DEFINES}])
 
+EXTRA_INCLUDES+=../lib-properties/include ../lib-display/include
+
 COND=
 
 ifneq ($(MAKE_FLAGS),)

diff --git a/lib-network/include/net/apps/ntp_client.h b/lib-network/include/net/apps/ntp_client.h
@@ -34,7 +34,7 @@
 # define CONFIG_NTP_CLIENT_POLL_POWER_MIN 3
 #endif
 #if !defined(CONFIG_NTP_CLIENT_POLL_POWER_MAX)
-# define CONFIG_NTP_CLIENT_POLL_POWER_MAX 10
+# define CONFIG_NTP_CLIENT_POLL_POWER_MAX 12
 #endif
 
 namespace ntpclient {

diff --git a/lib-network/src/emac/network.cpp b/lib-network/src/emac/network.cpp
@@ -274,12 +274,3 @@ void Network::EnableDhcp() {
 
 	DEBUG_EXIT
 }
-
-void Network::Print() {
-	printf("Network [%c]\n", GetAddressingMode());
-	printf(" Hostname  : %s\n", m_aHostName);
-	printf(" IfName    : %u: %s " MACSTR "\n", static_cast<unsigned int>(GetIfIndex()), m_aIfName, MAC2STR(net::netif_hwaddr()));
-	printf(" Primary   : " IPSTR "/%u (HTTP only " IPSTR ")\n", IP2STR(net::netif_ipaddr()), static_cast<unsigned int>(GetNetmaskCIDR()), IP2STR(net::netif_secondary_ipaddr()));
-	printf(" Gateway   : " IPSTR "\n", IP2STR(net::netif_gw()));
-	printf(" Broadcast : " IPSTR "\n", IP2STR(GetBroadcastIp()));
-}