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

Commit f078993

Browse files
khoih-progkhoih-prog
authored
v1.4.0 to use Ethernet_Generic library
### Releases v1.4.0 1. Use new [Ethernet_Generic library](https://github.com/khoih-prog/Ethernet_Generic) as default for W5x00. 2. Rewrite all the examples to support new features 3. Add example [multiFileProject](examples/multiFileProject) to demo how to avoid `multiple-definitions` linker error for multiple-file project
1 parent 86e3279 commit f078993

File tree

33 files changed

+461
-619
lines changed

33 files changed

+461
-619
lines changed

‎examples/STM32_LAN8720/AdvancedWebServer_LAN8720/AdvancedWebServer_LAN8720.ino‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@ void setup()
179179
// Use Static IP
180180
//Ethernet.begin(mac[index], ip);
181181
Ethernet.begin(mac[index]);
182+
183+
Serial.print(F("Connected! IP address: "));
184+
Serial.println(Ethernet.localIP());
182185

183186
server.on("/", handleRoot);
184187
server.on("/test.svg", drawGraph);

‎examples/STM32_LAN8720/AdvancedWebServer_LAN8720/defines.h‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,13 @@
4343

4444
#if !(USE_BUILTIN_ETHERNET || USE_UIP_ETHERNET)
4545
// Only one if the following to be true
46-
#define USE_ETHERNET false //true
47-
#define USE_ETHERNET2 false //true
48-
#define USE_ETHERNET3 false //true
49-
#define USE_ETHERNET_LARGE false
50-
#define USE_ETHERNET_ESP8266 false //true
51-
#define USE_ETHERNET_ENC true
46+
#define USE_ETHERNET_GENERIC true
47+
#define USE_ETHERNET_ESP8266 false
48+
#define USE_ETHERNET_ENC false
5249
#define USE_CUSTOM_ETHERNET false
5350
#endif
5451

55-
#if ( USE_ETHERNET2 || USE_ETHERNET3 || USE_ETHERNET_LARGE || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
52+
#if ( USE_ETHERNET_GENERIC || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
5653
#ifdef USE_CUSTOM_ETHERNET
5754
#undef USE_CUSTOM_ETHERNET
5855
#endif
@@ -70,18 +67,15 @@
7067
#elif (USE_UIP_ETHERNET)
7168
#warning Using ENC28J60 & UIPEthernet lib
7269
#define SHIELD_TYPE "ENC28J60 & UIPEthernet Library"
73-
#elif USE_ETHERNET3
74-
#include "Ethernet3.h"
75-
#warning Using W5x00 & Ethernet3 lib
76-
#define SHIELD_TYPE "W5x00 & Ethernet3 Library"
77-
#elif USE_ETHERNET2
78-
#include "Ethernet2.h"
79-
#warning Using W5x00 & Ethernet2 lib
80-
#define SHIELD_TYPE "W5x00 & Ethernet2 Library"
81-
#elif USE_ETHERNET_LARGE
82-
#include "EthernetLarge.h"
83-
#warning Using W5x00 & EthernetLarge lib
84-
#define SHIELD_TYPE "W5x00 & EthernetLarge Library"
70+
#elif USE_ETHERNET_GENERIC
71+
#include "Ethernet_Generic.h"
72+
73+
#define ETHERNET_LARGE_BUFFERS
74+
75+
#define _ETG_LOGLEVEL_ 1
76+
77+
#warning Using W5x00 & Ethernet_Generic lib
78+
#define SHIELD_TYPE "W5x00 using Ethernet_Generic Library"
8579
#elif USE_ETHERNET_ESP8266
8680
#include "Ethernet_ESP8266.h"
8781
#warning Using W5x00 & Ethernet_ESP8266 lib
@@ -96,10 +90,10 @@
9690
#warning Using Custom Ethernet library. You must include a library and initialize.
9791
#define SHIELD_TYPE "Custom Ethernet & Ethernet_XYZ Library"
9892
#else
99-
#define USE_ETHERNET true
100-
#include "Ethernet.h"
101-
#warning Using Ethernet lib
102-
#define SHIELD_TYPE "W5x00 & Ethernet Library"
93+
#define USE_ETHERNET_GENERIC true
94+
#include "Ethernet_Generic.h"
95+
#warning Using default Ethernet_Generic lib
96+
#define SHIELD_TYPE "W5x00 using default Ethernet_Generic Library"
10397
#endif
10498

