Skip to content
This repository was archived by the owner on Jan 29, 2023. It is now read-only.

Commit 8d8c0b3

Browse files
khoih-progkhoih-prog
authored
v1.13.1 to use new WiFi101_Generic library
### Release v1.13.1 1. Using new [`WiFi101_Generic library`](https://github.com/khoih-prog/WiFi101_Generic) for sending larger data 2. Add astyle using `allman` style. Restyle the library 3. Update `Packages' Patches`
1 parent 2b2c340 commit 8d8c0b3

File tree

14 files changed

+937
-924
lines changed

14 files changed

+937
-924
lines changed

‎examples/Generic/WiFi101/SAMD/SAMD_WiFi101-AdvancedWebServer/SAMD_WiFi101-AdvancedWebServer.ino‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/****************************************************************************************************************************
22
SAMD_WiFi101_AdvancedWebServer.ino
33
For SAMD21/SAMD51 with WiFi101 module/shield.
4-
4+
55
Based on and modified from Gil Maimon's ArduinoWebsockets library https://github.com/gilmaimon/ArduinoWebsockets
66
to support STM32F/L/H/G/WB/MP1, nRF52 and SAMD21/SAMD51 boards besides ESP8266 and ESP32
7-
7+
88
The library provides simple and easy interface for websockets (Client and Server).
9-
9+
1010
Example first created on: 10.05.2018
1111
Original Author: Markus Sattler
12-
12+
1313
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
1414
Licensed under MIT license
1515
*****************************************************************************************************************************/
@@ -104,13 +104,14 @@ void drawGraph()
104104
void setup()
105105
{
106106
Serial.begin(115200);
107+
107108
while (!Serial && millis() < 5000);
108109

109-
Serial.println("\nStarting SAMD_WiFi101_AdvancedWebServer with WiFi101 on " + String(BOARD_NAME));
110+
Serial.println("\nStarting SAMD_WiFi101_AdvancedWebServer with WiFi101_Generic on " + String(BOARD_NAME));
110111
Serial.println(WEBSOCKETS2_GENERIC_VERSION);
111112

112113
// check for the WiFi module:
113-
if (WiFi.status() == WL_NO_SHIELD)
114+
if (WiFi.status() == WL_NO_SHIELD)
114115
{
115116
Serial.println("Communication with WiFi module failed!");
116117
// don't continue
@@ -122,19 +123,19 @@ void setup()
122123
Serial.println(fv);
123124

124125
String latestFv;
125-
126-
if (REV(GET_CHIPID()) >= REV_3A0)
126+
127+
if (REV(GET_CHIPID()) >= REV_3A0)
127128
{
128129
// model B
129130
latestFv = WIFI_FIRMWARE_LATEST_MODEL_B;
130-
}
131-
else
131+
}
132+
else
132133
{
133134
// model A
134135
latestFv = WIFI_FIRMWARE_LATEST_MODEL_A;
135136
}
136-
137-
if (fv < latestFv)
137+
138+
if (fv < latestFv)
138139
{
139140
Serial.println("Please upgrade the firmware");
140141
// Print required firmware version

‎examples/Generic/WiFi101/SAMD/SAMD_WiFi101-AdvancedWebServer/defines.h‎

Lines changed: 111 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/****************************************************************************************************************************
22
defines.h for SAMD_WiFi101-Client.ino
33
For SAMD21/SAMD51 with WiFi101 module/shield.
4-
4+
55
Based on and modified from Gil Maimon's ArduinoWebsockets library https://github.com/gilmaimon/ArduinoWebsockets
66
to support STM32F/L/H/G/WB/MP1, nRF52 and SAMD21/SAMD51 boards besides ESP8266 and ESP32
7-
7+
88
The library provides simple and easy interface for websockets (Client and Server).
9-
9+
1010
Example first created on: 10.05.2018
1111
Original Author: Markus Sattler
12-
12+
1313
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
1414
Licensed under MIT license
1515
*****************************************************************************************************************************/
@@ -22,117 +22,117 @@
2222
|| defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRNB1500) || defined(ARDUINO_SAMD_MKRVIDOR4000) || defined(__SAMD21G18A__) \
2323
|| defined(ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS) || defined(__SAMD21E18A__) || defined(__SAMD51__) || defined(__SAMD51J20A__) || defined(__SAMD51J19A__) \
2424
|| defined(__SAMD51G19A__) || defined(__SAMD51P19A__) || defined(__SAMD21G18A__) )
25-
#if defined(WEBSOCKETS_WIFI101_USE_SAMD)
26-
#undef WEBSOCKETS_WIFI101_USE_SAMD
27-
#endif
28-
#define WEBSOCKETS_USE_WIFI101 true
29-
#define WEBSOCKETS_WIFI101_USE_SAMD true
30-
#define USE_WIFI101 true
31-
#define USE_WIFI_NINA false
32-
#warning Using WiFi101 Library for MKR1000 and MKRWIFI1010
25+
#if defined(WEBSOCKETS_WIFI101_USE_SAMD)
26+
#undef WEBSOCKETS_WIFI101_USE_SAMD
27+
#endif
28+
#define WEBSOCKETS_USE_WIFI101 true
29+
#define WEBSOCKETS_WIFI101_USE_SAMD true
30+
#define USE_WIFI101 true
31+
#define USE_WIFI_NINA false
32+
#warning Using WiFi101_Generic Library for MKR1000 and MKRWIFI1010
3333
#else
34-
#error This code is intended to run only on the SAMD boards using WiFi101! Please check your Tools->Board setting.
34+
#error This code is intended to run only on the SAMD boards using WiFi101_Generic! Please check your Tools->Board setting.
3535
#endif
3636

