Merge branch 'release/v1.6.1'

ivankravets · ivankravets · commit 64a813ee4f58 · 2020-02-12T23:25:57.000+02:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,7 +7,7 @@ environment:
 
 install:
   - cmd: git submodule update --init --recursive
-  - cmd: SET PATH=%PATH%;C:\Python36\Scripts
+  - cmd: SET PATH=C:\Python36\Scripts;%PATH%
   - cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
   - cmd: platformio platform install file://.
 
diff --git a/boards/cerebot32mx4.json b/boards/cerebot32mx4.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX460F512.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_CEREBOT_32MX4_",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX460F512.ld",
     "mcu": "32MX460F512L",
     "variant": "Cerebot_32MX4"
   },
diff --git a/boards/cerebot32mx7.json b/boards/cerebot32mx7.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX795F512.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_CEREBOT_32MX7_",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX795F512.ld",
     "mcu": "32MX795F512L",
     "variant": "Cerebot_32MX7"
   },
diff --git a/boards/chipkit_cmod.json b/boards/chipkit_cmod.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX150F128.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_CMOD_",
     "f_cpu": "40000000L",
-    "ldscript": "chipKIT-application-32MX150F128.ld",
     "mcu": "32MX150F128D",
     "variant": "Cmod"
   },
diff --git a/boards/chipkit_dp32.json b/boards/chipkit_dp32.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX250F128.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_DP32_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "40000000L",
-    "ldscript": "chipKIT-application-32MX250F128.ld",
     "mcu": "32MX250F128B",
     "variant": "DP32"
   },
diff --git a/boards/chipkit_mx3.json b/boards/chipkit_mx3.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX320F128.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_CEREBOT_MX3CK_",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX320F128.ld",
     "mcu": "32MX320F128H",
     "variant": "Cerebot_MX3cK"
   },
diff --git a/boards/chipkit_pi.json b/boards/chipkit_pi.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX250F128.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_CHIPKIT_PI_",
     "f_cpu": "40000000L",
-    "ldscript": "chipKIT-application-32MX250F128.ld",
     "mcu": "32MX250F128B",
     "variant": "ChipKIT_Pi"
   },
diff --git a/boards/chipkit_pro_mx4.json b/boards/chipkit_pro_mx4.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX460F512.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_CEREBOT_MX4CK_",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX460F512.ld",
     "mcu": "32MX460F512L",
     "variant": "Cerebot_MX4cK"
   },
diff --git a/boards/chipkit_pro_mx7.json b/boards/chipkit_pro_mx7.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX795F512.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_CEREBOT_MX7CK_",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX795F512.ld",
     "mcu": "32MX795F512L",
     "variant": "Cerebot_MX7cK"
   },
diff --git a/boards/chipkit_uc32.json b/boards/chipkit_uc32.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX340F512.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_UC32_",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX340F512.ld",
     "mcu": "32MX340F512H",
     "variant": "uC32"
   },
diff --git a/boards/chipkit_wf32.json b/boards/chipkit_wf32.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX695F512.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_WF32_",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX695F512.ld",
     "mcu": "32MX695F512L",
     "variant": "WF32"
   },
diff --git a/boards/chipkit_wifire.json b/boards/chipkit_wifire.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "MZ-application-32MZ2048ECX.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_WIFIRE_",
     "f_cpu": "200000000L",
-    "ldscript": "MZ-application-32MZ2048ECX.ld",
     "mcu": "32MZ2048ECG100",
     "variant": "WiFire"
   },
diff --git a/boards/chipkit_wifire_revc.json b/boards/chipkit_wifire_revc.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "MZ-application-32MZ2048ECX.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_WIFIRE_",
     "f_cpu": "200000000L",
-    "ldscript": "MZ-application-32MZ2048ECX.ld",
     "mcu": "32MZ2048EFG100",
     "variant": "WiFire"
   },
diff --git a/boards/clicker2.json b/boards/clicker2.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX460F512-uhb.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_CLICKER2_PIC32MX_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX460F512-uhb.ld",
     "mcu": "32MX460F512L",
     "variant": "Clicker2"
   },
diff --git a/boards/cui32.json b/boards/cui32.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX440F512.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_CUI32_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX440F512.ld",
     "mcu": "32MX440F512H",
     "variant": "CUI32"
   },
diff --git a/boards/cui32stem.json b/boards/cui32stem.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX795F512.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_CUI32_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX795F512.ld",
     "mcu": "32MX795F512H",
     "variant": "CUI32stem"
   },
diff --git a/boards/dsmini.json b/boards/dsmini.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX150F128.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_DSMINI_",
     "f_cpu": "40000000L",
-    "ldscript": "chipKIT-application-32MX150F128.ld",
     "mcu": "32MX150F128C",
     "variant": "DSMini"
   },
diff --git a/boards/flipnclickmz.json b/boards/flipnclickmz.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "MZ-application-32MZ2048ECX.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_PIC32MZ_FLIP_N_CLICK_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "252000000L",
-    "ldscript": "MZ-application-32MZ2048ECX.ld",
     "mcu": "32MZ2048EFH100",
     "variant": "FlipNClick_MZ"
   },