10599
#if defined(STM32F0)

‎examples/STM32_LAN8720/HTTPClient_LAN8720/BasicAuthGet_LAN8720/defines.h‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,13 @@
4343

4444
#if !(USE_BUILTIN_ETHERNET || USE_UIP_ETHERNET)
4545
// Only one if the following to be true
46-
#define USE_ETHERNET false //true
47-
#define USE_ETHERNET2 false //true
48-
#define USE_ETHERNET3 false //true
49-
#define USE_ETHERNET_LARGE false
50-
#define USE_ETHERNET_ESP8266 false //true
51-
#define USE_ETHERNET_ENC true
46+
#define USE_ETHERNET_GENERIC true
47+
#define USE_ETHERNET_ESP8266 false
48+
#define USE_ETHERNET_ENC false
5249
#define USE_CUSTOM_ETHERNET false
5350
#endif
5451

55-
#if ( USE_ETHERNET2 || USE_ETHERNET3 || USE_ETHERNET_LARGE || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
52+
#if ( USE_ETHERNET_GENERIC || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
5653
#ifdef USE_CUSTOM_ETHERNET
5754
#undef USE_CUSTOM_ETHERNET
5855
#endif
@@ -70,18 +67,15 @@
7067
#elif (USE_UIP_ETHERNET)
7168
#warning Using ENC28J60 & UIPEthernet lib
7269
#define SHIELD_TYPE "ENC28J60 & UIPEthernet Library"
73-
#elif USE_ETHERNET3
74-
#include "Ethernet3.h"
75-
#warning Using W5x00 & Ethernet3 lib
76-
#define SHIELD_TYPE "W5x00 & Ethernet3 Library"
77-
#elif USE_ETHERNET2
78-
#include "Ethernet2.h"
79-
#warning Using W5x00 & Ethernet2 lib
80-
#define SHIELD_TYPE "W5x00 & Ethernet2 Library"
81-
#elif USE_ETHERNET_LARGE
82-
#include "EthernetLarge.h"
83-
#warning Using W5x00 & EthernetLarge lib
84-
#define SHIELD_TYPE "W5x00 & EthernetLarge Library"
70+
#elif USE_ETHERNET_GENERIC
71+
#include "Ethernet_Generic.h"
72+
73+
#define ETHERNET_LARGE_BUFFERS
74+
75+
#define _ETG_LOGLEVEL_ 1
76+
77+
#warning Using W5x00 & Ethernet_Generic lib
78+
#define SHIELD_TYPE "W5x00 using Ethernet_Generic Library"
8579
#elif USE_ETHERNET_ESP8266
8680
#include "Ethernet_ESP8266.h"
8781
#warning Using W5x00 & Ethernet_ESP8266 lib
@@ -96,10 +90,10 @@
9690
#warning Using Custom Ethernet library. You must include a library and initialize.
9791
#define SHIELD_TYPE "Custom Ethernet & Ethernet_XYZ Library"
9892
#else
99-
#define USE_ETHERNET true
100-
#include "Ethernet.h"
101-
#warning Using Ethernet lib
102-
#define SHIELD_TYPE "W5x00 & Ethernet Library"
93+
#define USE_ETHERNET_GENERIC true
94+
#include "Ethernet_Generic.h"
95+
#warning Using default Ethernet_Generic lib
96+
#define SHIELD_TYPE "W5x00 using default Ethernet_Generic Library"
10397
#endif
10498

10599
#if defined(STM32F0)

‎examples/STM32_LAN8720/HTTPClient_LAN8720/CustomHeader_LAN8720/defines.h‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,13 @@
4343

4444
#if !(USE_BUILTIN_ETHERNET || USE_UIP_ETHERNET)
4545
// Only one if the following to be true
46-
#define USE_ETHERNET false //true
47-
#define USE_ETHERNET2 false //true
48-
#define USE_ETHERNET3 false //true
49-
#define USE_ETHERNET_LARGE false
50-
#define USE_ETHERNET_ESP8266 false //true
51-
#define USE_ETHERNET_ENC true
46+
#define USE_ETHERNET_GENERIC true
47+
#define USE_ETHERNET_ESP8266 false
48+
#define USE_ETHERNET_ENC false
5249
#define USE_CUSTOM_ETHERNET false
5350
#endif
5451

