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

Commit 702dd28

Browse files
authored
v3.5.0 to use Ethernet_Generic library, etc.
### Releases v3.5.0 1. Use new [Ethernet_Generic library](https://github.com/khoih-prog/Ethernet_Generic) as default for W5x00. 2. Rewrite to avoid `multiple-definitions` linker error for multiple-file project 3. Add example [multiFileProject_Ethernet](examples/Generic/Ethernet/multiFileProject_Ethernet) and [multiFileProject_WiFiNINA](examples/Generic/WiFiNINA/multiFileProject_WiFiNINA) to demo how to avoid `multiple-definitions` linker error for multiple-file project 4. Add support to SPI1 for RP2040 using [arduino-pico core](https://github.com/earlephilhower/arduino-pico) 5. Add support SPI2 for ESP32 6. Rewrite all the examples to support new features 7. Update `Packages' Patches`
1 parent 4f6f398 commit 702dd28

File tree

46 files changed

+1307
-939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1307
-939
lines changed

examples/ESP/PWM_LEDServer_ESP32/PWM_LEDServer_ESP32.ino

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ const int delayval = 10;
6161

6262
void onUpdateCallback(const char* oldIP, const char* newIP)
6363
{
64-
(void) oldIP;
65-
66-
Serial.print(F("DDNSGeneric - IP Change Detected: "));
64+
Serial.print(F("DDNSGeneric - IP Change Detected: oldIP = "));
65+
Serial.print(oldIP);
66+
Serial.print(F(", newIP = "));
6767
Serial.println(newIP);
6868
}
6969

@@ -80,7 +80,7 @@ void setPower(uint32_t percentage)
8080
ledcWrite(ledChannel, pwm_val);
8181
}
8282

83-
void fadeOn(void)
83+
void fadeOn()
8484
{
8585
#if LED_REVERSED
8686
for (int i = 100; i >= 0; i--)
@@ -93,7 +93,7 @@ void fadeOn(void)
9393
}
9494
}
9595

96-
void fadeOff(void)
96+
void fadeOff()
9797
{
9898
#if LED_REVERSED
9999
for (int i = 0; i < 100; i++)
@@ -106,7 +106,7 @@ void fadeOff(void)
106106
}
107107
}
108108

109-
void showLED(void)
109+
void showLED()
110110
{
111111
for (int i = 0; i < 2; i++)
112112
{
@@ -165,10 +165,10 @@ void handleNotFound()
165165
server.send(404, F("text/plain"), message);
166166
}
167167

168-
void setup(void)
168+
void setup()
169169
{
170170
Serial.begin(115200);
171-
while (!Serial);
171+
while (!Serial && millis() < 5000);
172172

173173
#if ( ARDUINO_ESP32S2_DEV || ARDUINO_FEATHERS2 || ARDUINO_ESP32S2_THING_PLUS || ARDUINO_MICROS2 || \
174174
ARDUINO_METRO_ESP32S2 || ARDUINO_MAGTAG29_ESP32S2 || ARDUINO_FUNHOUSE_ESP32S2 || \
@@ -288,7 +288,7 @@ void setup(void)
288288
Serial.println(WiFi.subnetMask());
289289
}
290290

291-
void loop(void)
291+
void loop()
292292
{
293293
//delay(100);
294294

examples/ESP/PWM_LEDServer_ESP8266/PWM_LEDServer_ESP8266.ino

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ const int delayval = 10;
5656

5757
void onUpdateCallback(const char* oldIP, const char* newIP)
5858
{
59-
(void) oldIP;
60-
61-
Serial.print(F("DDNSGeneric - IP Change Detected: "));
59+
Serial.print(F("DDNSGeneric - IP Change Detected: oldIP = "));
60+
Serial.print(oldIP);
61+
Serial.print(F(", newIP = "));
6262
Serial.println(newIP);
6363
}
6464

@@ -75,7 +75,7 @@ void setPower(uint32_t percentage)
7575
analogWrite(LED_PIN, pwm_val);
7676
}
7777

78-
void fadeOn(void)
78+
void fadeOn()
7979
{
8080
#if LED_REVERSED
8181
for (int i = 100; i >= 0; i--)
@@ -88,7 +88,7 @@ void fadeOn(void)
8888
}
8989
}
9090

91-
void fadeOff(void)
91+
void fadeOff()
9292
{
9393
#if LED_REVERSED
9494
for (int i = 0; i < 100; i++)
@@ -101,7 +101,7 @@ void fadeOff(void)
101101
}
102102
}
103103

