platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-08-01 19:04:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109 from valeros/develop

Browse Source 
Add "require_upload_port" board option // Resolve #107
This commit is contained in:
Ivan Kravets
2015-03-04 15:07:04 +02:00
parent f058506bc4 abf0f2d5d6
commit c55f4d35ba
8 changed files with 172 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platformio/boards/adafruit.json
View File

@@ -18,6 +18,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": false "wait_for_upload_port": false
@@ -55,8 +56,8 @@
"platform": "atmelavr", "platform": "atmelavr",
"upload": { "upload": {
"maximum_ram_size": 512, "maximum_ram_size": 512,
"protocol": "usbtiny", "maximum_size": 8192,
"maximum_size": 8192 "protocol": "usbtiny"
} }
}, },
@@ -74,8 +75,7 @@
"upload": { "upload": {
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "usbtiny", "protocol": "usbtiny"
"speed": 115200
} }
}, },
@@ -93,8 +93,7 @@
"upload": { "upload": {
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "usbtiny", "protocol": "usbtiny"
"speed": 115200
} }
}, },
"protrinket3ftdi": { "protrinket3ftdi": {
@@ -112,6 +111,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 115200 "speed": 115200
} }
}, },
@@ -130,6 +130,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 115200 "speed": 115200
} }
} }

59
platformio/boards/arduino.json
View File

@@ -18,6 +18,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": true "wait_for_upload_port": true
@@ -38,6 +39,7 @@
"maximum_ram_size": 1024, "maximum_ram_size": 1024,
"maximum_size": 14336, "maximum_size": 14336,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 19200 "speed": 19200
} }
}, },
@@ -56,6 +58,7 @@
"maximum_ram_size": 1024, "maximum_ram_size": 1024,
"maximum_size": 7168, "maximum_size": 7168,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 19200 "speed": 19200
} }
}, },
@@ -75,6 +78,7 @@
"maximum_ram_size": 1024, "maximum_ram_size": 1024,
"maximum_size": 14336, "maximum_size": 14336,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 19200 "speed": 19200
} }
}, },
@@ -94,6 +98,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 19200 "speed": 19200
} }
}, },
@@ -112,6 +117,7 @@
"maximum_ram_size": 1024, "maximum_ram_size": 1024,
"maximum_size": 14336, "maximum_size": 14336,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 19200 "speed": 19200
} }
}, },
@@ -130,6 +136,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 30720, "maximum_size": 30720,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 57600 "speed": 57600
} }
}, },
@@ -152,6 +159,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": true "wait_for_upload_port": true
@@ -172,6 +180,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 32256, "maximum_size": 32256,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 115200 "speed": 115200
} }
}, },
@@ -190,6 +199,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 30720, "maximum_size": 30720,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 57600 "speed": 57600
} }
}, },
@@ -212,6 +222,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": true "wait_for_upload_port": true
@@ -232,6 +243,7 @@
"maximum_ram_size": 1024, "maximum_ram_size": 1024,
"maximum_size": 14336, "maximum_size": 14336,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 19200 "speed": 19200
} }
}, },
@@ -250,6 +262,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 30720, "maximum_size": 30720,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 57600 "speed": 57600
} }
}, },
@@ -268,6 +281,7 @@
"maximum_ram_size": 8192, "maximum_ram_size": 8192,
"maximum_size": 253952, "maximum_size": 253952,
"protocol": "wiring", "protocol": "wiring",
"require_upload_port" : true,
"speed": 115200 "speed": 115200
} }
}, },
@@ -286,6 +300,7 @@
"maximum_ram_size": 8192, "maximum_ram_size": 8192,
"maximum_size": 126976, "maximum_size": 126976,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 57600 "speed": 57600
} }
}, },
@@ -304,6 +319,7 @@
"maximum_ram_size": 8192, "maximum_ram_size": 8192,
"maximum_size": 253952, "maximum_size": 253952,
"protocol": "wiring", "protocol": "wiring",
"require_upload_port" : true,
"speed": 115200 "speed": 115200
} }
}, },
@@ -326,6 +342,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": true "wait_for_upload_port": true
@@ -346,6 +363,7 @@
"maximum_ram_size": 1024, "maximum_ram_size": 1024,
"maximum_size": 14336, "maximum_size": 14336,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 19200 "speed": 19200
} }
}, },
@@ -364,6 +382,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 115200 "speed": 115200
} }
}, },
@@ -382,6 +401,7 @@
"maximum_ram_size": 1024, "maximum_ram_size": 1024,
"maximum_size": 14336, "maximum_size": 14336,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 19200 "speed": 19200
} }
}, },
@@ -400,6 +420,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 30720, "maximum_size": 30720,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 57600 "speed": 57600
} }
}, },
@@ -418,6 +439,7 @@
"maximum_ram_size": 1024, "maximum_ram_size": 1024,
"maximum_size": 14336, "maximum_size": 14336,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 19200 "speed": 19200
} }
}, },
@@ -436,6 +458,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 30720, "maximum_size": 30720,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 57600 "speed": 57600
} }
}, },
@@ -454,6 +477,7 @@
"maximum_ram_size": 1024, "maximum_ram_size": 1024,
"maximum_size": 14336, "maximum_size": 14336,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 19200 "speed": 19200
} }
}, },
@@ -472,6 +496,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 30720, "maximum_size": 30720,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 57600 "speed": 57600
} }
}, },
@@ -494,6 +519,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": true "wait_for_upload_port": true
@@ -518,6 +544,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": true "wait_for_upload_port": true
@@ -538,6 +565,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 32256, "maximum_size": 32256,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 115200 "speed": 115200
} }
}, },
@@ -560,6 +588,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"via_ssh": true, "via_ssh": true,
@@ -587,9 +616,35 @@
"maximum_ram_size": 28672, "maximum_ram_size": 28672,
"maximum_size": 524288, "maximum_size": 524288,
"protocol": "sam-ba", "protocol": "sam-ba",
"speed": 57600, "require_upload_port" : true,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": false "wait_for_upload_port": true
}
},
"dueUSB": {
"build": {
"core": "arduino",
"extra_flags": "-D__SAM3X8E__ -DARDUINO_SAM_DUE -DARDUINO_ARCH_SAM",
"f_cpu": "84000000L",
"mcu": "at91sam3x8e",
"cpu": "cortex-m3",
"pid": "0x003e",
"usb_product": "Arduino Due",
"variant": "arduino_due_x",
"vid": "0x2341",
"ldscript": "sam3x8e.ld"
},
"framework": "arduino",
"name": "Arduino Due (USB Native Port)",
"platform": "atmelsam",
"upload": {
"disable_flushing": true,
"maximum_ram_size": 28672,
"maximum_size": 524288,
"protocol": "sam-ba",
"require_upload_port" : true,
"use_1200bps_touch": true,
"wait_for_upload_port": true
} }
} }
} }

