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

Commit 7d4d3f4

Browse files
khoih-progkhoih-prog
authored
Merge branch 'master' into serveStatic_dev2
2 parents f8ee7fa + aedfd65 commit 7d4d3f4

File tree

7 files changed

+1030
-360
lines changed

7 files changed

+1030
-360
lines changed

‎examples/serveStatic/defines.h‎

Lines changed: 44 additions & 213 deletions
Original file line numberDiff line numberDiff line change
@@ -10,243 +10,74 @@
1010
#ifndef defines_h
1111
#define defines_h
1212

13+
#if !(ESP8266 || ESP32)
14+
#error This code is intended to run on the ESP8266/ESP32 platform! Please check your Tools->Board setting.
15+
#endif
16+
1317
#define DEBUG_ETHERNET_WEBSERVER_PORT Serial
1418

1519
// Debug Level from 0 to 4
1620
#define _ETHERNET_WEBSERVER_LOGLEVEL_ 3
1721

18-
#if ( defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_MKRWIFI1010) \
19-
|| defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRFox1200) || defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310) \
20-
|| defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRNB1500) || defined(ARDUINO_SAMD_MKRVIDOR4000) || defined(__SAMD21G18A__) \
21-
|| defined(ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS) || defined(__SAMD21E18A__) || defined(__SAMD51__) || defined(__SAMD51J20A__) || defined(__SAMD51J19A__) \
22-
|| defined(__SAMD51G19A__) || defined(__SAMD51P19A__) || defined(__SAMD21G18A__) )
23-
#if defined(ETHERNET_USE_SAMD)
24-
#undef ETHERNET_USE_SAMD
25-
#endif
26-
#define ETHERNET_USE_SAMD true
27-
#endif
22+
#define USE_LITTLEFS true
23+
#define USE_SPIFFS false
2824

29-
#if ( defined(NRF52840_FEATHER) || defined(NRF52832_FEATHER) || defined(NRF52_SERIES) || defined(ARDUINO_NRF52_ADAFRUIT) || \
30-
defined(NRF52840_FEATHER_SENSE) || defined(NRF52840_ITSYBITSY) || defined(NRF52840_CIRCUITPLAY) || defined(NRF52840_CLUE) || \
31-
defined(NRF52840_METRO) || defined(NRF52840_PCA10056) || defined(PARTICLE_XENON) || defined(NINA_B302_ublox) || defined(NINA_B112_ublox) )
32-
#if defined(ETHERNET_USE_NRF528XX)
33-
#undef ETHERNET_USE_NRF528XX
34-
#endif
35-
#define ETHERNET_USE_NRF528XX true
36-
#endif
25+
#if ( defined(ESP8266) )
3726