55-
#if ( USE_ETHERNET2 || USE_ETHERNET3 || USE_ETHERNET_LARGE || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
52+
#if ( USE_ETHERNET_GENERIC || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
5653
#ifdef USE_CUSTOM_ETHERNET
5754
#undef USE_CUSTOM_ETHERNET
5855
#endif
@@ -70,18 +67,15 @@
7067
#elif (USE_UIP_ETHERNET)
7168
#warning Using ENC28J60 & UIPEthernet lib
7269
#define SHIELD_TYPE "ENC28J60 & UIPEthernet Library"
73-
#elif USE_ETHERNET3
74-
#include "Ethernet3.h"
75-
#warning Using W5x00 & Ethernet3 lib
76-
#define SHIELD_TYPE "W5x00 & Ethernet3 Library"
77-
#elif USE_ETHERNET2
78-
#include "Ethernet2.h"
79-
#warning Using W5x00 & Ethernet2 lib
80-
#define SHIELD_TYPE "W5x00 & Ethernet2 Library"
81-
#elif USE_ETHERNET_LARGE
82-
#include "EthernetLarge.h"
83-
#warning Using W5x00 & EthernetLarge lib
84-
#define SHIELD_TYPE "W5x00 & EthernetLarge Library"
70+
#elif USE_ETHERNET_GENERIC
71+
#include "Ethernet_Generic.h"
72+
73+
#define ETHERNET_LARGE_BUFFERS
74+
75+
#define _ETG_LOGLEVEL_ 1
76+
77+
#warning Using W5x00 & Ethernet_Generic lib
78+
#define SHIELD_TYPE "W5x00 using Ethernet_Generic Library"
8579
#elif USE_ETHERNET_ESP8266
8680
#include "Ethernet_ESP8266.h"
8781
#warning Using W5x00 & Ethernet_ESP8266 lib
@@ -96,10 +90,10 @@
9690
#warning Using Custom Ethernet library. You must include a library and initialize.
9791
#define SHIELD_TYPE "Custom Ethernet & Ethernet_XYZ Library"
9892
#else
99-
#define USE_ETHERNET true
100-
#include "Ethernet.h"
101-
#warning Using Ethernet lib
102-
#define SHIELD_TYPE "W5x00 & Ethernet Library"
93+
#define USE_ETHERNET_GENERIC true
94+
#include "Ethernet_Generic.h"
95+
#warning Using default Ethernet_Generic lib
96+
#define SHIELD_TYPE "W5x00 using default Ethernet_Generic Library"
10397
#endif
10498

10599
#if defined(STM32F0)

‎examples/STM32_LAN8720/HTTPClient_LAN8720/DweetGet_LAN8720/defines.h‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,13 @@
4343

4444
#if !(USE_BUILTIN_ETHERNET || USE_UIP_ETHERNET)
4545
// Only one if the following to be true
46-
#define USE_ETHERNET false //true
47-
#define USE_ETHERNET2 false //true
48-
#define USE_ETHERNET3 false //true
49-
#define USE_ETHERNET_LARGE false
50-
#define USE_ETHERNET_ESP8266 false //true
51-
#define USE_ETHERNET_ENC true
46+
#define USE_ETHERNET_GENERIC true
47+
#define USE_ETHERNET_ESP8266 false
48+
#define USE_ETHERNET_ENC false
5249
#define USE_CUSTOM_ETHERNET false
5350
#endif
5451