31
platformio/boards/digistump.json
View File

@@ -8,15 +8,12 @@
"variant": "digispark_tiny" "variant": "digispark_tiny"
}, },
"framework": "arduino", "framework": "arduino",
"name": "Digispark (Default - 16.5mhz)", "name": "Digispark (Default - 16 MHz)",
"platform": "atmelavr", "platform": "atmelavr",
"upload": { "upload": {
"disable_flushing": false,
"maximum_ram_size": 512, "maximum_ram_size": 512,
"maximum_size": 6012, "maximum_size": 6012,
"protocol": "digispark", "protocol": "digispark"
"use_1200bps_touch": false,
"wait_for_upload_port": false
} }
}, },
"digispark-pro": { "digispark-pro": {
@@ -28,15 +25,12 @@
"variant": "digispark_pro" "variant": "digispark_pro"
}, },
"framework": "arduino", "framework": "arduino",
"name": "Digispark Pro (Default 16 Mhz)", "name": "Digispark Pro (Default 16 MHz)",
"platform": "atmelavr", "platform": "atmelavr",
"upload": { "upload": {
"disable_flushing": false,
"maximum_ram_size": 512, "maximum_ram_size": 512,
"maximum_size": 14844, "maximum_size": 14844,
"protocol": "digispark", "protocol": "digispark"
"use_1200bps_touch": false,
"wait_for_upload_port": false
} }
}, },
"digispark-pro32": { "digispark-pro32": {
@@ -48,15 +42,12 @@
"variant": "digispark_pro32" "variant": "digispark_pro32"
}, },
"framework": "arduino", "framework": "arduino",
"name": "Digispark Pro (16 Mhz) (32 byte buffer)", "name": "Digispark Pro (16 MHz) (32 byte buffer)",
"platform": "atmelavr", "platform": "atmelavr",
"upload": { "upload": {
"disable_flushing": false,
"maximum_ram_size": 512, "maximum_ram_size": 512,
"maximum_size": 14844, "maximum_size": 14844,
"protocol": "digispark", "protocol": "digispark"
"use_1200bps_touch": false,
"wait_for_upload_port": false
} }
}, },
"digispark-pro64": { "digispark-pro64": {
@@ -68,15 +59,12 @@
"variant": "digispark_pro64" "variant": "digispark_pro64"
}, },
"framework": "arduino", "framework": "arduino",
"name": "Digispark Pro (16 Mhz) (64 byte buffer)", "name": "Digispark Pro (16 MHz) (64 byte buffer)",
"platform": "atmelavr", "platform": "atmelavr",
"upload": { "upload": {
"disable_flushing": false,
"maximum_ram_size": 512, "maximum_ram_size": 512,
"maximum_size": 14844, "maximum_size": 14844,
"protocol": "digispark", "protocol": "digispark"
"use_1200bps_touch": false,
"wait_for_upload_port": false
} }
}, },
"digix": { "digix": {
@@ -96,10 +84,11 @@
"name": "Digistump DigiX", "name": "Digistump DigiX",
"platform": "atmelsam", "platform": "atmelsam",
"upload": { "upload": {
"disable_flushing": false, "disable_flushing": true,
"maximum_ram_size": 28672, "maximum_ram_size": 28672,
"maximum_size": 524288, "maximum_size": 524288,
"protocol": "sam-ba", "protocol": "sam-ba",
"require_upload_port" : true,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": true "wait_for_upload_port": true
} }

3
platformio/boards/engduino.json
View File

@@ -18,6 +18,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": true "wait_for_upload_port": true
@@ -42,6 +43,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": true "wait_for_upload_port": true
@@ -66,6 +68,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": true "wait_for_upload_port": true

9
platformio/boards/microduino.json
View File

@@ -14,6 +14,7 @@
"maximum_ram_size": 16384, "maximum_ram_size": 16384,
"maximum_size": 130048, "maximum_size": 130048,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 115200 "speed": 115200
} }
}, },
@@ -32,6 +33,7 @@
"maximum_ram_size": 16384, "maximum_ram_size": 16384,
"maximum_size": 130048, "maximum_size": 130048,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 57600 "speed": 57600
} }
}, },
@@ -50,6 +52,7 @@
"maximum_ram_size": 1024, "maximum_ram_size": 1024,
"maximum_size": 15872, "maximum_size": 15872,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 115200 "speed": 115200
} }
}, },
@@ -68,6 +71,7 @@
"maximum_ram_size": 1024, "maximum_ram_size": 1024,
"maximum_size": 15872, "maximum_size": 15872,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 57600 "speed": 57600
} }
}, },
@@ -86,6 +90,7 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 32256, "maximum_size": 32256,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 115200 "speed": 115200
} }
}, },
@@ -103,6 +108,7 @@
"upload": { "upload": {
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 32256, "maximum_size": 32256,
"require_upload_port" : true,
"protocol": "arduino", "protocol": "arduino",
"speed": 57600 "speed": 57600
} }
@@ -125,6 +131,7 @@
"maximum_ram_size": 2560, "maximum_ram_size": 2560,
"maximum_size": 28672, "maximum_size": 28672,
"protocol": "avr109", "protocol": "avr109",
"require_upload_port" : true,
"speed": 57600, "speed": 57600,
"use_1200bps_touch": true, "use_1200bps_touch": true,
"wait_for_upload_port": true "wait_for_upload_port": true
@@ -145,6 +152,7 @@
"maximum_ram_size": 4096, "maximum_ram_size": 4096,
"maximum_size": 64512, "maximum_size": 64512,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 115200 "speed": 115200
} }
}, },
@@ -163,6 +171,7 @@
"maximum_ram_size": 4096, "maximum_ram_size": 4096,
"maximum_size": 64512, "maximum_size": 64512,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 57600 "speed": 57600
} }
} }

