Skip to content

Commit d4d2f0a

Browse files
committed
networkId: fix return values
1 parent b8005de commit d4d2f0a

File tree

1 file changed

+20
-24
lines changed

1 file changed

+20
-24
lines changed

src/networkId.cpp

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,23 @@
1111
#include "networkId.h"
1212

1313
bool networkId::begin() {
14-
#if defined(ARDUINO_SAMD_MKRWIFI1010) || \
15-
defined(ARDUINO_SAMD_NANO_33_IOT)
16-
WiFi.setTimeout(0);
17-
return !!WiFi.begin("In33dm4c4ddr35", "In33dm4c4ddr35");
18-
#elif defined(ARDUINO_PORTENTA_H7_M7) || \
19-
defined(ARDUINO_NICLA_VISION) || \
20-
defined(ARDUINO_GIGA)
21-
WiFi.setTimeout(0);
22-
return !!WiFi.begin("In33dm4c4ddr35", "In33dm4c4ddr35", ENC_TYPE_TKIP);
23-
#elif defined(ARDUINO_PORTENTA_C33) || \
14+
#if defined(ARDUINO_NANO_RP2040_CONNECT) || \
15+
defined(ARDUINO_SAMD_MKRWIFI1010) || \
16+
defined(ARDUINO_SAMD_NANO_33_IOT) || \
17+
defined(ARDUINO_PORTENTA_C33) || \
2418
defined(ARDUINO_UNOR4_WIFI)
2519
WiFi.setTimeout(0);
26-
return !!WiFi.begin("In33dm4c4ddr35", "In33dm4c4ddr35");
27-
#elif defined(ARDUINO_NANO_RP2040_CONNECT)
20+
int result = WiFi.begin("In33dm4c4ddr35", "In33dm4c4ddr35");
21+
return (result != WL_NO_SHIELD) ? true : false;
22+
#elif defined(ARDUINO_PORTENTA_H7_M7) || \
23+
defined(ARDUINO_NICLA_VISION) || \
24+
defined(ARDUINO_GIGA)
2825
WiFi.setTimeout(0);
29-
return !!WiFi.begin("In33dm4c4ddr35", "In33dm4c4ddr35");
26+
int result = WiFi.begin("In33dm4c4ddr35", "In33dm4c4ddr35", ENC_TYPE_TKIP);
27+
return ( result != WL_NO_SHIELD) ? true : false;
3028
#elif defined(ARDUINO_OPTA)
31-
return !!Ethernet.begin(NULL, 0, 0);
29+
Ethernet.begin(NULL, 0, 0);
30+
return true;
3231
#endif
3332
}
3433

@@ -41,18 +40,15 @@ bool networkId::get(uint8_t *in, uint32_t size) {
4140
if (size < IFACE_MAC_ADDR_LENGTH) {
4241
return false;
4342
}
44-
#if defined(ARDUINO_SAMD_MKRWIFI1010) || \
45-
defined(ARDUINO_SAMD_NANO_33_IOT)
46-
WiFi.macAddress(in);
47-
#elif defined(ARDUINO_PORTENTA_H7_M7) || \
48-
defined(ARDUINO_NICLA_VISION) || \
43+
#if defined(ARDUINO_NANO_RP2040_CONNECT) || \
44+
defined(ARDUINO_SAMD_MKRWIFI1010) || \
45+
defined(ARDUINO_SAMD_NANO_33_IOT) || \
46+
defined(ARDUINO_PORTENTA_C33) || \
47+
defined(ARDUINO_UNOR4_WIFI) || \
48+
defined(ARDUINO_PORTENTA_H7_M7) || \
49+
defined(ARDUINO_NICLA_VISION) || \
4950
defined(ARDUINO_GIGA)
5051
WiFi.macAddress(in);
51-
#elif defined(ARDUINO_PORTENTA_C33) || \
52-
defined(ARDUINO_UNOR4_WIFI)
53-
WiFi.macAddress(in);
54-
#elif defined(ARDUINO_NANO_RP2040_CONNECT)
55-
WiFi.macAddress(in);
5652
#elif defined(ARDUINO_OPTA)
5753
Ethernet.MACAddress(in);
5854
#endif

0 commit comments

Comments
 (0)