104-
void showLED(void)
104+
void showLED()
105105
{
106106
for (int i = 0; i < 2; i++)
107107
{
@@ -160,10 +160,10 @@ void handleNotFound()
160160
server.send(404, F("text/plain"), message);
161161
}
162162

163-
void setup(void)
163+
void setup()
164164
{
165165
Serial.begin(115200);
166-
while (!Serial);
166+
while (!Serial && millis() < 5000);
167167

168168
Serial.print("\nStart PWM_LEDServer_ESP8266 on "); Serial.println(ARDUINO_BOARD);
169169
Serial.println(UPNP_GENERIC_VERSION);
@@ -269,7 +269,7 @@ void setup(void)
269269
Serial.println(WiFi.subnetMask());
270270
}
271271

272-
void loop(void)
272+
void loop()
273273
{
274274
//delay(100);
275275

examples/ESP/SimpleServerESP32/SimpleServerESP32.ino

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ const int led = 2; // LED_BUILTIN
5151

5252
void onUpdateCallback(const char* oldIP, const char* newIP)
5353
{
54-
(void) oldIP;
55-
56-
Serial.print(F("DDNSGeneric - IP Change Detected: "));
54+
Serial.print(F("DDNSGeneric - IP Change Detected: oldIP = "));
55+
Serial.print(oldIP);
56+
Serial.print(F(", newIP = "));
5757
Serial.println(newIP);
5858
}
5959

@@ -112,13 +112,13 @@ void handleNotFound()
112112
digitalWrite(led, 0);
113113
}
114114

115-
void setup(void)
115+
void setup()
116116
{
117117
pinMode(led, OUTPUT);
118118
digitalWrite(led, 0);
119119

120120
Serial.begin(115200);
121-
while (!Serial);
121+
while (!Serial && millis() < 5000);
122122

123123
#if ( ARDUINO_ESP32S2_DEV || ARDUINO_FEATHERS2 || ARDUINO_ESP32S2_THING_PLUS || ARDUINO_MICROS2 || \
124124
ARDUINO_METRO_ESP32S2 || ARDUINO_MAGTAG29_ESP32S2 || ARDUINO_FUNHOUSE_ESP32S2 || \
@@ -228,7 +228,7 @@ void setup(void)
228228
Serial.println(WiFi.subnetMask());
229229
}
230230

231-
void loop(void)
231+
void loop()
232232
{
233233
DDNSGeneric.update(555000);
234234

examples/ESP/SimpleServer_ESP8266/SimpleServer_ESP8266.ino

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ ESP8266WebServer server(LISTEN_PORT);
4848

4949
void onUpdateCallback(const char* oldIP, const char* newIP)
5050
{
51-
(void) oldIP;
52-
53-
Serial.print(F("DDNSGeneric - IP Change Detected: "));
51+
Serial.print(F("DDNSGeneric - IP Change Detected: oldIP = "));
52+
Serial.print(oldIP);
53+
Serial.print(F(", newIP = "));
5454
Serial.println(newIP);
5555
}
5656

@@ -109,13 +109,13 @@ void handleNotFound()
109109
digitalWrite(LED_BUILTIN, 0);
110110
}
111111

112-
void setup(void)
112+
void setup()
113113
{
114114
pinMode(LED_BUILTIN, OUTPUT);
115115
digitalWrite(LED_BUILTIN, 0);
116116

117117
Serial.begin(115200);
118-
while (!Serial);
118+
while (!Serial && millis() < 5000);
119119

120120
Serial.print("\nStart SimpleServerESP8266 on "); Serial.println(ARDUINO_BOARD);
121121
Serial.println(UPNP_GENERIC_VERSION);
@@ -217,7 +217,7 @@ void setup(void)
217217
Serial.println(WiFi.subnetMask());
218218
}
219219

220-
void loop(void)
220+
void loop()
221221
{
222222
DDNSGeneric.update(555000);
223223

examples/Generic/ESP_AT/SAMD/SAMD_PWM_LEDServer/SAMD_PWM_LEDServer.ino

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void setPower(uint32_t percentage)
6363
analogWrite(LED_PIN, pwm_val);
6464
}
6565

66-
void fadeOn(void)
66+
void fadeOn()
6767
{
6868
#if LED_REVERSED
6969
for (int i = 100; i >= 0; i--)
@@ -76,7 +76,7 @@ void fadeOn(void)
7676
}
7777
}
7878

79-
void fadeOff(void)
79+
void fadeOff()
8080
{
8181
#if LED_REVERSED
8282
for (int i = 0; i < 100; i++)
@@ -89,7 +89,7 @@ void fadeOff(void)
8989
}
9090
}
9191