53
platformio/boards/misc.json
View File

@@ -14,7 +14,60 @@
"maximum_ram_size": 2048, "maximum_ram_size": 2048,
"maximum_size": 30720, "maximum_size": 30720,
"protocol": "arduino", "protocol": "arduino",
"require_upload_port" : true,
"speed": 57600 "speed": 57600
} }
},
"sainSmartDue": {
"build": {
"core": "arduino",
"extra_flags": "-D__SAM3X8E__ -DARDUINO_SAM_DUE -DARDUINO_ARCH_SAM",
"f_cpu": "84000000L",
"mcu": "at91sam3x8e",
"cpu": "cortex-m3",
"pid": "0x003e",
"usb_product": "Arduino Due",
"variant": "arduino_due_x",
"vid": "0x2341",
"ldscript": "sam3x8e.ld"
},
"framework": "arduino",
"name": "SainSmart Due (Programming Port)",
"platform": "atmelsam",
"upload": {
"disable_flushing": true,
"maximum_ram_size": 28672,
"maximum_size": 524288,
"protocol": "sam-ba",
"require_upload_port" : true,
"use_1200bps_touch": true,
"wait_for_upload_port": true
}
},
"sainSmartDueUSB": {
"build": {
"core": "arduino",
"extra_flags": "-D__SAM3X8E__ -DARDUINO_SAM_DUE -DARDUINO_ARCH_SAM",
"f_cpu": "84000000L",
"mcu": "at91sam3x8e",
"cpu": "cortex-m3",
"pid": "0x003e",
"usb_product": "Arduino Due",
"variant": "arduino_due_x",
"vid": "0x2341",
"ldscript": "sam3x8e.ld"
},
"framework": "arduino",
"name": "SainSmart Due (USB Native Port)",
"platform": "atmelsam",
"upload": {
"disable_flushing": true,
"maximum_ram_size": 28672,
"maximum_size": 524288,
"protocol": "sam-ba",
"require_upload_port" : true,
"use_1200bps_touch": true,
"wait_for_upload_port": true
}
} }
} }

