diff --git a/changelog.md b/changelog.md index 64471fb..40ff77c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +# 0.6.6 + +- Fix issue uploading with windows 10 by using good-old feather_dfu + # 0.6.5 ## Arduino diff --git a/cores/maple/libmaple/adafruit_featherlib.h b/cores/maple/libmaple/adafruit_featherlib.h index 928dbe8..8748a41 100644 --- a/cores/maple/libmaple/adafruit_featherlib.h +++ b/cores/maple/libmaple/adafruit_featherlib.h @@ -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__) diff --git a/libraries/AdafruitWicedExamples/library.properties b/libraries/AdafruitWicedExamples/library.properties index d4d349a..3703cdb 100644 --- a/libraries/AdafruitWicedExamples/library.properties +++ b/libraries/AdafruitWicedExamples/library.properties @@ -1,5 +1,5 @@ name=Adafruit WICED Examples -version=0.6.5 +version=0.6.6 author=Adafruit maintainer=Adafruit sentence=Adafruit WICED Feather Examples diff --git a/platform.txt b/platform.txt index 49ff111..5e6b73c 100644 --- a/platform.txt +++ b/platform.txt @@ -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 # ---------------------- @@ -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 # ------------------- diff --git a/tools/obsolete/win32-x86/dfu-util/dfu-prefix.exe b/tools/win32-x86/dfu-util/dfu-prefix.exe similarity index 100% rename from tools/obsolete/win32-x86/dfu-util/dfu-prefix.exe rename to tools/win32-x86/dfu-util/dfu-prefix.exe diff --git a/tools/obsolete/win32-x86/dfu-util/dfu-suffix.exe b/tools/win32-x86/dfu-util/dfu-suffix.exe similarity index 100% rename from tools/obsolete/win32-x86/dfu-util/dfu-suffix.exe rename to tools/win32-x86/dfu-util/dfu-suffix.exe diff --git a/tools/obsolete/win32-x86/dfu-util/dfu-util-static.exe b/tools/win32-x86/dfu-util/dfu-util-static.exe similarity index 100% rename from tools/obsolete/win32-x86/dfu-util/dfu-util-static.exe rename to tools/win32-x86/dfu-util/dfu-util-static.exe diff --git a/tools/obsolete/win32-x86/dfu-util/dfu-util.exe b/tools/win32-x86/dfu-util/dfu-util.exe similarity index 100% rename from tools/obsolete/win32-x86/dfu-util/dfu-util.exe rename to tools/win32-x86/dfu-util/dfu-util.exe diff --git a/tools/obsolete/win32-x86/dfu-util/libusb-1.0.dll b/tools/win32-x86/dfu-util/libusb-1.0.dll similarity index 100% rename from tools/obsolete/win32-x86/dfu-util/libusb-1.0.dll rename to tools/win32-x86/dfu-util/libusb-1.0.dll diff --git a/tools/obsolete/win32-x86/feather_dfu/_ctypes.pyd b/tools/win32-x86/feather_dfu/_ctypes.pyd similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/_ctypes.pyd rename to tools/win32-x86/feather_dfu/_ctypes.pyd diff --git a/tools/obsolete/win32-x86/feather_dfu/_hashlib.pyd b/tools/win32-x86/feather_dfu/_hashlib.pyd similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/_hashlib.pyd rename to tools/win32-x86/feather_dfu/_hashlib.pyd diff --git a/tools/obsolete/win32-x86/feather_dfu/_socket.pyd b/tools/win32-x86/feather_dfu/_socket.pyd similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/_socket.pyd rename to tools/win32-x86/feather_dfu/_socket.pyd diff --git a/tools/obsolete/win32-x86/feather_dfu/_ssl.pyd b/tools/win32-x86/feather_dfu/_ssl.pyd similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/_ssl.pyd rename to tools/win32-x86/feather_dfu/_ssl.pyd diff --git a/tools/obsolete/win32-x86/feather_dfu/bz2.pyd b/tools/win32-x86/feather_dfu/bz2.pyd similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/bz2.pyd rename to tools/win32-x86/feather_dfu/bz2.pyd diff --git a/tools/obsolete/win32-x86/feather_dfu/feather_dfu.exe b/tools/win32-x86/feather_dfu/feather_dfu.exe similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/feather_dfu.exe rename to tools/win32-x86/feather_dfu/feather_dfu.exe diff --git a/tools/obsolete/win32-x86/feather_dfu/library.zip b/tools/win32-x86/feather_dfu/library.zip similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/library.zip rename to tools/win32-x86/feather_dfu/library.zip diff --git a/tools/obsolete/win32-x86/feather_dfu/libusb0_x86.dll b/tools/win32-x86/feather_dfu/libusb0_x86.dll similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/libusb0_x86.dll rename to tools/win32-x86/feather_dfu/libusb0_x86.dll diff --git a/tools/obsolete/win32-x86/feather_dfu/pyexpat.pyd b/tools/win32-x86/feather_dfu/pyexpat.pyd similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/pyexpat.pyd rename to tools/win32-x86/feather_dfu/pyexpat.pyd diff --git a/tools/obsolete/win32-x86/feather_dfu/python27.dll b/tools/win32-x86/feather_dfu/python27.dll similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/python27.dll rename to tools/win32-x86/feather_dfu/python27.dll diff --git a/tools/obsolete/win32-x86/feather_dfu/pywintypes27.dll b/tools/win32-x86/feather_dfu/pywintypes27.dll similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/pywintypes27.dll rename to tools/win32-x86/feather_dfu/pywintypes27.dll diff --git a/tools/obsolete/win32-x86/feather_dfu/select.pyd b/tools/win32-x86/feather_dfu/select.pyd similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/select.pyd rename to tools/win32-x86/feather_dfu/select.pyd diff --git a/tools/obsolete/win32-x86/feather_dfu/unicodedata.pyd b/tools/win32-x86/feather_dfu/unicodedata.pyd similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/unicodedata.pyd rename to tools/win32-x86/feather_dfu/unicodedata.pyd diff --git a/tools/obsolete/win32-x86/feather_dfu/win32api.pyd b/tools/win32-x86/feather_dfu/win32api.pyd similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/win32api.pyd rename to tools/win32-x86/feather_dfu/win32api.pyd diff --git a/tools/obsolete/win32-x86/feather_dfu/win32pipe.pyd b/tools/win32-x86/feather_dfu/win32pipe.pyd similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/win32pipe.pyd rename to tools/win32-x86/feather_dfu/win32pipe.pyd diff --git a/tools/obsolete/win32-x86/feather_dfu/win32wnet.pyd b/tools/win32-x86/feather_dfu/win32wnet.pyd similarity index 100% rename from tools/obsolete/win32-x86/feather_dfu/win32wnet.pyd rename to tools/win32-x86/feather_dfu/win32wnet.pyd