Merge branch 'release/v1.6.0'

platformio · Jan 3, 2018 · 41a0bee · 41a0bee
2 parents 44295db + 491fe52
commit 41a0bee
Show file tree

Hide file tree

Showing 55 changed files with 386 additions and 928 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ python:
   - "2.7"
 
 env:
+  - PLATFORMIO_PROJECT_DIR=examples/arduino-asyncudp
   - PLATFORMIO_PROJECT_DIR=examples/arduino-blink
   - PLATFORMIO_PROJECT_DIR=examples/arduino-webserver
   - PLATFORMIO_PROJECT_DIR=examples/arduino-wifiscan

diff --git a/boards/d1.json b/boards/d1.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "d1"
   },
@@ -17,7 +17,7 @@
     "esp8266-rtos-sdk",
     "esp8266-nonos-sdk"
   ],
-  "name": "WEMOS D1 (Retired)",
+  "name": "WEMOS D1 R1 (Retired)",
   "upload": {
     "maximum_ram_size": 81920,
     "maximum_size": 4194304,

diff --git a/boards/d1_mini.json b/boards/d1_mini.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "d1_mini"
   },
@@ -17,7 +17,7 @@
     "esp8266-rtos-sdk",
     "esp8266-nonos-sdk"
   ],
-  "name": "WEMOS D1 mini",
+  "name": "WeMos D1 R2 & mini",
   "upload": {
     "maximum_ram_size": 81920,
     "maximum_size": 4194304,

diff --git a/boards/d1_mini_lite.json b/boards/d1_mini_lite.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dout",
-    "ldscript": "esp8266.flash.1m64.ld",
+    "ldscript": "eagle.flash.1m64.ld",
     "mcu": "esp8266",
     "variant": "d1_mini"
   },
@@ -15,10 +15,10 @@
   "frameworks": [
     "arduino"
   ],
-  "name": "WEMOS D1 mini Lite",
+  "name": "WeMos D1 mini Lite",
   "upload": {
     "maximum_ram_size": 81920,
-    "maximum_size": 958448,
+    "maximum_size": 1048576,
     "require_upload_port": true,
     "resetmethod": "nodemcu",
     "speed": 115200

diff --git a/boards/d1_mini_pro.json b/boards/d1_mini_pro.json
@@ -0,0 +1,30 @@
+{
+  "build": {
+    "core": "esp8266",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_WEMOS_D1MINIPRO",
+    "f_cpu": "80000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "ldscript": "eagle.flash.16m.ld",
+    "mcu": "esp8266",
+    "variant": "d1_mini"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "frameworks": [
+    "arduino",
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
+  ],
+  "name": "WeMos D1 mini Pro",
+  "upload": {
+    "maximum_ram_size": 81920,
+    "maximum_size": 16777216,
+    "require_upload_port": true,
+    "resetmethod": "nodemcu",
+    "speed": 115200
+  },
+  "url": "https://wiki.wemos.cc/products:d1:d1_mini",
+  "vendor": "WEMOS"
+}
diff --git a/boards/esp01.json b/boards/esp01.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "esp8266.flash.512k64.ld",
+    "ldscript": "eagle.flash.512k64.ld",
     "mcu": "esp8266",
     "variant": "generic"
   },

diff --git a/boards/esp01_1m.json b/boards/esp01_1m.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "esp8266.flash.1m256.ld",
+    "ldscript": "eagle.flash.1m256.ld",
     "mcu": "esp8266",
     "variant": "generic"
   },
@@ -14,7 +14,6 @@
   ],
   "frameworks": [
     "arduino",
-    "simba",
     "esp8266-rtos-sdk",
     "esp8266-nonos-sdk"
   ],

diff --git a/boards/esp07.json b/boards/esp07.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "nodemcu"
   },

diff --git a/boards/esp12e.json b/boards/esp12e.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "nodemcu"
   },

diff --git a/boards/esp210.json b/boards/esp210.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "generic"
   },

diff --git a/boards/esp8285.json b/boards/esp8285.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dout",
-    "ldscript": "esp8266.flash.1m256.ld",
+    "ldscript": "eagle.flash.1m256.ld",
     "mcu": "esp8266",
     "variant": "generic"
   },

diff --git a/boards/esp_wroom_02.json b/boards/esp_wroom_02.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "nodemcu"
   },

diff --git a/boards/espduino.json b/boards/espduino.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "ESPDuino"
   },

