Skip to content

Commit d0bff60

Browse files
committed
Reinstate NetworkServer begin and write
1 parent fb01993 commit d0bff60

File tree

1 file changed

+33
-6
lines changed

1 file changed

+33
-6
lines changed

Firmware/RTK_Surveyor/NetworkServer.h

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,17 @@ class NetworkServer : public Server
6363

6464
void begin()
6565
{
66-
if (_server)
67-
_server->begin();
66+
// if (_server) _server->begin(); doesn't work...
67+
#if defined(COMPILE_ETHERNET)
68+
if (_networkType == NETWORK_TYPE_ETHERNET)
69+
if (_server)
70+
((EthernetServer *)_server)->begin();
71+
#endif // COMPILE_ETHERNET
72+
#if defined(COMPILE_WIFI)
73+
if (_networkType == NETWORK_TYPE_WIFI)
74+
if (_server)
75+
((WiFiServer *)_server)->begin();
76+
#endif // COMPILE_WIFI
6877
}
6978

7079
//------------------------------
@@ -161,8 +170,17 @@ class NetworkServer : public Server
161170

162171
size_t write(uint8_t b)
163172
{
164-
if (_server)
165-
return _server->write(b);
173+
// if (_server) return _server->write(b); doesn't work...
174+
#if defined(COMPILE_ETHERNET)
175+
if (_networkType == NETWORK_TYPE_ETHERNET)
176+
if (_server)
177+
return ((EthernetServer *)_server)->write(b);
178+
#endif // COMPILE_ETHERNET
179+
#if defined(COMPILE_WIFI)
180+
if (_networkType == NETWORK_TYPE_WIFI)
181+
if (_server)
182+
return ((WiFiServer *)_server)->write(b);
183+
#endif // COMPILE_WIFI
166184
return 0;
167185
}
168186

@@ -172,8 +190,17 @@ class NetworkServer : public Server
172190

173191
size_t write(const uint8_t *buf, size_t size)
174192
{
175-
if (_server)
176-
return _server->write(buf, size);
193+
// if (_server) return _server->write(buf, size); doesn't work...
194+
#if defined(COMPILE_ETHERNET)
195+
if (_networkType == NETWORK_TYPE_ETHERNET)
196+
if (_server)
197+
return ((EthernetServer *)_server)->write(buf, size);
198+
#endif // COMPILE_ETHERNET
199+
#if defined(COMPILE_WIFI)
200+
if (_networkType == NETWORK_TYPE_WIFI)
201+
if (_server)
202+
return ((WiFiServer *)_server)->write(buf, size);
203+
#endif // COMPILE_WIFI
177204
return 0;
178205
}
179206

0 commit comments

Comments
 (0)