Skip to content

Commit

Permalink
Fix issue uploading with windows 10 by using good-old feather_dfu
Browse files Browse the repository at this point in the history
  • Loading branch information
hathach committed Aug 3, 2017
1 parent f8b10b9 commit 5f48127
Show file tree
Hide file tree
Showing 25 changed files with 21 additions and 25 deletions.
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 0.6.6

- Fix issue uploading with windows 10 by using good-old feather_dfu

# 0.6.5

## Arduino
Expand Down
2 changes: 1 addition & 1 deletion cores/maple/libmaple/adafruit_featherlib.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

//------------- Arduino Shared Structure -------------//
#define CFG_ARDUINO_CODE_MAGIC 0xDEC0DED
#define CFG_ARDUINO_CODE_VERSION "0.6.5"
#define CFG_ARDUINO_CODE_VERSION "0.6.6"

#define RESERVED_ XSTRING_CONCAT_(_rerserved, __LINE__)

Expand Down
2 changes: 1 addition & 1 deletion libraries/AdafruitWicedExamples/library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Adafruit WICED Examples
version=0.6.5
version=0.6.6
author=Adafruit
maintainer=Adafruit <[email protected]>
sentence=Adafruit WICED Feather Examples
Expand Down
38 changes: 15 additions & 23 deletions platform.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification

name=Adafruit WICED (STM32F2 ARM Cortex M3) Boards
version=0.6.5
version=0.6.6

# compiler variables
# ----------------------
Expand Down Expand Up @@ -97,33 +97,25 @@ recipe.size.regex.data=^(?:\.data|\.bss|\.noinit)\s+([0-9]+).*
# Uploader tools
# -------------------

# Upload using wiced_dfu, Macos/Linux require to install libusb-1.0 and dfu-util
# Upload using wiced_dfu, Macos/Linux require to install libusb-1.0 and dfu-util

tools.adafruit_upload.path={runtime.tools.wiced_dfu.path}
tools.adafruit_upload.cmd=wiced_dfu
tools.adafruit_upload.cmd.windows=wiced_dfu.exe
tools.adafruit_upload.dfu_util=

# feather_dfu (obsolete) Still used by windows, since wiced_dfu has driver
# issue with window 10. Will be removed when figuring out the issue

tools.adafruit_upload.path.windows={runtime.platform.path}/tools/win32-x86
tools.adafruit_upload.cmd.windows=feather_dfu/feather_dfu.exe
tools.adafruit_upload.dfu_util.windows=-u "{path}/dfu-util/dfu-util-static.exe"

tools.adafruit_upload.upload.params.verbose=-v
tools.adafruit_upload.upload.params.quiet=
tools.adafruit_upload.upload.pattern="{path}/{cmd}" {upload.subcommand} "{upload.binfile}"

# Obsolete tool (for reference)
# Upload using Adafruit bootloader over DFU.
# Default values require python, dfu-util, and all script dependencies to be
# installed and in the path.
#tools.adafruit_upload.python=python
#tools.adafruit_upload.cmd=feather_dfu/feather_dfu.py
#tools.adafruit_upload.path={runtime.platform.path}/tools/obsolete/source
#tools.adafruit_upload.dfu_util=
#tools.adafruit_upload.upload.params.verbose=-v
#tools.adafruit_upload.upload.params.quiet=
#tools.adafruit_upload.upload.pattern={python} "{path}/{cmd}" {dfu_util} {upload.subcommand} "{upload.binfile}"

# Windows overrides to use a pre-built feather_dfu.exe & dfu-util.exe that
# bundle in python and all dependencies.
#tools.adafruit_upload.python.windows=
#tools.adafruit_upload.cmd.windows=feather_dfu/feather_dfu.exe
#tools.adafruit_upload.path.windows={runtime.platform.path}/tools/obsolete/win32-x86
#tools.adafruit_upload.dfu_util.windows=-u "{path}/dfu-util/dfu-util-static.exe"
tools.adafruit_upload.upload.pattern="{path}/{cmd}" {dfu_util} {upload.subcommand} "{upload.binfile}"

# Manual Git core development may need to uncomment this, and make alias to wiced_dfu to your /username/bin
#tools.adafruit_upload.upload.pattern="{cmd}" {dfu_util} {upload.subcommand} "{upload.binfile}"

# Adalink Programmer/Uploader tools
# -------------------
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 5f48127

Please sign in to comment.