38-
#if ( defined(ARDUINO_SAM_DUE) || defined(__SAM3X8E__) )
39-
#if defined(ETHERNET_USE_SAM_DUE)
40-
#undef ETHERNET_USE_SAM_DUE
41-
#endif
42-
#define ETHERNET_USE_SAM_DUE true
43-
#endif
44-
45-
#if defined(ETHERNET_USE_SAMD)
46-
// For SAMD
47-
// Default pin 10 to SS/CS
48-
#define USE_THIS_SS_PIN 10
49-
50-
#if ( defined(ARDUINO_SAMD_ZERO) && !defined(SEEED_XIAO_M0) )
51-
#define BOARD_TYPE "SAMD Zero"
52-
#elif defined(ARDUINO_SAMD_MKR1000)
53-
#define BOARD_TYPE "SAMD MKR1000"
54-
#elif defined(ARDUINO_SAMD_MKRWIFI1010)
55-
#define BOARD_TYPE "SAMD MKRWIFI1010"
56-
#elif defined(ARDUINO_SAMD_NANO_33_IOT)
57-
#define BOARD_TYPE "SAMD NANO_33_IOT"
58-
#elif defined(ARDUINO_SAMD_MKRFox1200)
59-
#define BOARD_TYPE "SAMD MKRFox1200"
60-
#elif ( defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310) )
61-
#define BOARD_TYPE "SAMD MKRWAN13X0"
62-
#elif defined(ARDUINO_SAMD_MKRGSM1400)
63-
#define BOARD_TYPE "SAMD MKRGSM1400"
64-
#elif defined(ARDUINO_SAMD_MKRNB1500)
65-
#define BOARD_TYPE "SAMD MKRNB1500"
66-
#elif defined(ARDUINO_SAMD_MKRVIDOR4000)
67-
#define BOARD_TYPE "SAMD MKRVIDOR4000"
68-
#elif defined(ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS)
69-
#define BOARD_TYPE "SAMD ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS"
70-
#elif defined(ADAFRUIT_FEATHER_M0_EXPRESS)
71-
#define BOARD_TYPE "SAMD21 ADAFRUIT_FEATHER_M0_EXPRESS"
72-
#elif defined(ADAFRUIT_METRO_M0_EXPRESS)
73-
#define BOARD_TYPE "SAMD21 ADAFRUIT_METRO_M0_EXPRESS"
74-
#elif defined(ADAFRUIT_CIRCUITPLAYGROUND_M0)
75-
#define BOARD_TYPE "SAMD21 ADAFRUIT_CIRCUITPLAYGROUND_M0"
76-
#elif defined(ADAFRUIT_GEMMA_M0)
77-
#define BOARD_TYPE "SAMD21 ADAFRUIT_GEMMA_M0"
78-
#elif defined(ADAFRUIT_TRINKET_M0)
79-
#define BOARD_TYPE "SAMD21 ADAFRUIT_TRINKET_M0"
80-
#elif defined(ADAFRUIT_ITSYBITSY_M0)
81-
#define BOARD_TYPE "SAMD21 ADAFRUIT_ITSYBITSY_M0"
82-
#elif defined(ARDUINO_SAMD_HALLOWING_M0)
83-
#define BOARD_TYPE "SAMD21 ARDUINO_SAMD_HALLOWING_M0"
84-
#elif defined(ADAFRUIT_METRO_M4_EXPRESS)
85-
#define BOARD_TYPE "SAMD51 ADAFRUIT_METRO_M4_EXPRESS"
86-
#elif defined(ADAFRUIT_GRAND_CENTRAL_M4)
87-
#define BOARD_TYPE "SAMD51 ADAFRUIT_GRAND_CENTRAL_M4"
88-
#elif defined(ADAFRUIT_FEATHER_M4_EXPRESS)
89-
#define BOARD_TYPE "SAMD51 ADAFRUIT_FEATHER_M4_EXPRESS"
90-
#elif defined(ADAFRUIT_ITSYBITSY_M4_EXPRESS)
91-
#define BOARD_TYPE "SAMD51 ADAFRUIT_ITSYBITSY_M4_EXPRESS"
92-
#define USE_THIS_SS_PIN 10
93-
#elif defined(ADAFRUIT_TRELLIS_M4_EXPRESS)
94-
#define BOARD_TYPE "SAMD51 ADAFRUIT_TRELLIS_M4_EXPRESS"
95-
#elif defined(ADAFRUIT_PYPORTAL)
96-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYPORTAL"
97-
#elif defined(ADAFRUIT_PYPORTAL_M4_TITANO)
98-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYPORTAL_M4_TITANO"
99-
#elif defined(ADAFRUIT_PYBADGE_M4_EXPRESS)
100-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYBADGE_M4_EXPRESS"
101-
#elif defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
102-
#define BOARD_TYPE "SAMD51 ADAFRUIT_METRO_M4_AIRLIFT_LITE"
103-
#elif defined(ADAFRUIT_PYGAMER_M4_EXPRESS)
104-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYGAMER_M4_EXPRESS"
105-
#elif defined(ADAFRUIT_PYGAMER_ADVANCE_M4_EXPRESS)
106-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYGAMER_ADVANCE_M4_EXPRESS"
107-
#elif defined(ADAFRUIT_PYBADGE_AIRLIFT_M4)
108-
#define BOARD_TYPE "SAMD51 ADAFRUIT_PYBADGE_AIRLIFT_M4"
109-
#elif defined(ADAFRUIT_MONSTER_M4SK_EXPRESS)
110-
#define BOARD_TYPE "SAMD51 ADAFRUIT_MONSTER_M4SK_EXPRESS"
111-
#elif defined(ADAFRUIT_HALLOWING_M4_EXPRESS)
112-
#define BOARD_TYPE "SAMD51 ADAFRUIT_HALLOWING_M4_EXPRESS"
113-
#elif defined(SEEED_WIO_TERMINAL)
114-
#define BOARD_TYPE "SAMD SEEED_WIO_TERMINAL"
115-
#elif defined(SEEED_FEMTO_M0)
116-
#define BOARD_TYPE "SAMD SEEED_FEMTO_M0"
117-
#elif defined(SEEED_XIAO_M0)
118-
#define BOARD_TYPE "SAMD SEEED_XIAO_M0"
119-
#ifdef USE_THIS_SS_PIN
120-
#undef USE_THIS_SS_PIN
27+
#if USE_LITTLEFS
28+
#include <LittleFS.h>
29+
//LittleFS has higher priority
30+
#define CurrentFileFS "LittleFS"
31+
FS* filesystem = &LittleFS;
32+
#define FileFS LittleFS
33+
#ifdef USE_SPIFFS
34+
#undef USE_SPIFFS
12135
#endif
122-
#define USE_THIS_SS_PIN A1
123-
#warning define SEEED_XIAO_M0 USE_THIS_SS_PIN == A1
124-
#elif defined(Wio_Lite_MG126)
125-
#define BOARD_TYPE "SAMD SEEED Wio_Lite_MG126"
126-
#elif defined(WIO_GPS_BOARD)
127-
#define BOARD_TYPE "SAMD SEEED WIO_GPS_BOARD"
128-
#elif defined(SEEEDUINO_ZERO)
129-
#define BOARD_TYPE "SAMD SEEEDUINO_ZERO"
130-
#elif defined(SEEEDUINO_LORAWAN)
131-
#define BOARD_TYPE "SAMD SEEEDUINO_LORAWAN"
132-
#elif defined(SEEED_GROVE_UI_WIRELESS)
133-
#define BOARD_TYPE "SAMD SEEED_GROVE_UI_WIRELESS"
134-
#elif defined(__SAMD21E18A__)
135-
#define BOARD_TYPE "SAMD21E18A"
136-
#elif defined(__SAMD21G18A__)
137-
#define BOARD_TYPE "SAMD21G18A"
138-
#elif defined(__SAMD51G19A__)
139-
#define BOARD_TYPE "SAMD51G19A"
140-
#elif defined(__SAMD51J19A__)
141-
#define BOARD_TYPE "SAMD51J19A"
142-
#elif defined(__SAMD51J20A__)
143-
#define BOARD_TYPE "SAMD51J20A"
144-
#elif defined(__SAM3X8E__)
145-
#define BOARD_TYPE "SAM3X8E"
146-
#elif defined(__CPU_ARC__)
147-
#define BOARD_TYPE "CPU_ARC"
148-
#elif defined(__SAMD51__)
149-
#define BOARD_TYPE "SAMD51"
150-
#else
151-
#define BOARD_TYPE "SAMD Unknown"
152-
#endif
153-
154-
#elif (ETHERNET_USE_SAM_DUE)
155-
// Default pin 10 to SS/CS
156-
#define USE_THIS_SS_PIN 10
157-
#define BOARD_TYPE "SAM DUE"
158-
159-
#elif (ETHERNET_USE_NRF528XX)
160-
// Default pin 10 to SS/CS
161-
#define USE_THIS_SS_PIN 10
162-
163-
#if defined(NRF52840_FEATHER)
164-
#define BOARD_TYPE "NRF52840_FEATHER"
165-
#elif defined(NRF52832_FEATHER)
166-
#define BOARD_TYPE "NRF52832_FEATHER"
167-
#elif defined(NRF52840_FEATHER_SENSE)
168-
#define BOARD_TYPE "NRF52840_FEATHER_SENSE"
169-
#elif defined(NRF52840_ITSYBITSY)
170-
#define BOARD_TYPE "NRF52840_ITSYBITSY"
171-
#define USE_THIS_SS_PIN 10 // For other boards
172-
#elif defined(NRF52840_CIRCUITPLAY)
173-
#define BOARD_TYPE "NRF52840_CIRCUITPLAY"
174-
#elif defined(NRF52840_CLUE)
175-
#define BOARD_TYPE "NRF52840_CLUE"
176-
#elif defined(NRF52840_METRO)
177-
#define BOARD_TYPE "NRF52840_METRO"
178-
#elif defined(NRF52840_PCA10056)
179-
#define BOARD_TYPE "NRF52840_PCA10056"
180-
#elif defined(NINA_B302_ublox)
181-
#define BOARD_TYPE "NINA_B302_ublox"
182-
#elif defined(NINA_B112_ublox)
183-
#define BOARD_TYPE "NINA_B112_ublox"
184-
#elif defined(PARTICLE_XENON)
185-
#define BOARD_TYPE "PARTICLE_XENON"
186-
#elif defined(ARDUINO_NRF52_ADAFRUIT)
187-
#define BOARD_TYPE "ARDUINO_NRF52_ADAFRUIT"
188-
#else
189-
#define BOARD_TYPE "nRF52 Unknown"
36+
#define USE_SPIFFS false
37+
#elif USE_SPIFFS
38+
FS* filesystem = &SPIFFS;
39+
#define FileFS SPIFFS
40+
#define CurrentFileFS "SPIFFS"
19041
#endif
19142