22
platformio/builder/scripts/atmelavr.py
View File

@@ -20,15 +20,15 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621
with open(path, "w") as f: with open(path, "w") as f:
f.write(str(value)) f.write(str(value))
if "usb" not in env.subst("$UPLOAD_PROTOCOL"): upload_options = env.get("BOARD_OPTIONS", {}).get("upload", {})
env.AutodetectUploadPort()
env.Append(
UPLOADERFLAGS=[
"-b", "$UPLOAD_SPEED",
"-P", "$UPLOAD_PORT"
]
)
if env.subst("$UPLOAD_SPEED"):
env.Append(UPLOADERFLAGS=["-b", "$UPLOAD_SPEED"])
if not upload_options.get("require_upload_port", False):
return
env.AutodetectUploadPort()
env.Append(UPLOADERFLAGS=["-P", "$UPLOAD_PORT"])
if env.subst("$BOARD") == "raspduino": if env.subst("$BOARD") == "raspduino":
_rpi_sysgpio("/sys/class/gpio/export", 18) _rpi_sysgpio("/sys/class/gpio/export", 18)
_rpi_sysgpio("/sys/class/gpio/gpio18/direction", "out") _rpi_sysgpio("/sys/class/gpio/gpio18/direction", "out")
@@ -36,9 +36,7 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621
sleep(0.1) sleep(0.1)
_rpi_sysgpio("/sys/class/gpio/gpio18/value", 0) _rpi_sysgpio("/sys/class/gpio/gpio18/value", 0)
_rpi_sysgpio("/sys/class/gpio/unexport", 18) _rpi_sysgpio("/sys/class/gpio/unexport", 18)
elif "UPLOAD_PORT" in env: else:
upload_options = env.get("BOARD_OPTIONS", {}).get("upload", {})
if not upload_options.get("disable_flushing", False): if not upload_options.get("disable_flushing", False):
env.FlushSerialBuffer("$UPLOAD_PORT") env.FlushSerialBuffer("$UPLOAD_PORT")
@@ -63,7 +61,7 @@ if "digispark" in env.get(
"-c", "$UPLOAD_PROTOCOL", "-c", "$UPLOAD_PROTOCOL",
"--timeout", "60" "--timeout", "60"
], ],
UPLOADHEXCMD='"$UPLOADER" $UPLOADERFLAGS -U flash:w:$SOURCES:i' UPLOADHEXCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'
) )
else: else:

23
platformio/builder/scripts/atmelsam.py
View File

@@ -10,10 +10,33 @@ from os.path import join
from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Default, from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Default,
DefaultEnvironment, SConscript) DefaultEnvironment, SConscript)
from platformio.util import get_serialports
def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621 def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621
env.AutodetectUploadPort() env.AutodetectUploadPort()
board_type = env.subst("$BOARD")
env.Append(
UPLOADERFLAGS=[
"-U",
"true" if "usb" in board_type.lower(
) or board_type == "digix" else "false"
])
upload_options = env.get("BOARD_OPTIONS", {}).get("upload", {})
if not upload_options.get("disable_flushing", False):
env.FlushSerialBuffer("$UPLOAD_PORT")
before_ports = [i['port'] for i in get_serialports()]
if upload_options.get("use_1200bps_touch", False):
env.TouchSerialPort("$UPLOAD_PORT", 1200)
if upload_options.get("wait_for_upload_port", False):
env.Replace(UPLOAD_PORT=env.WaitForNewSerialPort(before_ports))
env = DefaultEnvironment() env = DefaultEnvironment()