Skip to content

Commit 3c40378

Browse files
valerosvaleros
committed
Merge branch 'release/v3.0.0'
2 parents d0da799 + 02c28bc commit 3c40378

File tree

16 files changed

+51
-24
lines changed

16 files changed

+51
-24
lines changed

‎boards/agruminolemon.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "eagle.flash.4m1m.ld"
5+
},
6+
"core": "esp8266",
7+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_AGRUMINO_LEMON_V4",
8+
"f_cpu": "80000000L",
9+
"f_flash": "40000000L",
10+
"flash_mode": "dio",
11+
"mcu": "esp8266",
12+
"variant": "agruminolemonv4"
13+
},
14+
"connectivity": [
15+
"wifi"
16+
],
17+
"frameworks": [
18+
"arduino",
19+
"simba",
20+
"esp8266-rtos-sdk",
21+
"esp8266-nonos-sdk"
22+
],
23+
"name": "Lifely Agrumino Lemon v4",
24+
"upload": {
25+
"maximum_ram_size": 81920,
26+
"maximum_size": 4194304,
27+
"require_upload_port": true,
28+
"resetmethod": "nodemcu",
29+
"speed": 115200
30+
},
31+
"url": "https://www.lifely.cc/lifely-3-0/",
32+
"vendor": "Lifely"
33+
}

‎boards/gen4iod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ldscript": "eagle.flash.512k64.ld"
55
},
66
"core": "esp8266",
7-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_GEN4_IOD",
7+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_GEN4_IOD",
88
"f_cpu": "80000000L",
99
"f_flash": "40000000L",
1010
"flash_mode": "qio",

‎boards/huzzah.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ldscript": "eagle.flash.4m1m.ld"
55
},
66
"core": "esp8266",
7-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
7+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ADAFRUIT_HUZZAH",
88
"f_cpu": "80000000L",
99
"f_flash": "40000000L",
1010
"flash_mode": "qio",

‎boards/inventone.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ldscript": "eagle.flash.4m1m.ld"
55
},
66
"core": "esp8266",
7-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_GENERIC",
7+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_INVENT_ONE",
88
"f_cpu": "80000000L",
99
"f_flash": "40000000L",
1010
"flash_mode": "dio",

‎boards/nodemcuv2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ldscript": "eagle.flash.4m1m.ld"
55
},
66
"core": "esp8266",
7-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_NODEMCU",
7+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_NODEMCU_ESP12E",
88
"f_cpu": "80000000L",
99
"f_flash": "40000000L",
1010
"flash_mode": "dio",

‎boards/wifinfo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ldscript": "eagle.flash.1m256.ld"
55
},
66
"core": "esp8266",
7-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_WIFINFO",
7+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_WIFINFO",
88
"f_cpu": "80000000L",
99
"f_flash": "40000000L",
1010
"flash_mode": "qio",

‎boards/xinabox_cw01.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ldscript": "eagle.flash.4m1m.ld"
55
},
66
"core": "esp8266",
7-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_GENERIC",
7+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_XINABOX_CW01",
88
"f_cpu": "80000000L",
99
"f_flash": "40000000L",
1010
"flash_mode": "qio",

‎builder/main.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,9 @@ def get_esptoolpy_reset_flags(resetmethod):
246246
else:
247247
target_firm = env.ElfToBin(
248248
join("$BUILD_DIR", "${PROGNAME}"), target_elf)
249+
env.Depends(target_firm, "checkprogsize")
249250

250-
env.AddPlatformTarget("buildfs", target_firm, None, "Build Filesystem Image")
251+
env.AddPlatformTarget("buildfs", target_firm, target_firm, "Build Filesystem Image")
251252
AlwaysBuild(env.Alias("nobuild", target_firm))
252253
target_buildprog = env.Alias("buildprog", target_firm, target_firm)
253254

‎examples/arduino-asyncudp/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio

‎examples/arduino-blink/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio

‎examples/arduino-webserver/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio

‎examples/arduino-wifiscan/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio

‎examples/esp8266-nonos-sdk-blink/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio

‎examples/esp8266-rtos-sdk-blink/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio

‎examples/simba-blink/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio

‎platform.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"type": "git",
1818
"url": "https://github.com/platformio/platform-espressif8266.git"
1919
},
20-
"version": "2.6.3",
20+
"version": "3.0.0",
2121
"frameworks": {
2222
"arduino": {
2323
"package": "framework-arduinoespressif8266",
@@ -46,14 +46,14 @@
4646
"toolchain-xtensa": {
4747
"type": "toolchain",
4848
"owner": "platformio",
49-
"version": "~2.40802.0",
49+
"version": "~2.100200.0",
5050
"optionalVersions": ["~1.40802.0"]
5151
},
5252
"framework-arduinoespressif8266": {
5353
"type": "framework",
5454
"optional": true,
5555
"owner": "platformio",
56-
"version": "~3.20704.0"
56+
"version": "~3.30000.0"
5757
},
5858
"framework-esp8266-rtos-sdk": {
5959
"type": "framework",

0 commit comments

Comments
 (0)