3333#include " firmwareversion.h"
3434#if !defined(NO_EMAC)
3535#include " network.h"
36- #include " net /protocol/dhcp.h"
36+ #include " core /protocol/dhcp.h"
3737#endif
3838#if defined(NODE_ARTNET_MULTI)
3939#define NODE_ARTNET
5757#if defined(RDM_RESPONDER) || defined(OUTPUT_DMX_MONITOR) || defined(OUTPUT_DMX_PCA9685) || defined(OUTPUT_DMX_PIXEL) || defined(OUTPUT_DMX_TLC59711)
5858#define HAVE_DMX_START_ADDRESS
5959#endif
60- #include " firmware/debug/debug_debug.h"
60+ #include " firmware/debug/debug_debug.h"
6161
6262namespace displayudf
6363{
6464inline constexpr uint32_t kLabelMaxRows = 6 ;
6565
66- enum class Labels : uint8_t
66+ enum class Labels : uint8_t
6767{
6868 kTitle ,
6969 kBoardname ,
@@ -86,7 +86,7 @@ enum class Labels: uint8_t
8686 UNIVERSE_PORT_D,
8787#endif
8888#if defined(NODE_ARTNET) || defined(NODE_ARTNET_MULTI)
89- kDestinationIpPortA ,
89+ kDestinationIpPortA ,
9090#if (DMX_MAX_PORTS > 1)
9191 kDestinationIpPortB ,
9292#endif
@@ -178,40 +178,39 @@ class DisplayUdf final : public Display
178178 void ShowIpAddress ()
179179 {
180180 ClearEndOfLine ();
181- Printf (labels_[static_cast <uint32_t >(displayudf::Labels::kIp )], " " IPSTR " /%d %c" , IP2STR (net::GetPrimaryIp ()), net::GetNetmaskCIDR (),
182- network::iface::AddressingMode ());
181+ Printf (labels_[static_cast <uint32_t >(displayudf::Labels::kIp )], " " IPSTR " /%d %c" , IP2STR (network::GetPrimaryIp ()), network::GetNetmaskCIDR (), network::iface::AddressingMode ());
183182 }
184183
185184 void ShowNetmask ()
186185 {
187186 ClearEndOfLine ();
188- Printf (labels_[static_cast <uint32_t >(displayudf::Labels::kNetmask )], " N: " IPSTR " " , IP2STR (net ::GetNetmask ()));
187+ Printf (labels_[static_cast <uint32_t >(displayudf::Labels::kNetmask )], " N: " IPSTR " " , IP2STR (network ::GetNetmask ()));
189188 ShowIpAddress ();
190189 }
191190
192191 void ShowGatewayIp ()
193192 {
194193 ClearEndOfLine ();
195- Printf (labels_[static_cast <uint32_t >(displayudf::Labels::kDefaultGateway )], " G: " IPSTR " " , IP2STR (net ::GetGatewayIp ()));
194+ Printf (labels_[static_cast <uint32_t >(displayudf::Labels::kDefaultGateway )], " G: " IPSTR " " , IP2STR (network ::GetGatewayIp ()));
196195 }
197196
198197 void ShowHostName ()
199198 {
200199 ClearEndOfLine ();
201- Write (labels_[static_cast <uint32_t >(displayudf::Labels::kHostname )], network::iface::GetHostName ());
200+ Write (labels_[static_cast <uint32_t >(displayudf::Labels::kHostname )], network::iface::HostName ());
202201 }
203202
204- void ShowDhcpStatus (net ::dhcp::State state)
203+ void ShowDhcpStatus (network ::dhcp::State state)
205204 {
206205 switch (state)
207206 {
208- case net ::dhcp::State::STATE_OFF :
207+ case network ::dhcp::State::kOff :
209208 break ;
210- case net ::dhcp::State::STATE_RENEWING :
209+ case network ::dhcp::State::kRenewing :
211210 ClearEndOfLine ();
212211 Printf (labels_[static_cast <uint32_t >(displayudf::Labels::kIp )], " DHCP renewing" );
213212 break ;
214- case net ::dhcp::State::STATE_BOUND :
213+ case network ::dhcp::State::kBound :
215214 break ;
216215 default :
217216 break ;
@@ -248,4 +247,4 @@ class DisplayUdf final : public Display
248247 inline static DisplayUdf* s_this;
249248};
250249
251- #endif // DISPLAYUDF_H_
250+ #endif // DISPLAYUDF_H_
0 commit comments