Merge branch 'release/v2.0.0'

appveyor.yml

@@ -19,7 +19,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://.
 

boards/qchip.json

@@ -0,0 +1,32 @@
+{
+    "build": {
+      "core": "esp32",
+      "extra_flags": "-DARDUINO_HELTEC_WIFI_KIT_32",
+      "f_cpu": "240000000L",
+      "f_flash": "40000000L",
+      "flash_mode": "dio",
+      "ldscript": "esp32_out.ld",
+      "mcu": "esp32",
+      "variant": "heltec_wifi_kit_32"
+    },
+    "connectivity": [
+      "wifi",
+      "bluetooth",
+      "ethernet",
+      "can"
+    ],
+    "frameworks": [
+      "arduino",
+      "espidf"
+    ],
+    "name": "Qchip",
+    "upload": {
+      "flash_size": "4MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 4194304,
+      "require_upload_port": true,
+      "speed": 460800
+    },
+    "url": "http://qmobot.com/",
+    "vendor": "Qmobot LLP"
+  }

boards/ttgo-lora32-v1.json

@@ -30,6 +30,6 @@
     "require_upload_port": true,
     "speed": 460800
   },
-  "url": "https://www.google.com.ua/search?q=TTGO+LoRa32-OLED+V1",
+  "url": "https://github.com/Xinyuan-LilyGO/TTGO-LoRa-Series",
   "vendor": "TTGO"
 }

builder/frameworks/_embed_files.py

@@ -94,7 +94,7 @@ def embed_files(files, files_type):
         if files_type == "embed_txtfiles":
             env.AddPreAction(file_target, prepare_file)
             env.AddPostAction(file_target, revert_original_file)
-        env.Append(PIOBUILDFILES=[env.File(join("$BUILD_DIR", filename))])
+        env.AppendUnique(PIOBUILDFILES=[env.File(join("$BUILD_DIR", filename))])
 
 
 env.Append(

platform.json

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif32.git"
   },
-  "version": "1.11.1",
+  "version": "2.0.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json",

platform.py

@@ -102,16 +102,16 @@ class Espressif32Platform(PlatformBase):
                 "init_break": "thb app_main",
                 "init_cmds": [
                     "define pio_reset_halt_target",
-                    "   mon reset halt",
+                    "   monitor reset halt",
                     "   flushregs",
                     "end",
-                    "define pio_reset_target",
-                    "   mon reset",
+                    "define pio_reset_run_target",
+                    "   monitor reset",
                     "end",
                     "target extended-remote $DEBUG_PORT",
-                    "$INIT_BREAK",
-                    "$LOAD_CMD",
-                    "pio_reset_halt_target"
+                    "$LOAD_CMDS",
+                    "pio_reset_halt_target",
+                    "$INIT_BREAK"
                 ],
                 "onboard": link in debug.get("onboard_tools", []),
                 "default": link == debug.get("default_tool")