3737
#if defined(WEBSOCKETS_WIFI101_USE_SAMD)
3838

39-
#if defined(ARDUINO_SAMD_ZERO)
40-
#define BOARD_TYPE "SAMD Zero"
41-
#elif defined(ARDUINO_SAMD_MKR1000)
42-
#define BOARD_TYPE "SAMD MKR1000"
43-
#elif defined(ARDUINO_SAMD_MKRWIFI1010)
44-
#define BOARD_TYPE "SAMD MKRWIFI1010"
45-
#elif defined(ARDUINO_SAMD_NANO_33_IOT)
46-
#define BOARD_TYPE "SAMD NANO_33_IOT"
47-
#elif defined(ARDUINO_SAMD_MKRFox1200)
48-
#define BOARD_TYPE "SAMD MKRFox1200"
49-
#elif ( defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310) )
50-
#define BOARD_TYPE "SAMD MKRWAN13X0"
51-
#elif defined(ARDUINO_SAMD_MKRGSM1400)
52-
#define BOARD_TYPE "SAMD MKRGSM1400"
53-
#elif defined(ARDUINO_SAMD_MKRNB1500)
54-
#define BOARD_TYPE "SAMD MKRNB1500"
55-
#elif defined(ARDUINO_SAMD_MKRVIDOR4000)
56-
#define BOARD_TYPE "SAMD MKRVIDOR4000"
57-
#elif defined(ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS)
58-
#define BOARD_TYPE "SAMD ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS"
59-
#elif defined(ADAFRUIT_FEATHER_M0_EXPRESS)
60-
#define BOARD_TYPE "SAMD21 ADAFRUIT_FEATHER_M0_EXPRESS"
61-
#elif defined(ADAFRUIT_METRO_M0_EXPRESS)
62-
#define BOARD_TYPE "SAMD21 ADAFRUIT_METRO_M0_EXPRESS"
63-
#elif defined(ADAFRUIT_CIRCUITPLAYGROUND_M0)
64-
#define BOARD_TYPE "SAMD21 ADAFRUIT_CIRCUITPLAYGROUND_M0"
65-
#elif defined(ADAFRUIT_GEMMA_M0)
66-
#define BOARD_TYPE "SAMD21 ADAFRUIT_GEMMA_M0"
67-
#elif defined(ADAFRUIT_TRINKET_M0)
68-
#define BOARD_TYPE "SAMD21 ADAFRUIT_TRINKET_M0"
69-
#elif defined(ADAFRUIT_ITSYBITSY_M0)
70-
#define BOARD_TYPE "SAMD21 ADAFRUIT_ITSYBITSY_M0"
71-
#elif defined(ARDUINO_SAMD_HALLOWING_M0)
72-
#define BOARD_TYPE "SAMD21 ARDUINO_SAMD_HALLOWING_M0"
73-
#elif defined(ADAFRUIT_METRO_M4_EXPRESS)
74-
#define BOARD_TYPE "SAMD51 ADAFRUIT_METRO_M4_EXPRESS"
75-
#elif defined(ADAFRUIT_GRAND_CENTRAL_M4)
76-
#define BOARD_TYPE "SAMD51 ADAFRUIT_GRAND_CENTRAL_M4"
77-
#elif defined(ADAFRUIT_FEATHER_M4_EXPRESS)
78-
#define BOARD_TYPE "SAMD51 ADAFRUIT_FEATHER_M4_EXPRESS"
79-
#elif defined(ADAFRUIT_ITSYBITSY_M4_EXPRESS)
80-
#define BOARD_TYPE "SAMD51 ADAFRUIT_ITSYBITSY_M4_EXPRESS"
81-
#elif defined(ADAFRUIT_TRELLIS_M4_EXPRESS)
82-
#define BOARD_TYPE "SAMD51 ADAFRUIT_TRELLIS_M4_EXPRESS"
83-
#elif defined(ADAFRUIT_PYPORTAL)
84-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYPORTAL"
85-
#elif defined(ADAFRUIT_PYPORTAL_M4_TITANO)
86-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYPORTAL_M4_TITANO"
87-
#elif defined(ADAFRUIT_PYBADGE_M4_EXPRESS)
88-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYBADGE_M4_EXPRESS"
89-
#elif defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
90-
#define BOARD_TYPE "SAMD51 ADAFRUIT_METRO_M4_AIRLIFT_LITE"
91-
#elif defined(ADAFRUIT_PYGAMER_M4_EXPRESS)
92-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYGAMER_M4_EXPRESS"
93-
#elif defined(ADAFRUIT_PYGAMER_ADVANCE_M4_EXPRESS)
94-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYGAMER_ADVANCE_M4_EXPRESS"
95-
#elif defined(ADAFRUIT_PYBADGE_AIRLIFT_M4)
96-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYBADGE_AIRLIFT_M4"
97-
#elif defined(ADAFRUIT_MONSTER_M4SK_EXPRESS)
98-
#define BOARD_TYPE "SAMD51 ADAFRUIT_MONSTER_M4SK_EXPRESS"
99-
#elif defined(ADAFRUIT_HALLOWING_M4_EXPRESS)
100-
#define BOARD_TYPE "SAMD51 ADAFRUIT_HALLOWING_M4_EXPRESS"
101-
#elif defined(SEEED_WIO_TERMINAL)
102-
#define BOARD_TYPE "SAMD SEEED_WIO_TERMINAL"
103-
#elif defined(SEEED_FEMTO_M0)
104-
#define BOARD_TYPE "SAMD SEEED_FEMTO_M0"
105-
#elif defined(SEEED_XIAO_M0)
106-
#define BOARD_TYPE "SAMD SEEED_XIAO_M0"
107-
#elif defined(Wio_Lite_MG126)
108-
#define BOARD_TYPE "SAMD SEEED Wio_Lite_MG126"
109-
#elif defined(WIO_GPS_BOARD)
110-
#define BOARD_TYPE "SAMD SEEED WIO_GPS_BOARD"
111-
#elif defined(SEEEDUINO_ZERO)
112-
#define BOARD_TYPE "SAMD SEEEDUINO_ZERO"
113-
#elif defined(SEEEDUINO_LORAWAN)
114-
#define BOARD_TYPE "SAMD SEEEDUINO_LORAWAN"
115-
#elif defined(SEEED_GROVE_UI_WIRELESS)
116-
#define BOARD_TYPE "SAMD SEEED_GROVE_UI_WIRELESS"
117-
#elif defined(__SAMD21E18A__)
118-
#define BOARD_TYPE "SAMD21E18A"
119-
#elif defined(__SAMD21G18A__)
120-
#define BOARD_TYPE "SAMD21G18A"
121-
#elif defined(__SAMD51G19A__)
122-
#define BOARD_TYPE "SAMD51G19A"
123-
#elif defined(__SAMD51J19A__)
124-
#define BOARD_TYPE "SAMD51J19A"
125-
#elif defined(__SAMD51J20A__)
126-
#define BOARD_TYPE "SAMD51J20A"
127-
#elif defined(__SAM3X8E__)
128-
#define BOARD_TYPE "SAM3X8E"
129-
#elif defined(__CPU_ARC__)
130-
#define BOARD_TYPE "CPU_ARC"
131-
#elif defined(__SAMD51__)
132-
#define BOARD_TYPE "SAMD51"
133-
#else
134-
#define BOARD_TYPE "SAMD Unknown"
135-
#endif
39+
#if defined(ARDUINO_SAMD_ZERO)
40+
#define BOARD_TYPE "SAMD Zero"
41+
#elif defined(ARDUINO_SAMD_MKR1000)
42+
#define BOARD_TYPE "SAMD MKR1000"
43+
#elif defined(ARDUINO_SAMD_MKRWIFI1010)
44+
#define BOARD_TYPE "SAMD MKRWIFI1010"
45+
#elif defined(ARDUINO_SAMD_NANO_33_IOT)
46+
#define BOARD_TYPE "SAMD NANO_33_IOT"
47+
#elif defined(ARDUINO_SAMD_MKRFox1200)
48+
#define BOARD_TYPE "SAMD MKRFox1200"
49+
#elif ( defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310) )
50+
#define BOARD_TYPE "SAMD MKRWAN13X0"
51+
#elif defined(ARDUINO_SAMD_MKRGSM1400)
52+
#define BOARD_TYPE "SAMD MKRGSM1400"
53+
#elif defined(ARDUINO_SAMD_MKRNB1500)
54+
#define BOARD_TYPE "SAMD MKRNB1500"
55+
#elif defined(ARDUINO_SAMD_MKRVIDOR4000)
56+
#define BOARD_TYPE "SAMD MKRVIDOR4000"
57+
#elif defined(ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS)
58+
#define BOARD_TYPE "SAMD ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS"
59+
#elif defined(ADAFRUIT_FEATHER_M0_EXPRESS)
60+
#define BOARD_TYPE "SAMD21 ADAFRUIT_FEATHER_M0_EXPRESS"
61+
#elif defined(ADAFRUIT_METRO_M0_EXPRESS)
62+
#define BOARD_TYPE "SAMD21 ADAFRUIT_METRO_M0_EXPRESS"
63+
#elif defined(ADAFRUIT_CIRCUITPLAYGROUND_M0)
64+
#define BOARD_TYPE "SAMD21 ADAFRUIT_CIRCUITPLAYGROUND_M0"
65+
#elif defined(ADAFRUIT_GEMMA_M0)
66+
#define BOARD_TYPE "SAMD21 ADAFRUIT_GEMMA_M0"
67+
#elif defined(ADAFRUIT_TRINKET_M0)
68+
#define BOARD_TYPE "SAMD21 ADAFRUIT_TRINKET_M0"
69+
#elif defined(ADAFRUIT_ITSYBITSY_M0)
70+
#define BOARD_TYPE "SAMD21 ADAFRUIT_ITSYBITSY_M0"
71+
#elif defined(ARDUINO_SAMD_HALLOWING_M0)
72+
#define BOARD_TYPE "SAMD21 ARDUINO_SAMD_HALLOWING_M0"
73+
#elif defined(ADAFRUIT_METRO_M4_EXPRESS)
74+
#define BOARD_TYPE "SAMD51 ADAFRUIT_METRO_M4_EXPRESS"
75+
#elif defined(ADAFRUIT_GRAND_CENTRAL_M4)
76+
#define BOARD_TYPE "SAMD51 ADAFRUIT_GRAND_CENTRAL_M4"
77+
#elif defined(ADAFRUIT_FEATHER_M4_EXPRESS)
78+
#define BOARD_TYPE "SAMD51 ADAFRUIT_FEATHER_M4_EXPRESS"
79+
#elif defined(ADAFRUIT_ITSYBITSY_M4_EXPRESS)
80+
#define BOARD_TYPE "SAMD51 ADAFRUIT_ITSYBITSY_M4_EXPRESS"
81+
#elif defined(ADAFRUIT_TRELLIS_M4_EXPRESS)
82+
#define BOARD_TYPE "SAMD51 ADAFRUIT_TRELLIS_M4_EXPRESS"
83+
#elif defined(ADAFRUIT_PYPORTAL)
84+
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYPORTAL"
85+
#elif defined(ADAFRUIT_PYPORTAL_M4_TITANO)
86+
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYPORTAL_M4_TITANO"
87+
#elif defined(ADAFRUIT_PYBADGE_M4_EXPRESS)
88+
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYBADGE_M4_EXPRESS"
89+
#elif defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
90+
#define BOARD_TYPE "SAMD51 ADAFRUIT_METRO_M4_AIRLIFT_LITE"
91+
#elif defined(ADAFRUIT_PYGAMER_M4_EXPRESS)
92+
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYGAMER_M4_EXPRESS"
93+
#elif defined(ADAFRUIT_PYGAMER_ADVANCE_M4_EXPRESS)
94+
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYGAMER_ADVANCE_M4_EXPRESS"
95+
#elif defined(ADAFRUIT_PYBADGE_AIRLIFT_M4)
96+
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYBADGE_AIRLIFT_M4"
97+
#elif defined(ADAFRUIT_MONSTER_M4SK_EXPRESS)
98+
#define BOARD_TYPE "SAMD51 ADAFRUIT_MONSTER_M4SK_EXPRESS"
99+
#elif defined(ADAFRUIT_HALLOWING_M4_EXPRESS)
100+
#define BOARD_TYPE "SAMD51 ADAFRUIT_HALLOWING_M4_EXPRESS"
101+
#elif defined(SEEED_WIO_TERMINAL)
102+
#define BOARD_TYPE "SAMD SEEED_WIO_TERMINAL"
103+
#elif defined(SEEED_FEMTO_M0)
104+
#define BOARD_TYPE "SAMD SEEED_FEMTO_M0"
105+
#elif defined(SEEED_XIAO_M0)
106+
#define BOARD_TYPE "SAMD SEEED_XIAO_M0"
107+
#elif defined(Wio_Lite_MG126)
108+
#define BOARD_TYPE "SAMD SEEED Wio_Lite_MG126"
109+
#elif defined(WIO_GPS_BOARD)
110+
#define BOARD_TYPE "SAMD SEEED WIO_GPS_BOARD"
111+
#elif defined(SEEEDUINO_ZERO)
112+
#define BOARD_TYPE "SAMD SEEEDUINO_ZERO"
113+
#elif defined(SEEEDUINO_LORAWAN)
114+
#define BOARD_TYPE "SAMD SEEEDUINO_LORAWAN"
115+
#elif defined(SEEED_GROVE_UI_WIRELESS)
116+
#define BOARD_TYPE "SAMD SEEED_GROVE_UI_WIRELESS"
117+
#elif defined(__SAMD21E18A__)
118+
#define BOARD_TYPE "SAMD21E18A"
119+
#elif defined(__SAMD21G18A__)
120+
#define BOARD_TYPE "SAMD21G18A"
121+
#elif defined(__SAMD51G19A__)
122+
#define BOARD_TYPE "SAMD51G19A"
123+
#elif defined(__SAMD51J19A__)
124+
#define BOARD_TYPE "SAMD51J19A"
125+
#elif defined(__SAMD51J20A__)
126+
#define BOARD_TYPE "SAMD51J20A"
127+
#elif defined(__SAM3X8E__)
128+
#define BOARD_TYPE "SAM3X8E"
129+
#elif defined(__CPU_ARC__)
130+
#define BOARD_TYPE "CPU_ARC"
131+
#elif defined(__SAMD51__)
132+
#define BOARD_TYPE "SAMD51"
133+
#else
134+
#define BOARD_TYPE "SAMD Unknown"
135+
#endif
136136

137137
#endif
138138

@@ -143,7 +143,7 @@
143143
#define USE_WIFI101 true
144144

145145
#include <SPI.h>
146-
#include <WiFi101.h>
146+
#include <WiFi101_Generic.h>
147147
#include <driver/source/nmasic.h>
148148

149149
#define DEBUG_WEBSOCKETS_PORT Serial

0 commit comments

Comments
 (0)