Skip to content

Commit 11a338c

Browse files
earlephilhowerearlephilhower
authored
Merge branch 'master' into gdb
2 parents 99da578 + 6883bee commit 11a338c

30 files changed

+358
-217
lines changed

‎boards.txt

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,18 @@ generic.menu.FlashFreq.40=40MHz
6767
generic.menu.FlashFreq.40.build.flash_freq=40
6868
generic.menu.FlashFreq.80=80MHz
6969
generic.menu.FlashFreq.80.build.flash_freq=80
70-
generic.menu.FlashMode.qio=QIO
71-
generic.menu.FlashMode.qio.build.flash_mode=qio
72-
generic.menu.FlashMode.qout=QOUT
73-
generic.menu.FlashMode.qout.build.flash_mode=qout
70+
generic.menu.FlashMode.dout=DOUT (compatible)
71+
generic.menu.FlashMode.dout.build.flash_mode=dout
72+
generic.menu.FlashMode.dout.build.flash_flags=-DFLASHMODE_DOUT
7473
generic.menu.FlashMode.dio=DIO
7574
generic.menu.FlashMode.dio.build.flash_mode=dio
76-
generic.menu.FlashMode.dout=DOUT
77-
generic.menu.FlashMode.dout.build.flash_mode=dout
75+
generic.menu.FlashMode.dio.build.flash_flags=-DFLASHMODE_DIO
76+
generic.menu.FlashMode.qout=QOUT
77+
generic.menu.FlashMode.qout.build.flash_mode=qout
78+
generic.menu.FlashMode.qout.build.flash_flags=-DFLASHMODE_QOUT
79+
generic.menu.FlashMode.qio=QIO (fast)
80+
generic.menu.FlashMode.qio.build.flash_mode=qio
81+
generic.menu.FlashMode.qio.build.flash_flags=-DFLASHMODE_QIO
7882
generic.menu.eesz.512K=512K (no SPIFFS)
7983
generic.menu.eesz.512K.build.flash_size=512K
8084
generic.menu.eesz.512K.build.flash_size_bytes=0x80000
@@ -500,6 +504,7 @@ esp8285.menu.CrystalFreq.26=26 MHz
500504
esp8285.menu.CrystalFreq.40=40 MHz
501505
esp8285.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
502506
esp8285.build.flash_mode=dout
507+
esp8285.build.flash_flags=-DFLASHMODE_DOUT
503508
esp8285.build.flash_freq=40
504509
esp8285.menu.eesz.1M=1M (no SPIFFS)
505510
esp8285.menu.eesz.1M.build.flash_size=1M
@@ -763,6 +768,7 @@ espduino.menu.exception.enabled=Enabled
763768
espduino.menu.exception.enabled.build.exception_flags=-fexceptions
764769
espduino.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
765770
espduino.build.flash_mode=dio
771+
espduino.build.flash_flags=-DFLASHMODE_DIO
766772
espduino.build.flash_freq=40
767773
espduino.menu.eesz.4M=4M (no SPIFFS)
768774
espduino.menu.eesz.4M.build.flash_size=4M
@@ -946,6 +952,7 @@ huzzah.menu.exception.enabled.build.exception_flags=-fexceptions
946952
huzzah.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
947953
huzzah.upload.resetmethod=nodemcu
948954
huzzah.build.flash_mode=qio
955+
huzzah.build.flash_flags=-DFLASHMODE_QIO
949956
huzzah.build.flash_freq=40
950957
huzzah.menu.eesz.4M=4M (no SPIFFS)
951958
huzzah.menu.eesz.4M.build.flash_size=4M
@@ -1129,6 +1136,7 @@ inventone.menu.exception.enabled.build.exception_flags=-fexceptions
11291136
inventone.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
11301137
inventone.upload.resetmethod=nodemcu
11311138
inventone.build.flash_mode=dio
1139+
inventone.build.flash_flags=-DFLASHMODE_DIO
11321140
inventone.build.flash_freq=40
11331141
inventone.menu.eesz.4M=4M (no SPIFFS)
11341142
inventone.menu.eesz.4M.build.flash_size=4M
@@ -1315,6 +1323,7 @@ cw01.menu.CrystalFreq.26=26 MHz
13151323
cw01.menu.CrystalFreq.40=40 MHz
13161324
cw01.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
13171325
cw01.build.flash_mode=qio
1326+
cw01.build.flash_flags=-DFLASHMODE_QIO
13181327
cw01.build.flash_freq=40
13191328
cw01.menu.eesz.4M=4M (no SPIFFS)
13201329
cw01.menu.eesz.4M.build.flash_size=4M
@@ -1497,6 +1506,7 @@ espresso_lite_v1.menu.exception.enabled=Enabled
14971506
espresso_lite_v1.menu.exception.enabled.build.exception_flags=-fexceptions
14981507
espresso_lite_v1.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
14991508
espresso_lite_v1.build.flash_mode=dio
1509+
espresso_lite_v1.build.flash_flags=-DFLASHMODE_DIO
15001510
espresso_lite_v1.build.flash_freq=40
15011511
espresso_lite_v1.menu.eesz.4M=4M (no SPIFFS)
15021512
espresso_lite_v1.menu.eesz.4M.build.flash_size=4M
@@ -1683,6 +1693,7 @@ espresso_lite_v2.menu.exception.enabled=Enabled
16831693
espresso_lite_v2.menu.exception.enabled.build.exception_flags=-fexceptions
16841694
espresso_lite_v2.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
16851695
espresso_lite_v2.build.flash_mode=dio
1696+
espresso_lite_v2.build.flash_flags=-DFLASHMODE_DIO
16861697
espresso_lite_v2.build.flash_freq=40
16871698
espresso_lite_v2.menu.eesz.4M=4M (no SPIFFS)
16881699
espresso_lite_v2.menu.eesz.4M.build.flash_size=4M
@@ -1869,6 +1880,7 @@ phoenix_v1.menu.exception.enabled=Enabled
18691880
phoenix_v1.menu.exception.enabled.build.exception_flags=-fexceptions
18701881
phoenix_v1.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
18711882
phoenix_v1.build.flash_mode=dio
1883+
phoenix_v1.build.flash_flags=-DFLASHMODE_DIO
18721884
phoenix_v1.build.flash_freq=40
18731885
phoenix_v1.menu.eesz.4M=4M (no SPIFFS)
18741886
phoenix_v1.menu.eesz.4M.build.flash_size=4M
@@ -2055,6 +2067,7 @@ phoenix_v2.menu.exception.enabled=Enabled
20552067
phoenix_v2.menu.exception.enabled.build.exception_flags=-fexceptions
20562068
phoenix_v2.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
20572069
phoenix_v2.build.flash_mode=dio
2070+
phoenix_v2.build.flash_flags=-DFLASHMODE_DIO
20582071
phoenix_v2.build.flash_freq=40
20592072
phoenix_v2.menu.eesz.4M=4M (no SPIFFS)
20602073
phoenix_v2.menu.eesz.4M.build.flash_size=4M
@@ -2242,6 +2255,7 @@ nodemcu.menu.exception.enabled.build.exception_flags=-fexceptions
22422255
nodemcu.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
22432256
nodemcu.upload.resetmethod=nodemcu
22442257
nodemcu.build.flash_mode=qio
2258+
nodemcu.build.flash_flags=-DFLASHMODE_QIO
22452259
nodemcu.build.flash_freq=40
22462260
nodemcu.menu.eesz.4M=4M (no SPIFFS)
22472261
nodemcu.menu.eesz.4M.build.flash_size=4M
@@ -2425,6 +2439,7 @@ nodemcuv2.menu.exception.enabled.build.exception_flags=-fexceptions
24252439
nodemcuv2.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
24262440
nodemcuv2.upload.resetmethod=nodemcu
24272441
nodemcuv2.build.flash_mode=dio
2442+
nodemcuv2.build.flash_flags=-DFLASHMODE_DIO
24282443
nodemcuv2.build.flash_freq=40
24292444
nodemcuv2.menu.eesz.4M=4M (no SPIFFS)
24302445
nodemcuv2.menu.eesz.4M.build.flash_size=4M
@@ -2608,6 +2623,7 @@ modwifi.menu.exception.enabled.build.exception_flags=-fexceptions
26082623
modwifi.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
26092624
modwifi.upload.resetmethod=ck
26102625
modwifi.build.flash_mode=qio
2626+
modwifi.build.flash_flags=-DFLASHMODE_QIO
26112627
modwifi.build.flash_freq=40
26122628
modwifi.menu.eesz.2M=2M (no SPIFFS)
26132629
modwifi.menu.eesz.2M.build.flash_size=2M
@@ -2801,6 +2817,7 @@ thing.menu.exception.enabled.build.exception_flags=-fexceptions
28012817
thing.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
28022818
thing.upload.resetmethod=ck
28032819
thing.build.flash_mode=qio
2820+
thing.build.flash_flags=-DFLASHMODE_QIO
28042821
thing.build.flash_freq=40
28052822
thing.menu.eesz.512K=512K (no SPIFFS)
28062823
thing.menu.eesz.512K.build.flash_size=512K
@@ -2984,6 +3001,7 @@ thingdev.menu.exception.enabled.build.exception_flags=-fexceptions
29843001
thingdev.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
29853002
thingdev.upload.resetmethod=nodemcu
29863003
thingdev.build.flash_mode=dio
3004+
thingdev.build.flash_flags=-DFLASHMODE_DIO
29873005
thingdev.build.flash_freq=40
29883006
thingdev.menu.eesz.512K=512K (no SPIFFS)
29893007
thingdev.menu.eesz.512K.build.flash_size=512K
@@ -3167,6 +3185,7 @@ esp210.menu.exception.enabled.build.exception_flags=-fexceptions
31673185
esp210.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
31683186
esp210.upload.resetmethod=ck
31693187
esp210.build.flash_mode=qio
3188+
esp210.build.flash_flags=-DFLASHMODE_QIO
31703189
esp210.build.flash_freq=40
31713190
esp210.menu.eesz.4M=4M (no SPIFFS)
31723191
esp210.menu.eesz.4M.build.flash_size=4M
@@ -3350,6 +3369,7 @@ d1_mini.menu.exception.enabled.build.exception_flags=-fexceptions
33503369
d1_mini.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
33513370
d1_mini.upload.resetmethod=nodemcu
33523371
d1_mini.build.flash_mode=dio
3372+
d1_mini.build.flash_flags=-DFLASHMODE_DIO
33533373
d1_mini.build.flash_freq=40
33543374
d1_mini.menu.eesz.4M=4M (no SPIFFS)
33553375
d1_mini.menu.eesz.4M.build.flash_size=4M
@@ -3533,6 +3553,7 @@ d1_mini_pro.menu.exception.enabled.build.exception_flags=-fexceptions
35333553
d1_mini_pro.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
35343554
d1_mini_pro.upload.resetmethod=nodemcu
35353555
d1_mini_pro.build.flash_mode=dio
3556+
d1_mini_pro.build.flash_flags=-DFLASHMODE_DIO
35363557
d1_mini_pro.build.flash_freq=40
35373558
d1_mini_pro.menu.eesz.16M14M=16M (14M SPIFFS)
35383559
d1_mini_pro.menu.eesz.16M14M.build.flash_size=16M
@@ -3699,6 +3720,7 @@ d1_mini_lite.menu.exception.enabled.build.exception_flags=-fexceptions
36993720
d1_mini_lite.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
37003721
d1_mini_lite.upload.resetmethod=nodemcu
37013722
d1_mini_lite.build.flash_mode=dout
3723+
d1_mini_lite.build.flash_flags=-DFLASHMODE_DOUT
37023724
d1_mini_lite.build.flash_freq=40
37033725
d1_mini_lite.menu.eesz.1M=1M (no SPIFFS)
37043726
d1_mini_lite.menu.eesz.1M.build.flash_size=1M
@@ -3922,6 +3944,7 @@ d1.menu.exception.enabled.build.exception_flags=-fexceptions
39223944
d1.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
39233945
d1.upload.resetmethod=nodemcu
39243946
d1.build.flash_mode=dio
3947+
d1.build.flash_flags=-DFLASHMODE_DIO
39253948
d1.build.flash_freq=40
39263949
d1.menu.eesz.4M=4M (no SPIFFS)
39273950
d1.menu.eesz.4M.build.flash_size=4M
@@ -4108,6 +4131,7 @@ espino.menu.ResetMethod.ck.upload.resetmethod=ck
41084131
espino.menu.ResetMethod.nodemcu=nodemcu
41094132
espino.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
41104133
espino.build.flash_mode=qio
4134+
espino.build.flash_flags=-DFLASHMODE_QIO
41114135
espino.build.flash_freq=40
41124136
espino.menu.eesz.4M=4M (no SPIFFS)
41134137
espino.menu.eesz.4M.build.flash_size=4M
@@ -4291,6 +4315,7 @@ espinotee.menu.exception.enabled.build.exception_flags=-fexceptions
42914315
espinotee.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
42924316
espinotee.upload.resetmethod=nodemcu
42934317
espinotee.build.flash_mode=qio
4318+
espinotee.build.flash_flags=-DFLASHMODE_QIO
42944319
espinotee.build.flash_freq=40
42954320
espinotee.menu.eesz.4M=4M (no SPIFFS)
42964321
espinotee.menu.eesz.4M.build.flash_size=4M
@@ -4491,6 +4516,7 @@ wifinfo.menu.exception.enabled.build.exception_flags=-fexceptions
44914516
wifinfo.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
44924517
wifinfo.upload.resetmethod=nodemcu
44934518
wifinfo.build.flash_mode=qio
4519+
wifinfo.build.flash_flags=-DFLASHMODE_QIO
44944520
wifinfo.menu.FlashFreq.40=40MHz
44954521
wifinfo.menu.FlashFreq.40.build.flash_freq=40
44964522
wifinfo.menu.FlashFreq.80=80MHz
@@ -4729,6 +4755,7 @@ arduino-esp8266.menu.exception.enabled.build.exception_flags=-fexceptions
47294755
arduino-esp8266.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
47304756
arduino-esp8266.upload.resetmethod=ck
47314757
arduino-esp8266.build.flash_mode=qio
4758+
arduino-esp8266.build.flash_flags=-DFLASHMODE_QIO
47324759
arduino-esp8266.build.flash_freq=40
47334760
arduino-esp8266.menu.eesz.4M=4M (no SPIFFS)
47344761
arduino-esp8266.menu.eesz.4M.build.flash_size=4M
@@ -4913,6 +4940,7 @@ gen4iod.menu.exception.enabled.build.exception_flags=-fexceptions
49134940
gen4iod.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
49144941
gen4iod.upload.resetmethod=nodemcu
49154942
gen4iod.build.flash_mode=dio
4943+
gen4iod.build.flash_flags=-DFLASHMODE_DIO
49164944
gen4iod.build.flash_freq=80
49174945
gen4iod.menu.eesz.512K=512K (no SPIFFS)
49184946
gen4iod.menu.eesz.512K.build.flash_size=512K
@@ -5097,6 +5125,7 @@ oak.menu.exception.enabled.build.exception_flags=-fexceptions
50975125
oak.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
50985126
oak.upload.resetmethod=none
50995127
oak.build.flash_mode=dio
5128+
oak.build.flash_flags=-DFLASHMODE_DIO
51005129
oak.build.flash_freq=40
51015130
oak.menu.eesz.4M=4M (no SPIFFS)
51025131
oak.menu.eesz.4M.build.flash_size=4M
@@ -5280,6 +5309,7 @@ wifiduino.menu.exception.enabled.build.exception_flags=-fexceptions
52805309
wifiduino.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
52815310
wifiduino.upload.resetmethod=nodemcu
52825311
wifiduino.build.flash_mode=dio
5312+
wifiduino.build.flash_flags=-DFLASHMODE_DIO
52835313
wifiduino.build.flash_freq=40
52845314
wifiduino.menu.eesz.4M=4M (no SPIFFS)
52855315
wifiduino.menu.eesz.4M.build.flash_size=4M
@@ -5466,14 +5496,18 @@ wifi_slot.menu.FlashFreq.40=40MHz
54665496
wifi_slot.menu.FlashFreq.40.build.flash_freq=40
54675497
wifi_slot.menu.FlashFreq.80=80MHz
54685498
wifi_slot.menu.FlashFreq.80.build.flash_freq=80
5469-
wifi_slot.menu.FlashMode.qio=QIO
5470-
wifi_slot.menu.FlashMode.qio.build.flash_mode=qio
5471-
wifi_slot.menu.FlashMode.qout=QOUT
5472-
wifi_slot.menu.FlashMode.qout.build.flash_mode=qout
5499+
wifi_slot.menu.FlashMode.dout=DOUT (compatible)
5500+
wifi_slot.menu.FlashMode.dout.build.flash_mode=dout
5501+
wifi_slot.menu.FlashMode.dout.build.flash_flags=-DFLASHMODE_DOUT
54735502
wifi_slot.menu.FlashMode.dio=DIO
54745503
wifi_slot.menu.FlashMode.dio.build.flash_mode=dio
5475-
wifi_slot.menu.FlashMode.dout=DOUT
5476-
wifi_slot.menu.FlashMode.dout.build.flash_mode=dout
5504+
wifi_slot.menu.FlashMode.dio.build.flash_flags=-DFLASHMODE_DIO
5505+
wifi_slot.menu.FlashMode.qout=QOUT
5506+
wifi_slot.menu.FlashMode.qout.build.flash_mode=qout
5507+
wifi_slot.menu.FlashMode.qout.build.flash_flags=-DFLASHMODE_QOUT
5508+
wifi_slot.menu.FlashMode.qio=QIO (fast)
5509+
wifi_slot.menu.FlashMode.qio.build.flash_mode=qio
5510+
wifi_slot.menu.FlashMode.qio.build.flash_flags=-DFLASHMODE_QIO
54775511
wifi_slot.menu.eesz.1M=1M (no SPIFFS)
54785512
wifi_slot.menu.eesz.1M.build.flash_size=1M
54795513
wifi_slot.menu.eesz.1M.build.flash_size_bytes=0x100000
@@ -5743,6 +5777,7 @@ wiolink.menu.exception.enabled.build.exception_flags=-fexceptions
57435777
wiolink.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
57445778
wiolink.upload.resetmethod=nodemcu
57455779
wiolink.build.flash_mode=qio
5780+
wiolink.build.flash_flags=-DFLASHMODE_QIO
57465781
wiolink.build.flash_freq=40
57475782
wiolink.menu.eesz.4M=4M (no SPIFFS)
57485783
wiolink.menu.eesz.4M.build.flash_size=4M
@@ -5926,6 +5961,7 @@ espectro.menu.exception.enabled.build.exception_flags=-fexceptions
59265961
espectro.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
59275962
espectro.upload.resetmethod=nodemcu
59285963
espectro.build.flash_mode=dio
5964+
espectro.build.flash_flags=-DFLASHMODE_DIO
59295965
espectro.build.flash_freq=40
59305966
espectro.menu.eesz.4M=4M (no SPIFFS)
59315967
espectro.menu.eesz.4M.build.flash_size=4M

