Skip to content

Commit 41a0bee

Browse files
committed
Merge branch 'release/v1.6.0'
2 parents 44295db + 491fe52 commit 41a0bee

Some content is hidden

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

55 files changed

+386
-928
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ python:
33
- "2.7"
44

55
env:
6+
- PLATFORMIO_PROJECT_DIR=examples/arduino-asyncudp
67
- PLATFORMIO_PROJECT_DIR=examples/arduino-blink
78
- PLATFORMIO_PROJECT_DIR=examples/arduino-webserver
89
- PLATFORMIO_PROJECT_DIR=examples/arduino-wifiscan

boards/d1.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"f_cpu": "80000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "dio",
8-
"ldscript": "esp8266.flash.4m1m.ld",
8+
"ldscript": "eagle.flash.4m1m.ld",
99
"mcu": "esp8266",
1010
"variant": "d1"
1111
},
@@ -17,7 +17,7 @@
1717
"esp8266-rtos-sdk",
1818
"esp8266-nonos-sdk"
1919
],
20-
"name": "WEMOS D1 (Retired)",
20+
"name": "WEMOS D1 R1 (Retired)",
2121
"upload": {
2222
"maximum_ram_size": 81920,
2323
"maximum_size": 4194304,

boards/d1_mini.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"f_cpu": "80000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "dio",
8-
"ldscript": "esp8266.flash.4m1m.ld",
8+
"ldscript": "eagle.flash.4m1m.ld",
99
"mcu": "esp8266",
1010
"variant": "d1_mini"
1111
},
@@ -17,7 +17,7 @@
1717
"esp8266-rtos-sdk",
1818
"esp8266-nonos-sdk"
1919
],
20-
"name": "WEMOS D1 mini",
20+
"name": "WeMos D1 R2 & mini",
2121
"upload": {
2222
"maximum_ram_size": 81920,
2323
"maximum_size": 4194304,

boards/d1_mini_lite.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"f_cpu": "80000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "dout",
8-
"ldscript": "esp8266.flash.1m64.ld",
8+
"ldscript": "eagle.flash.1m64.ld",
99
"mcu": "esp8266",
1010
"variant": "d1_mini"
1111
},
@@ -15,10 +15,10 @@
1515
"frameworks": [
1616
"arduino"
1717
],
18-
"name": "WEMOS D1 mini Lite",
18+
"name": "WeMos D1 mini Lite",
1919
"upload": {
2020
"maximum_ram_size": 81920,
21-
"maximum_size": 958448,
21+
"maximum_size": 1048576,
2222
"require_upload_port": true,
2323
"resetmethod": "nodemcu",
2424
"speed": 115200

boards/d1_mini_pro.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"build": {
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_WEMOS_D1MINIPRO",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "eagle.flash.16m.ld",
9+
"mcu": "esp8266",
10+
"variant": "d1_mini"
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
15+
"frameworks": [
16+
"arduino",
17+
"esp8266-rtos-sdk",
18+
"esp8266-nonos-sdk"
19+
],
20+
"name": "WeMos D1 mini Pro",
21+
"upload": {
22+
"maximum_ram_size": 81920,
23+
"maximum_size": 16777216,
24+
"require_upload_port": true,
25+
"resetmethod": "nodemcu",
26+
"speed": 115200
27+
},
28+
"url": "https://wiki.wemos.cc/products:d1:d1_mini",
29+
"vendor": "WEMOS"
30+
}

boards/esp01.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"f_cpu": "80000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "qio",
8-
"ldscript": "esp8266.flash.512k64.ld",
8+
"ldscript": "eagle.flash.512k64.ld",
99
"mcu": "esp8266",
1010
"variant": "generic"
1111
},

boards/esp01_1m.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"f_cpu": "80000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "qio",
8-
"ldscript": "esp8266.flash.1m256.ld",
8+
"ldscript": "eagle.flash.1m256.ld",
99
"mcu": "esp8266",
1010
"variant": "generic"
1111
},
@@ -14,7 +14,6 @@
1414
],
1515
"frameworks": [
1616
"arduino",
17-
"simba",
1817
"esp8266-rtos-sdk",
1918
"esp8266-nonos-sdk"
2019
],

boards/esp07.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"f_cpu": "80000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "qio",
8-
"ldscript": "esp8266.flash.4m1m.ld",
8+
"ldscript": "eagle.flash.4m1m.ld",
99
"mcu": "esp8266",
1010
"variant": "nodemcu"
1111
},

boards/esp12e.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"f_cpu": "80000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "dio",
8-
"ldscript": "esp8266.flash.4m1m.ld",
8+
"ldscript": "eagle.flash.4m1m.ld",
99
"mcu": "esp8266",
1010
"variant": "nodemcu"
1111
},

boards/esp210.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"f_cpu": "80000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "qio",
8-
"ldscript": "esp8266.flash.4m1m.ld",
8+
"ldscript": "eagle.flash.4m1m.ld",
99
"mcu": "esp8266",
1010
"variant": "generic"
1111
},

0 commit comments

Comments
 (0)