diff --git a/boards/fubarino_mini.json b/boards/fubarino_mini.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX250F128.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_FUBARINO_MINI_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "48000000L",
-    "ldscript": "chipKIT-application-32MX250F128.ld",
     "mcu": "32MX250F128D",
     "variant": "Fubarino_Mini"
   },
diff --git a/boards/fubarino_mini_20.json b/boards/fubarino_mini_20.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX270F256.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_FUBARINO_MINI_20_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "48000000L",
-    "ldscript": "chipKIT-application-32MX270F256.ld",
     "mcu": "32MX270F256D",
     "variant": "Fubarino_Mini_20"
   },
diff --git a/boards/fubarino_sd.json b/boards/fubarino_sd.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX795F512.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_FUBARINO_SD_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX795F512.ld",
     "mcu": "32MX795F512H",
     "variant": "Fubarino_SD"
   },
diff --git a/boards/helvepic32.json b/boards/helvepic32.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX250F128.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_HELVEPIC32_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "48000000L",
-    "ldscript": "chipKIT-application-32MX250F128.ld",
     "mcu": "32MX250F128B",
     "variant": "HelvePic32"
   },
diff --git a/boards/helvepic32_breadboardside.json b/boards/helvepic32_breadboardside.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX250F128.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_HELVEPIC32BBS_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "48000000L",
-    "ldscript": "chipKIT-application-32MX250F128.ld",
     "mcu": "32MX250F128B",
     "variant": "HelvePic32BBside"
   },
diff --git a/boards/helvepic32_mx270.json b/boards/helvepic32_mx270.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX270F256.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_HELVEPIC32A_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "48000000L",
-    "ldscript": "chipKIT-application-32MX270F256.ld",
     "mcu": "32MX270F256B",
     "variant": "HelvePic32a"
   },
diff --git a/boards/helvepic32_robot.json b/boards/helvepic32_robot.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX270F256.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_HELVEPIC32_SMDA_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "48000000L",
-    "ldscript": "chipKIT-application-32MX270F256.ld",
     "mcu": "32MX270F256D",
     "variant": "HelveKIT32robot"
   },
diff --git a/boards/helvepic32_smd.json b/boards/helvepic32_smd.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX250F128.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_HELVEPIC32_SMD_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "48000000L",
-    "ldscript": "chipKIT-application-32MX250F128.ld",
     "mcu": "32MX250F128D",
     "variant": "HelvePic32SMD"
   },
diff --git a/boards/helvepic32_smd_mx270.json b/boards/helvepic32_smd_mx270.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX270F256.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_HELVEPIC32_SMDA_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "48000000L",
-    "ldscript": "chipKIT-application-32MX270F256.ld",
     "mcu": "32MX270F256D",
     "variant": "HelvePic32SMDa"
   },
diff --git a/boards/lenny.json b/boards/lenny.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX270F256.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_LENNY_ -DPIO_ARDUINO_ENABLE_USB_HID",
     "f_cpu": "40000000L",
-    "ldscript": "chipKIT-application-32MX270F256.ld",
     "mcu": "32MX270F256D",
     "variant": "Lenny"
   },
diff --git a/boards/mega_pic32.json b/boards/mega_pic32.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX795F512.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_MEGA_",
     "f_cpu": "80000000L",
-    "ldscript": "chipKIT-application-32MX795F512.ld",
     "mcu": "32MX795F512L",
     "variant": "Max32"
   },
diff --git a/boards/nofire.json b/boards/nofire.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "MZ-application-32MZ2048ECX.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_PONTECH_NOFIRE_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
     "f_cpu": "200000000UL",
-    "ldscript": "MZ-application-32MZ2048ECX.ld",
     "mcu": "32MZ2048EFG100",
     "variant": "PONTECH_NoFire"
   },
diff --git a/boards/openbci.json b/boards/openbci.json
@@ -1,9 +1,11 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "chipKIT-application-32MX250F128.ld"
+    },
     "core": "pic32",
     "extra_flags": "-D_BOARD_DP32_",
     "f_cpu": "40000000L",
-    "ldscript": "chipKIT-application-32MX250F128.ld",
     "mcu": "32MX250F128B",
     "variant": "OpenBCI"
   },
diff --git a/boards/openscope.json b/boards/openscope.json
diff --git a/boards/picadillo_35t.json b/boards/picadillo_35t.json
diff --git a/boards/pinguino32.json b/boards/pinguino32.json
diff --git a/boards/quick240_usb.json b/boards/quick240_usb.json
diff --git a/boards/rgb_station.json b/boards/rgb_station.json
diff --git a/boards/ubw32_mx460.json b/boards/ubw32_mx460.json
diff --git a/boards/ubw32_mx795.json b/boards/ubw32_mx795.json
diff --git a/boards/uno_pic32.json b/boards/uno_pic32.json
diff --git a/boards/usbono_pic32.json b/boards/usbono_pic32.json
diff --git a/builder/main.py b/builder/main.py
diff --git a/platform.json b/platform.json