55-
#if ( USE_ETHERNET2 || USE_ETHERNET3 || USE_ETHERNET_LARGE || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
52+
#if ( USE_ETHERNET_GENERIC || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
5653
#ifdef USE_CUSTOM_ETHERNET
5754
#undef USE_CUSTOM_ETHERNET
5855
#endif
@@ -70,18 +67,15 @@
7067
#elif (USE_UIP_ETHERNET)
7168
#warning Using ENC28J60 & UIPEthernet lib
7269
#define SHIELD_TYPE "ENC28J60 & UIPEthernet Library"
73-
#elif USE_ETHERNET3
74-
#include "Ethernet3.h"
75-
#warning Using W5x00 & Ethernet3 lib
76-
#define SHIELD_TYPE "W5x00 & Ethernet3 Library"
77-
#elif USE_ETHERNET2
78-
#include "Ethernet2.h"
79-
#warning Using W5x00 & Ethernet2 lib
80-
#define SHIELD_TYPE "W5x00 & Ethernet2 Library"
81-
#elif USE_ETHERNET_LARGE
82-
#include "EthernetLarge.h"
83-
#warning Using W5x00 & EthernetLarge lib
84-
#define SHIELD_TYPE "W5x00 & EthernetLarge Library"
70+
#elif USE_ETHERNET_GENERIC
71+
#include "Ethernet_Generic.h"
72+
73+
#define ETHERNET_LARGE_BUFFERS
74+
75+
#define _ETG_LOGLEVEL_ 1
76+
77+
#warning Using W5x00 & Ethernet_Generic lib
78+
#define SHIELD_TYPE "W5x00 using Ethernet_Generic Library"
8579
#elif USE_ETHERNET_ESP8266
8680
#include "Ethernet_ESP8266.h"
8781
#warning Using W5x00 & Ethernet_ESP8266 lib
@@ -96,10 +90,10 @@
9690
#warning Using Custom Ethernet library. You must include a library and initialize.
9791
#define SHIELD_TYPE "Custom Ethernet & Ethernet_XYZ Library"
9892
#else
99-
#define USE_ETHERNET true
100-
#include "Ethernet.h"
101-
#warning Using Ethernet lib
102-
#define SHIELD_TYPE "W5x00 & Ethernet Library"
93+
#define USE_ETHERNET_GENERIC true
94+
#include "Ethernet_Generic.h"
95+
#warning Using default Ethernet_Generic lib
96+
#define SHIELD_TYPE "W5x00 using default Ethernet_Generic Library"
10397
#endif
10498

10599
#if defined(STM32F0)

‎examples/STM32_LAN8720/HTTPClient_LAN8720/DweetPost_LAN8720/defines.h‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,13 @@
4343

4444
#if !(USE_BUILTIN_ETHERNET || USE_UIP_ETHERNET)
4545
// Only one if the following to be true
46-
#define USE_ETHERNET false //true
47-
#define USE_ETHERNET2 false //true
48-
#define USE_ETHERNET3 false //true
49-
#define USE_ETHERNET_LARGE false
50-
#define USE_ETHERNET_ESP8266 false //true
51-
#define USE_ETHERNET_ENC true
46+
#define USE_ETHERNET_GENERIC true
47+
#define USE_ETHERNET_ESP8266 false
48+
#define USE_ETHERNET_ENC false
5249
#define USE_CUSTOM_ETHERNET false
5350
#endif
5451

55-
#if ( USE_ETHERNET2 || USE_ETHERNET3 || USE_ETHERNET_LARGE || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
52+
#if ( USE_ETHERNET_GENERIC || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
5653
#ifdef USE_CUSTOM_ETHERNET
5754
#undef USE_CUSTOM_ETHERNET
5855
#endif
@@ -70,18 +67,15 @@
7067
#elif (USE_UIP_ETHERNET)
7168
#warning Using ENC28J60 & UIPEthernet lib
7269
#define SHIELD_TYPE "ENC28J60 & UIPEthernet Library"
73-
#elif USE_ETHERNET3
74-
#include "Ethernet3.h"
75-
#warning Using W5x00 & Ethernet3 lib
76-
#define SHIELD_TYPE "W5x00 & Ethernet3 Library"
77-
#elif USE_ETHERNET2
78-
#include "Ethernet2.h"
79-
#warning Using W5x00 & Ethernet2 lib
80-
#define SHIELD_TYPE "W5x00 & Ethernet2 Library"
81-
#elif USE_ETHERNET_LARGE
82-
#include "EthernetLarge.h"
83-
#warning Using W5x00 & EthernetLarge lib
84-
#define SHIELD_TYPE "W5x00 & EthernetLarge Library"
70+
#elif USE_ETHERNET_GENERIC
71+
#include "Ethernet_Generic.h"
72+
73+
#define ETHERNET_LARGE_BUFFERS
74+
75+
#define _ETG_LOGLEVEL_ 1
76+
77+
#warning Using W5x00 & Ethernet_Generic lib
78+
#define SHIELD_TYPE "W5x00 using Ethernet_Generic Library"
8579
#elif USE_ETHERNET_ESP8266
8680
#include "Ethernet_ESP8266.h"
8781
#warning Using W5x00 & Ethernet_ESP8266 lib
@@ -96,10 +90,10 @@
9690
#warning Using Custom Ethernet library. You must include a library and initialize.
9791
#define SHIELD_TYPE "Custom Ethernet & Ethernet_XYZ Library"
9892
#else
99-
#define USE_ETHERNET true
100-
#include "Ethernet.h"
101-
#warning Using Ethernet lib
102-
#define SHIELD_TYPE "W5x00 & Ethernet Library"
93+
#define USE_ETHERNET_GENERIC true
94+
#include "Ethernet_Generic.h"
95+
#warning Using default Ethernet_Generic lib
96+
#define SHIELD_TYPE "W5x00 using default Ethernet_Generic Library"
10397
#endif
10498

