Merge branch 'feature/openocd-update' into develop

Author: ivankravets

builder/main.py

@@ -371,13 +371,13 @@ def __fetch_spiffs_size(target, source, env):
         debug_tools.get(upload_protocol).get("server").get("arguments", []))
     openocd_args.extend([
         "-c",
-        "program_esp32 {{$SOURCE}} %s verify" %
+        "program_esp {{$SOURCE}} %s verify" %
         board.get("upload.offset_address", "0x10000")
     ])
     for image in env.get("FLASH_EXTRA_IMAGES", []):
         openocd_args.extend([
             "-c",
-            'program_esp32 {{%s}} %s verify' %
+            'program_esp {{%s}} %s verify' %
             (_to_unix_slashes(image[1]), image[0])
         ])
     openocd_args.extend(["-c", "reset run; shutdown"])

platform.json

@@ -114,7 +114,7 @@
       "type": "debugger",
       "optional": true,
       "owner": "platformio",
-      "version": "~1.1000.20181026"
+      "version": "~2.1000.0"
     },
     "tool-mkspiffs": {
       "type": "uploader",

platform.py

@@ -124,7 +124,8 @@ def _add_dynamic_options(self, board):
             server_args = [
                 "-s", "$PACKAGE_DIR/share/openocd/scripts",
                 "-f", "interface/%s.cfg" % openocd_interface,
-                "-f", "board/%s" % debug.get("openocd_board")
+                "-f", "board/%s" % debug.get("openocd_board"),
+                "-c", "adapter_khz %d" % debug.get("adapter_speed", 20000)
             ]
 
             debug['tools'][link] = {
@@ -167,13 +168,13 @@ def configure_debug_options(self, initial_debug_options, ide_data):
 
         debug_options = copy.deepcopy(initial_debug_options)
         load_cmds = [
-            'monitor program_esp32 "{{{path}}}" {offset} verify'.format(
+            'monitor program_esp "{{{path}}}" {offset} verify'.format(
                 path=fs.to_unix_path(item["path"]), offset=item["offset"]
             )
             for item in flash_images
         ]
         load_cmds.append(
-            'monitor program_esp32 "{%s.bin}" 0x10000 verify'
+            'monitor program_esp "{%s.bin}" 0x10000 verify'
             % fs.to_unix_path(ide_data["prog_path"][:-4])
         )
         debug_options["load_cmds"] = load_cmds