Remove Atmel FLIP from install scripts and documentation (#8822)
This commit is contained in:
@@ -105,13 +105,6 @@ endef
|
|||||||
teensy: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
|
teensy: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
|
||||||
$(call EXEC_TEENSY)
|
$(call EXEC_TEENSY)
|
||||||
|
|
||||||
BATCHISP ?= batchisp
|
|
||||||
|
|
||||||
flip: $(BUILD_DIR)/$(TARGET).hex check-size
|
|
||||||
$(BATCHISP) -hardware usb -device $(MCU) -operation erase f
|
|
||||||
$(BATCHISP) -hardware usb -device $(MCU) -operation loadbuffer $(BUILD_DIR)/$(TARGET).hex program
|
|
||||||
$(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0
|
|
||||||
|
|
||||||
DFU_PROGRAMMER ?= dfu-programmer
|
DFU_PROGRAMMER ?= dfu-programmer
|
||||||
GREP ?= grep
|
GREP ?= grep
|
||||||
|
|
||||||
@@ -146,13 +139,6 @@ dfu-start:
|
|||||||
$(DFU_PROGRAMMER) $(MCU) reset
|
$(DFU_PROGRAMMER) $(MCU) reset
|
||||||
$(DFU_PROGRAMMER) $(MCU) start
|
$(DFU_PROGRAMMER) $(MCU) start
|
||||||
|
|
||||||
flip-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
|
|
||||||
$(COPY) $(BUILD_DIR)/$(TARGET).eep $(BUILD_DIR)/$(TARGET)eep.hex
|
|
||||||
$(BATCHISP) -hardware usb -device $(MCU) -operation memory EEPROM erase
|
|
||||||
$(BATCHISP) -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(BUILD_DIR)/$(TARGET)eep.hex program
|
|
||||||
$(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0
|
|
||||||
$(REMOVE) $(BUILD_DIR)/$(TARGET)eep.hex
|
|
||||||
|
|
||||||
dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
|
dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
|
||||||
if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
|
if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
|
||||||
$(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\
|
$(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\
|
||||||
|
|||||||
@@ -439,7 +439,7 @@ $(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir -p $(OUTPUT) 2>/dev/null)))
|
|||||||
.PHONY : all finish sizebefore sizeafter qmkversion \
|
.PHONY : all finish sizebefore sizeafter qmkversion \
|
||||||
gccversion build elf hex eep lss sym coff extcoff \
|
gccversion build elf hex eep lss sym coff extcoff \
|
||||||
clean clean_list debug gdb-config show_path \
|
clean clean_list debug gdb-config show_path \
|
||||||
program teensy dfu flip dfu-ee flip-ee dfu-start \
|
program teensy dfu dfu-ee dfu-start \
|
||||||
flash dfu-split-left dfu-split-right \
|
flash dfu-split-left dfu-split-right \
|
||||||
avrdude-split-left avrdude-split-right \
|
avrdude-split-left avrdude-split-right \
|
||||||
avrdude-loop usbasp
|
avrdude-loop usbasp
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ function export_variables {
|
|||||||
export PATH=$PATH:$util_dir/dfu-programmer
|
export PATH=$PATH:$util_dir/dfu-programmer
|
||||||
export PATH=$PATH:$util_dir/dfu-util-0.9-win64
|
export PATH=$PATH:$util_dir/dfu-util-0.9-win64
|
||||||
export PATH=$PATH:$util_dir/bootloadHID.2012-12-08/commandline
|
export PATH=$PATH:$util_dir/bootloadHID.2012-12-08/commandline
|
||||||
export PATH=$PATH:$util_dir/flip/bin
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ function export_variables {
|
|||||||
export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.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 TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe
|
||||||
export BOOTLOADHID_PROGRAMMER=$download_dir/bootloadHID.2012-12-08/commandline/bootloadHID.exe
|
export BOOTLOADHID_PROGRAMMER=$download_dir/bootloadHID.2012-12-08/commandline/bootloadHID.exe
|
||||||
export BATCHISP=batchisp.exe
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export_variables
|
export_variables
|
||||||
|
|||||||
@@ -4,11 +4,10 @@ dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
|
|||||||
download_dir=~/qmk_utils
|
download_dir=~/qmk_utils
|
||||||
avrtools=avr8-gnu-toolchain
|
avrtools=avr8-gnu-toolchain
|
||||||
armtools=gcc-arm-none-eabi
|
armtools=gcc-arm-none-eabi
|
||||||
installflip=false
|
|
||||||
util_dir=$(dirname "$0")
|
util_dir=$(dirname "$0")
|
||||||
|
|
||||||
echo "Installing dependencies needed for the installation (quazip)"
|
echo "Installing dependencies needed for the installation (quazip)"
|
||||||
pacman --needed --noconfirm --disable-download-timeout -Sy base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang msys/git msys/p7zip mingw-w64-x86_64-python3-pip msys/unzip
|
pacman --needed --noconfirm --disable-download-timeout -Sy base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang git mingw-w64-x86_64-python3-pip unzip
|
||||||
|
|
||||||
source "$dir/win_shared_install.sh"
|
source "$dir/win_shared_install.sh"
|
||||||
|
|
||||||
@@ -31,19 +30,8 @@ function install_arm {
|
|||||||
rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip
|
rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip
|
||||||
}
|
}
|
||||||
|
|
||||||
function extract_flip {
|
|
||||||
rm -f -r flip
|
|
||||||
7z -oflip x FlipInstaller.exe
|
|
||||||
}
|
|
||||||
|
|
||||||
pushd "$download_dir"
|
pushd "$download_dir"
|
||||||
|
|
||||||
if [ -f "FlipInstaller.exe" ]; then
|
|
||||||
echo
|
|
||||||
echo "Extracting flip"
|
|
||||||
extract_flip
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -d "$avrtools" ]; then
|
if [ ! -d "$avrtools" ]; then
|
||||||
echo
|
echo
|
||||||
echo "The AVR toolchain is not installed."
|
echo "The AVR toolchain is not installed."
|
||||||
|
|||||||
@@ -22,10 +22,6 @@ function install_utils {
|
|||||||
wget 'https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.zip'
|
wget 'https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.zip'
|
||||||
unzip bootloadHID.2012-12-08.zip
|
unzip bootloadHID.2012-12-08.zip
|
||||||
|
|
||||||
echo "Installing Atmel Flip"
|
|
||||||
wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/Flip%20Installer%20-%203.4.7.112.exe'
|
|
||||||
mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe
|
|
||||||
|
|
||||||
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 -
|
||||||
|
|
||||||
|
|||||||
@@ -31,21 +31,6 @@ source "$dir/win_shared_install.sh"
|
|||||||
|
|
||||||
pip3 install -r ${util_dir}/../requirements.txt
|
pip3 install -r ${util_dir}/../requirements.txt
|
||||||
|
|
||||||
pushd "$download_dir"
|
|
||||||
while true; do
|
|
||||||
echo
|
|
||||||
echo "Flip need to be installed if you want to use that for programming."
|
|
||||||
echo "Please install it to the default location!"
|
|
||||||
read -p "Do you want to install it now? (Y/N) " res
|
|
||||||
case $res in
|
|
||||||
[Yy]* ) cmd.exe /c FlipInstaller.exe; break;;
|
|
||||||
[Nn]* ) break;;
|
|
||||||
* ) echo "Invalid answer";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
popd
|
|
||||||
|
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "Creating a softlink to the utils directory as ~/qmk_utils."
|
echo "Creating a softlink to the utils directory as ~/qmk_utils."
|
||||||
echo "This is needed so that the the make system can find all utils it need."
|
echo "This is needed so that the the make system can find all utils it need."
|
||||||
|
|||||||
Reference in New Issue
Block a user