192-
#elif ( defined(CORE_TEENSY) )
193-
// Default pin 10 to SS/CS
194-
#define USE_THIS_SS_PIN 10
195-
196-
#if defined(__IMXRT1062__)
197-
// For Teensy 4.1/4.0
198-
#if defined(ARDUINO_TEENSY41)
199-
#define BOARD_TYPE "TEENSY 4.1"
200-
// Use true for NativeEthernet Library, false if using other Ethernet libraries
201-
#define USE_NATIVE_ETHERNET true
202-
#elif defined(ARDUINO_TEENSY40)
203-
#define BOARD_TYPE "TEENSY 4.0"
204-
#else
205-
#define BOARD_TYPE "TEENSY 4.x"
206-
#endif
207-
#elif defined(__MK66FX1M0__)
208-
#define BOARD_TYPE "Teensy 3.6"
209-
#elif defined(__MK64FX512__)
210-
#define BOARD_TYPE "Teensy 3.5"
211-
#elif defined(__MKL26Z64__)
212-
#define BOARD_TYPE "Teensy LC"
213-
#elif defined(__MK20DX256__)
214-
#define BOARD_TYPE "Teensy 3.2" // and Teensy 3.1 (obsolete)
215-
#elif defined(__MK20DX128__)
216-
#define BOARD_TYPE "Teensy 3.0"
217-
#elif defined(__AVR_AT90USB1286__)
218-
#error Teensy 2.0++ not supported yet
219-
#elif defined(__AVR_ATmega32U4__)
220-
#error Teensy 2.0 not supported yet
221-
#else
222-
// For Other Boards
223-
#define BOARD_TYPE "Unknown Teensy Board"
224-
#endif
225-
226-
#elif ( defined(ESP8266) )
22743
// For ESP8266
44+
#include <FS.h>
45+
#include <LittleFS.h
46+
22847
#warning Use ESP8266 architecture
22948
#include <ESP8266mDNS.h>
23049
#define ETHERNET_USE_ESP8266
23150
#define BOARD_TYPE "ESP8266"
23251

