Force forward slash for paths for openocd-esp32, new board D-duino-32 (#139)
* Force forward slash for paths for openocd-esp32 fixes #136 * adding D-duino-32 board type. This board has a built in OLED and non-standard SCL/SDA pins.
This commit is contained in:
@@ -0,0 +1,49 @@
|
||||
{
|
||||
"build": {
|
||||
"core": "esp32",
|
||||
"extra_flags": "-DARDUINO_D_DUINO_32",
|
||||
"f_cpu": "240000000L",
|
||||
"f_flash": "40000000L",
|
||||
"flash_mode": "dio",
|
||||
"ldscript": "esp32_out.ld",
|
||||
"mcu": "esp32",
|
||||
"variant": "d-duino-32"
|
||||
},
|
||||
"connectivity": [
|
||||
"wifi",
|
||||
"bluetooth",
|
||||
"ethernet",
|
||||
"can"
|
||||
],
|
||||
"debug": {
|
||||
"openocd_board": "esp-wroom-32.cfg"
|
||||
},
|
||||
"frameworks": [
|
||||
"arduino",
|
||||
"espidf"
|
||||
],
|
||||
"name": "D-duino-32",
|
||||
"upload": {
|
||||
"flash_size": "4MB",
|
||||
"maximum_ram_size": 327680,
|
||||
"maximum_size": 4194304,
|
||||
"protocol": "esptool",
|
||||
"protocols": [
|
||||
"esptool",
|
||||
"esp-prog",
|
||||
"jlink",
|
||||
"olimex-arm-usb-tiny-h",
|
||||
"olimex-arm-usb-ocd-h",
|
||||
"olimex-arm-usb-ocd",
|
||||
"olimex-jtag-tiny",
|
||||
"iot-bus-jtag",
|
||||
"tumpa",
|
||||
"minimodule"
|
||||
],
|
||||
"require_upload_port": true,
|
||||
"speed": 921600
|
||||
},
|
||||
"url": "https://www.tindie.com/products/lspoplove/dstike-d-duino-32-v3/",
|
||||
"vendor": "DSTIKE"
|
||||
}
|
||||
|
||||
+3
-3
@@ -304,17 +304,17 @@ if upload_protocol == "esptool":
|
||||
|
||||
elif upload_protocol in debug_tools:
|
||||
openocd_dir = platform.get_package_dir("tool-openocd-esp32") or ""
|
||||
uploader_flags = ["-s", openocd_dir]
|
||||
uploader_flags = ["-s", openocd_dir.replace('\\', '/')]
|
||||
uploader_flags.extend(
|
||||
debug_tools.get(upload_protocol).get("server").get("arguments", []))
|
||||
uploader_flags.extend(["-c", 'program_esp32 "{{$SOURCE}}" 0x10000 verify'])
|
||||
for image in env.get("FLASH_EXTRA_IMAGES", []):
|
||||
uploader_flags.extend(
|
||||
["-c", 'program_esp32 "%s" %s verify' % (image[1], image[0])])
|
||||
["-c", 'program_esp32 "%s" %s verify' % (image[1].replace('\\', '/'), image[0].replace('\\', '/'))])
|
||||
uploader_flags.extend(["-c", "reset run; shutdown"])
|
||||
for i, item in enumerate(uploader_flags):
|
||||
if "$PACKAGE_DIR" in item:
|
||||
uploader_flags[i] = item.replace("$PACKAGE_DIR", openocd_dir)
|
||||
uploader_flags[i] = item.replace("$PACKAGE_DIR", openocd_dir.replace('\\', '/'))
|
||||
|
||||
env.Replace(
|
||||
UPLOADER="openocd",
|
||||
|
||||
Reference in New Issue
Block a user