diff --git a/boards/espectro.json b/boards/espectro.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "espectro"
   },

diff --git a/boards/espino.json b/boards/espino.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "espino"
   },

diff --git a/boards/espinotee.json b/boards/espinotee.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "espinotee"
   },

diff --git a/boards/espresso_lite_v1.json b/boards/espresso_lite_v1.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "espresso_lite_v1"
   },

diff --git a/boards/espresso_lite_v2.json b/boards/espresso_lite_v2.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "espresso_lite_v2"
   },

diff --git a/boards/gen4iod.json b/boards/gen4iod.json
@@ -0,0 +1,30 @@
+{
+  "build": {
+    "core": "esp8266",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_GEN4_IOD",
+    "f_cpu": "80000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "qio",
+    "ldscript": "eagle.flash.512k64.ld",
+    "mcu": "esp8266",
+    "variant": "generic"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "frameworks": [
+    "arduino",
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
+  ],
+  "name": "4D Systems gen4 IoD Range",
+  "upload": {
+    "maximum_ram_size": 81920,
+    "maximum_size": 524288,
+    "require_upload_port": true,
+    "resetmethod": "ck",
+    "speed": 115200
+  },
+  "url": "http://www.4dsystems.com.au/product/gen4_IoD/",
+  "vendor": "4D Systems"
+}
diff --git a/boards/heltec_wifi_kit_8.json b/boards/heltec_wifi_kit_8.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "d1_mini"
   },

diff --git a/boards/huzzah.json b/boards/huzzah.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "adafruit"
   },

diff --git a/boards/modwifi.json b/boards/modwifi.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "esp8266.flash.2m.ld",
+    "ldscript": "eagle.flash.2m.ld",
     "mcu": "esp8266",
     "variant": "generic"
   },

diff --git a/boards/nodemcu.json b/boards/nodemcu.json
@@ -11,7 +11,7 @@
         "0xEA60"
       ]
     ],
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "nodemcu"
   },

diff --git a/boards/nodemcuv2.json b/boards/nodemcuv2.json
@@ -11,7 +11,7 @@
         "0xEA60"
       ]
     ],
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "nodemcu"
   },

diff --git a/boards/oak.json b/boards/oak.json
@@ -0,0 +1,28 @@
+{
+  "build": {
+    "core": "esp8266",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_OAK",
+    "f_cpu": "80000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "ldscript": "eagle.flash.4m1m.ld",
+    "mcu": "esp8266",
+    "variant": "oak"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "DigiStump Oak",
+  "upload": {
+    "maximum_ram_size": 81920,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "resetmethod": "ck",
+    "speed": 115200
+  },
+  "url": "http://digistump.com/category/22",
+  "vendor": "DigiStump"
+}
diff --git a/boards/phoenix_v1.json b/boards/phoenix_v1.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "phoenix_v1"
   },
@@ -20,7 +20,7 @@
   "name": "Phoenix 1.0",
   "upload": {
     "maximum_ram_size": 81920,
-    "maximum_size": 1044464,
+    "maximum_size": 4194304,
     "require_upload_port": true,
     "resetmethod": "nodemcu",
     "speed": 115200

diff --git a/boards/phoenix_v2.json b/boards/phoenix_v2.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "phoenix_v2"
   },
@@ -20,7 +20,7 @@
   "name": "Phoenix 2.0",
   "upload": {
     "maximum_ram_size": 81920,
-    "maximum_size": 1044464,
+    "maximum_size": 4194304,
     "require_upload_port": true,
     "resetmethod": "ck",
     "speed": 115200

diff --git a/boards/sparkfunBlynk.json b/boards/sparkfunBlynk.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "esp8266.flash.4m1m.ld",
+    "ldscript": "eagle.flash.4m1m.ld",
     "mcu": "esp8266",
     "variant": "thing"
   },

diff --git a/boards/thing.json b/boards/thing.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "esp8266.flash.512k64.ld",
+    "ldscript": "eagle.flash.512k64.ld",
     "mcu": "esp8266",
     "variant": "thing"
   },

diff --git a/boards/thingdev.json b/boards/thingdev.json
@@ -1,11 +1,11 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_THING",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_THING_DEV",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
-    "ldscript": "esp8266.flash.512k64.ld",
+    "ldscript": "eagle.flash.512k64.ld",
     "mcu": "esp8266",
     "variant": "thing"
   },