‎cores/esp8266/core_esp8266_noniso.c

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -29,62 +29,12 @@
2929
#include <math.h>
3030
#include "stdlib_noniso.h"
3131

32-
void reverse(char* begin, char* end) {
33-
char *is = begin;
34-
char *ie = end - 1;
35-
while(is < ie) {
36-
char tmp = *ie;
37-
*ie = *is;
38-
*is = tmp;
39-
++is;
40-
--ie;
41-
}
42-
}
43-
4432
char* ltoa(long value, char* result, int base) {
45-
if(base < 2 || base > 16) {
46-
*result = 0;
47-
return result;
48-
}
49-
50-
char* out = result;
51-
long quotient = abs(value);
52-
53-
do {
54-
const long tmp = quotient / base;
55-
*out = "0123456789abcdef"[quotient - (tmp * base)];
56-
++out;
57-
quotient = tmp;
58-
} while(quotient);
59-
60-
// Apply negative sign
61-
if(value < 0)
62-
*out++ = '-';
63-
64-
reverse(result, out);
65-
*out = 0;
66-
return result;
33+
return itoa((int)value, result, base);
6734
}
6835

6936
char* ultoa(unsigned long value, char* result, int base) {
70-
if(base < 2 || base > 16) {
71-
*result = 0;
72-
return result;
73-
}
74-
75-
char* out = result;
76-
unsigned long quotient = value;
77-
78-
do {
79-
const unsigned long tmp = quotient / base;
80-
*out = "0123456789abcdef"[quotient - (tmp * base)];
81-
++out;
82-
quotient = tmp;
83-
} while(quotient);
84-
85-
reverse(result, out);
86-
*out = 0;
87-
return result;
37+
return utoa((unsigned int)value, result, base);
8838
}
8939