10599
#if defined(STM32F0)

‎examples/STM32_LAN8720/HTTPClient_LAN8720/HueBlink_LAN8720/defines.h‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,13 @@
4343

4444
#if !(USE_BUILTIN_ETHERNET || USE_UIP_ETHERNET)
4545
// Only one if the following to be true
46-
#define USE_ETHERNET false //true
47-
#define USE_ETHERNET2 false //true
48-
#define USE_ETHERNET3 false //true
49-
#define USE_ETHERNET_LARGE false
50-
#define USE_ETHERNET_ESP8266 false //true
51-
#define USE_ETHERNET_ENC true
46+
#define USE_ETHERNET_GENERIC true
47+
#define USE_ETHERNET_ESP8266 false
48+
#define USE_ETHERNET_ENC false
5249
#define USE_CUSTOM_ETHERNET false
5350
#endif
5451

55-
#if ( USE_ETHERNET2 || USE_ETHERNET3 || USE_ETHERNET_LARGE || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
52+
#if ( USE_ETHERNET_GENERIC || USE_ETHERNET_ESP8266 || USE_ETHERNET_ENC )
5653
#ifdef USE_CUSTOM_ETHERNET
5754
#undef USE_CUSTOM_ETHERNET
5855
#endif
@@ -70,18 +67,15 @@
7067
#elif (USE_UIP_ETHERNET)
7168
#warning Using ENC28J60 & UIPEthernet lib
7269
#define SHIELD_TYPE "ENC28J60 & UIPEthernet Library"
73-
#elif USE_ETHERNET3
74-
#include "Ethernet3.h"
75-
#warning Using W5x00 & Ethernet3 lib
76-
#define SHIELD_TYPE "W5x00 & Ethernet3 Library"
77-
#elif USE_ETHERNET2
78-
#include "Ethernet2.h"
79-
#warning Using W5x00 & Ethernet2 lib
80-
#define SHIELD_TYPE "W5x00 & Ethernet2 Library"
81-
#elif USE_ETHERNET_LARGE
82-
#include "EthernetLarge.h"
83-
#warning Using W5x00 & EthernetLarge lib
84-
#define SHIELD_TYPE "W5x00 & EthernetLarge Library"
70+
#elif USE_ETHERNET_GENERIC
71+
#include "Ethernet_Generic.h"
72+
73+
#define ETHERNET_LARGE_BUFFERS
74+
75+
#define _ETG_LOGLEVEL_ 1
76+
77+
#warning Using W5x00 & Ethernet_Generic lib
78+
#define SHIELD_TYPE "W5x00 using Ethernet_Generic Library"
8579
#elif USE_ETHERNET_ESP8266
8680
#include "Ethernet_ESP8266.h"
8781
#warning Using W5x00 & Ethernet_ESP8266 lib
@@ -96,10 +90,10 @@
9690
#warning Using Custom Ethernet library. You must include a library and initialize.
9791
#define SHIELD_TYPE "Custom Ethernet & Ethernet_XYZ Library"
9892
#else
99-
#define USE_ETHERNET true
100-
#include "Ethernet.h"
101-
#warning Using Ethernet lib
102-
#define SHIELD_TYPE "W5x00 & Ethernet Library"
93+
#define USE_ETHERNET_GENERIC true
94+
#include "Ethernet_Generic.h"
95+
#warning Using default Ethernet_Generic lib
96+
#define SHIELD_TYPE "W5x00 using default Ethernet_Generic Library"
10397
#endif
10498

10599
#if defined(STM32F0)

0 commit comments

Comments
 (0)