23352
#elif ( defined(ESP32) )
23453
// For ESP32
54+
#if USE_LITTLEFS
55+
//LittleFS has higher priority
56+
#include "FS.h"
57+
58+
// The library will be depreciated after being merged to future major Arduino esp32 core release 2.x
59+
// At that time, just remove this library inclusion
60+
#include <LITTLEFS.h> // https://github.com/lorol/LITTLEFS
61+
62+
#define CurrentFileFS "LittleFS"
63+
#define FileFS LITTLEFS
64+
#ifdef USE_SPIFFS
65+
#undef USE_SPIFFS
66+
#endif
67+
#define USE_SPIFFS false
68+
#elif USE_SPIFFS
69+
#include "FS.h"
70+
#include <SPIFFS.h>
71+
#define FileFS SPIFFS
72+
#define CurrentFileFS "SPIFFS"
73+
#endif
74+
23575
#warning Use ESP32 architecture
23676
#define ETHERNET_USE_ESP32
23777
#define BOARD_TYPE "ESP32"
23878

23979
#define W5500_RST_PORT 21
24080

241-
#else
242-
// For Mega
243-
// Default pin 10 to SS/CS
244-
#define USE_THIS_SS_PIN 10
245-
246-
// Reduce size for Mega
247-
#define SENDCONTENT_P_BUFFER_SZ 512
248-
249-
#define BOARD_TYPE "AVR Mega"
25081
#endif
25182

25283
#ifndef BOARD_NAME

0 commit comments

Comments
 (0)