9040
char * dtostrf(double number, signed char width, unsigned char prec, char *s) {

‎libraries/ESP8266WebServer/examples/FSBrowser/FSBrowser.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
1818
upload the contents of the data folder with MkSPIFFS Tool ("ESP8266 Sketch Data Upload" in Tools menu in Arduino IDE)
1919
or you can upload the contents of a folder if you CD in that folder and run the following command:
20-
for file in `ls -A1`; do curl -F "file=@$PWD/$file" esp8266fs.local/edit; done
20+
for file in `\ls -A1`; do curl -F "file=@$PWD/$file" esp8266fs.local/edit; done
2121
2222
access the sample web page at http://esp8266fs.local
2323
edit the page by going to http://esp8266fs.local/edit

‎platform.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ recipe.hooks.core.prebuild.3.pattern.windows=cmd.exe /c if exist {build.source.p
8989
recipe.hooks.linking.prelink.1.pattern="{compiler.path}{compiler.c.cmd}" -CC -E -P {build.vtable_flags} "{runtime.platform.path}/tools/sdk/ld/eagle.app.v6.common.ld.h" -o "{build.path}/local.eagle.app.v6.common.ld"
9090

9191
## Compile c files
92-
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
92+
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
9393

9494
## Compile c++ files
95-
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
95+
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
9696

9797
## Compile S files
98-
recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
98+
recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
9999

100100
## Create archives
101101
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"

‎tests/host/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ LCOV ?= lcov
1919
GENHTML ?= genhtml
2020

2121
ifeq ($(FORCE32),1)
22-
ABILITY32 = $(shell echo 'int main(){return sizeof(long);}'|$(CXX) -m32 -x c++ - -o sizeoflong 2>/dev/null && ./sizeoflong; echo $$?; rm -f sizeoflong;)
23-
ifneq ($(ABILITY32),4)
22+
SIZEOFLONG = $(shell echo 'int main(){return sizeof(long);}'|$(CXX) -m32 -x c++ - -o sizeoflong 2>/dev/null && ./sizeoflong; echo $$?; rm -f sizeoflong;)
23+
ifneq ($(SIZEOFLONG),4)
2424
$(warning Cannot compile in 32 bit mode, switching to native mode)
2525
else
2626
N32 = 32
@@ -82,6 +82,8 @@ MOCK_CPP_FILES := $(MOCK_CPP_FILES_COMMON) $(addprefix common/,\
8282

8383
MOCK_CPP_FILES_EMU := $(MOCK_CPP_FILES_COMMON) $(addprefix common/,\
8484
ArduinoMain.cpp \
85+
ArduinoMainUdp.cpp \
86+
ArduinoMainSpiffs.cpp \
8587
user_interface.cpp \
8688
)
8789

0 commit comments

Comments
 (0)