92-
void showLED(void)
92+
void showLED()
9393
{
9494
for (int i = 0; i < 2; i++)
9595
{
@@ -149,10 +149,10 @@ void handleNotFound()
149149
server.send(404, F("text/plain"), message);
150150
}
151151

152-
void setup(void)
152+
void setup()
153153
{
154154
Serial.begin(115200);
155-
while (!Serial);
155+
while (!Serial && millis() < 5000);
156156

157157
Serial.print("\nStart SAMD_PWM_LEDServer on "); Serial.print(BOARD_NAME);
158158
Serial.print(" using "); Serial.println(SHIELD_TYPE);
@@ -273,7 +273,7 @@ void setup(void)
273273
Serial.println(LISTEN_PORT);
274274
}
275275

276-
void loop(void)
276+
void loop()
277277
{
278278
DDNSGeneric.update(555000);
279279

examples/Generic/ESP_AT/SAMD/SAMD_SimpleServer/SAMD_SimpleServer.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ void handleNotFound()
9999
digitalWrite(led, 0);
100100
}
101101

102-
void setup(void)
102+
void setup()
103103
{
104104
pinMode(led, OUTPUT);
105105
digitalWrite(led, 0);
106106

107107
Serial.begin(115200);
108-
while (!Serial);
108+
while (!Serial && millis() < 5000);
109109

110110
Serial.print("\nStart SAMD_SimpleServer on "); Serial.print(BOARD_NAME);
111111
Serial.print(" using "); Serial.println(SHIELD_TYPE);
@@ -223,7 +223,7 @@ void setup(void)
223223
Serial.println(LISTEN_PORT);
224224
}
225225

226-
void loop(void)
226+
void loop()
227227
{
228228
DDNSGeneric.update(555000);
229229

examples/Generic/ESP_AT/STM32/STM32_PWM_LEDServer/STM32_PWM_LEDServer.ino

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void setPower(uint32_t percentage)
6464
analogWrite(LED_PIN, pwm_val);
6565
}
6666

67-
void fadeOn(void)
67+
void fadeOn()
6868
{
6969
#if LED_REVERSED
7070
for (int i = 100; i >= 0; i--)
@@ -77,7 +77,7 @@ void fadeOn(void)
7777
}
7878
}
7979

80-
void fadeOff(void)
80+
void fadeOff()
8181
{
8282
#if LED_REVERSED
8383
for (int i = 0; i < 100; i++)
@@ -90,7 +90,7 @@ void fadeOff(void)
9090
}
9191
}
9292

93-
void showLED(void)
93+
void showLED()
9494
{
9595
for (int i = 0; i < 2; i++)
9696
{
@@ -150,10 +150,10 @@ void handleNotFound()
150150
server.send(404, F("text/plain"), message);
151151
}
152152

153-
void setup(void)
153+
void setup()
154154
{
155155
Serial.begin(115200);
156-
while (!Serial);
156+
while (!Serial && millis() < 5000);
157157

158158
Serial.print("\nStart STM32_PWM_LEDServer on "); Serial.print(BOARD_NAME);
159159
Serial.print(" using "); Serial.println(SHIELD_TYPE);
@@ -274,7 +274,7 @@ void setup(void)
274274
Serial.println(LISTEN_PORT);
275275
}
276276

277-
void loop(void)
277+
void loop()
278278
{
279279
DDNSGeneric.update(300000);
280280

examples/Generic/ESP_AT/STM32/STM32_SimpleServer/STM32_SimpleServer.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ void handleNotFound()
100100
digitalWrite(led, 0);
101101
}
102102

103-
void setup(void)
103+
void setup()
104104
{
105105
pinMode(led, OUTPUT);
106106
digitalWrite(led, 0);
107107

108108
Serial.begin(115200);
109-
while (!Serial);
109+
while (!Serial && millis() < 5000);
110110

111111
Serial.print("\nStart STM32_SimpleServer on "); Serial.print(BOARD_NAME);
112112
Serial.print(" using "); Serial.println(SHIELD_TYPE);
@@ -229,7 +229,7 @@ void setup(void)
229229
}
230230
}
231231

232-
void loop(void)
232+
void loop()
233233
{
234234
DDNSGeneric.update(555000);
235235

examples/Generic/ESP_AT/nRF52/nRF52_PWM_LEDServer/nRF52_PWM_LEDServer.ino

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void setPower(uint32_t percentage)
6767
analogWrite(LED_PIN, pwm_val);
6868
}
6969

70-
void fadeOn(void)
70+
void fadeOn()
7171
{
7272
#if LED_REVERSED
7373
for (int i = 100; i >= 0; i--)
@@ -80,7 +80,7 @@ void fadeOn(void)
8080
}
8181
}
8282

83-
void fadeOff(void)
83+
void fadeOff()
8484
{
8585
#if LED_REVERSED
8686
for (int i = 0; i < 100; i++)
@@ -93,7 +93,7 @@ void fadeOff(void)
9393
}
9494
}
9595

96-
void showLED(void)
96+
void showLED()
9797
{
9898
for (int i = 0; i < 2; i++)
9999
{
@@ -153,10 +153,10 @@ void handleNotFound()
153153
server.send(404, F("text/plain"), message);
154154
}
155155

156-
void setup(void)
156+
void setup()
157157
{
158158
Serial.begin(115200);
159-
while (!Serial);
159+
while (!Serial && millis() < 5000);
160160

161161
Serial.print("\nStart nRF52_PWM_LEDServer on "); Serial.print(BOARD_NAME);
162162
Serial.print(" using "); Serial.println(SHIELD_TYPE);
@@ -277,7 +277,7 @@ void setup(void)
277277
Serial.println(LISTEN_PORT);
278278
}
279279

280-
void loop(void)
280+
void loop()
281281
{
282282
DDNSGeneric.update(555000);
283283

0 commit comments

Comments
 (0)