masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MSYS2: install packages for dfu-programmer, dfu-util, teensy-loader-cli (#10007)

This commit is contained in:
Ryan 2020-08-14 08:26:14 +10:00 committed by GitHub
parent 156ed69b46
commit 517f6d2c22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/activate_msys2.sh
View File

@ -3,8 +3,6 @@
function export_variables { function export_variables {
local util_dir=~/qmk_utils local util_dir=~/qmk_utils
export PATH=$PATH:$util_dir export PATH=$PATH:$util_dir
export PATH=$PATH:$util_dir/dfu-programmer
export PATH=$PATH:$util_dir/dfu-util-0.9-win64
export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin
export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
} }

4
util/activate_wsl.sh
View File

@ -3,10 +3,6 @@
function export_variables { function export_variables {
local util_dir=~/qmk_utils local util_dir=~/qmk_utils
local download_dir=$util_dir/wsl_downloaded local download_dir=$util_dir/wsl_downloaded
export DFU_PROGRAMMER=$download_dir/dfu-programmer/dfu-programmer.exe
export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe
export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe
} }
export_variables export_variables

4
util/msys2_install.sh
View File

@ -20,7 +20,7 @@ function install_avr {
rm avr8-gnu-toolchain/bin/make.exe rm avr8-gnu-toolchain/bin/make.exe
rm avr-gcc-8.3.0-x86-mingw.zip rm avr-gcc-8.3.0-x86-mingw.zip
pacman --needed --disable-download-timeout -S mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid pacman --needed --noconfirm --disable-download-timeout -S mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid mingw-w64-x86_64-dfu-programmer mingw-w64-x86_64-teensy-loader-cli
} }
function install_arm { function install_arm {
@ -29,6 +29,8 @@ function install_arm {
echo "Extracting ARM toolchain..." echo "Extracting ARM toolchain..."
unzip -q -d gcc-arm-none-eabi gcc-arm-none-eabi-8-2019-q3-update-win32.zip unzip -q -d gcc-arm-none-eabi gcc-arm-none-eabi-8-2019-q3-update-win32.zip
rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip
pacman --needed --noconfirm --disable-download-timeout -S mingw-w64-x86_64-dfu-util
} }
pushd "$download_dir" pushd "$download_dir"

13
util/win_shared_install.sh
View File

@ -6,18 +6,6 @@ function install_utils {
pushd "$download_dir" pushd "$download_dir"
echo "Installing dfu-programmer"
wget 'http://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip'
unzip -d dfu-programmer dfu-programmer-win-0.7.2.zip
echo "Installing dfu-util"
wget 'http://dfu-util.sourceforge.net/releases/dfu-util-0.9-win64.zip'
unzip dfu-util-0.9-win64.zip
echo "Installing teensy_loader_cli"
wget 'https://www.pjrc.com/teensy/teensy_loader_cli_windows.zip'
unzip teensy_loader_cli_windows.zip
echo "Downloading the QMK driver installer" echo "Downloading the QMK driver installer"
wget -qO- https://api.github.com/repos/qmk/qmk_driver_installer/releases | grep browser_download_url | head -n 1 | cut -d '"' -f 4 | wget -i - wget -qO- https://api.github.com/repos/qmk/qmk_driver_installer/releases | grep browser_download_url | head -n 1 | cut -d '"' -f 4 | wget -i -
@ -73,4 +61,3 @@ done
popd > /dev/null popd > /dev/null