Skip to content

Commit 5ea1e21

Browse files
committed
Replace redundant code
1 parent b0be8dd commit 5ea1e21

File tree

1 file changed

+7
-31
lines changed

1 file changed

+7
-31
lines changed

Firmware/RTK_Surveyor/NetworkServer.h

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,8 @@ class NetworkServer : public Server
6363

6464
void begin()
6565
{
66-
#if defined(COMPILE_ETHERNET)
67-
if (_networkType == NETWORK_TYPE_ETHERNET)
68-
if (_server)
69-
((EthernetServer *)_server)->begin();
70-
#endif // COMPILE_ETHERNET
71-
#if defined(COMPILE_WIFI)
72-
if (_networkType == NETWORK_TYPE_WIFI)
73-
if (_server)
74-
((WiFiServer *)_server)->begin();
75-
#endif // COMPILE_WIFI
66+
if (_server)
67+
_server->begin();
7668
}
7769

7870
//------------------------------
@@ -169,16 +161,8 @@ class NetworkServer : public Server
169161

170162
size_t write(uint8_t b)
171163
{
172-
#if defined(COMPILE_ETHERNET)
173-
if (_networkType == NETWORK_TYPE_ETHERNET)
174-
if (_server)
175-
return ((EthernetServer *)_server)->write(b);
176-
#endif // COMPILE_ETHERNET
177-
#if defined(COMPILE_WIFI)
178-
if (_networkType == NETWORK_TYPE_WIFI)
179-
if (_server)
180-
return ((WiFiServer *)_server)->write(b);
181-
#endif // COMPILE_WIFI
164+
if (_server)
165+
return _server->write(b);
182166
return 0;
183167
}
184168

@@ -188,17 +172,9 @@ class NetworkServer : public Server
188172

189173
size_t write(const uint8_t *buf, size_t size)
190174
{
191-
#if defined(COMPILE_ETHERNET)
192-
if (_networkType == NETWORK_TYPE_ETHERNET)
193-
if (_server)
194-
return ((EthernetServer *)_server)->write(buf, size);
195-
#endif // COMPILE_ETHERNET
196-
#if defined(COMPILE_WIFI)
197-
if (_networkType == NETWORK_TYPE_WIFI)
198-
if (_server)
199-
return ((WiFiServer *)_server)->write(buf, size);
200-
#endif // COMPILE_WIFI
201-
return 0;
175+
if (_server)
176+
return _server->write(buf, size);
177+
return 0;
202178
}
203179

204180
protected:

0 commit comments

Comments
 (0)