Fix uploading to USB-native boards using SAMBA // Resolve #10 Resolve #…

…11
platformio · Apr 10, 2017 · f8abe99 · f8abe99
1 parent a3a7a73
commit f8abe99
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 2 deletions.
diff --git a/boards/adafruit_circuitplayground_m0.json b/boards/adafruit_circuitplayground_m0.json
@@ -27,6 +27,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/adafruit_feather_m0_usb.json b/boards/adafruit_feather_m0_usb.json
@@ -28,6 +28,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/digix.json b/boards/digix.json
@@ -23,6 +23,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 28672,
     "maximum_size": 524288,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/due.json b/boards/due.json
@@ -32,6 +32,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 524288,
+    "native_usb": false,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/dueUSB.json b/boards/dueUSB.json
@@ -28,6 +28,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 524288,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/mkr1000USB.json b/boards/mkr1000USB.json
@@ -35,6 +35,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/mkrfox1200.json b/boards/mkrfox1200.json
@@ -27,6 +27,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/mkrzero.json b/boards/mkrzero.json
@@ -27,6 +27,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/sainSmartDue.json b/boards/sainSmartDue.json
@@ -23,6 +23,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 524288,
+    "native_usb": false,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/sainSmartDueUSB.json b/boards/sainSmartDueUSB.json
@@ -24,6 +24,7 @@
     "maximum_ram_size": 32768,
     "maximum_size": 524288,
     "protocol": "sam-ba",
+    "native_usb": true,
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true

diff --git a/boards/sodaq_autonomo.json b/boards/sodaq_autonomo.json
@@ -28,6 +28,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/sodaq_explorer.json b/boards/sodaq_explorer.json
@@ -28,6 +28,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/sodaq_one.json b/boards/sodaq_one.json
@@ -28,6 +28,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/sodaq_wdt.json b/boards/sodaq_wdt.json
@@ -28,6 +28,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/sparkfun_samd21_dev_usb.json b/boards/sparkfun_samd21_dev_usb.json
@@ -27,6 +27,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/sparkfun_samd21_mini_usb.json b/boards/sparkfun_samd21_mini_usb.json
@@ -27,6 +27,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/boards/zeroUSB.json b/boards/zeroUSB.json
@@ -31,6 +31,7 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 262144,
+    "native_usb": true,
     "protocol": "sam-ba",
     "require_upload_port": true,
     "use_1200bps_touch": true,

diff --git a/builder/main.py b/builder/main.py
@@ -191,8 +191,8 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
             "--verify",
             "--reset",
             "-U",
-            "true" if ("usb" in env.subst("$BOARD").lower(
-            ) or env.subst("$BOARD") == "digix") else "false"
+            "true" if env.BoardConfig().get(
+                "upload.native_usb", False) else "false"
         ],
 
         UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'