aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/faq_debug.md7
-rw-r--r--docs/flashing.md1
-rw-r--r--docs/fr-fr/faq_debug.md8
-rw-r--r--docs/fr-fr/flashing.md1
-rw-r--r--docs/getting_started_vagrant.md1
-rw-r--r--docs/ja/faq_debug.md7
-rw-r--r--docs/ja/flashing.md1
-rw-r--r--docs/ja/getting_started_vagrant.md1
-rw-r--r--docs/reference_glossary.md3
-rw-r--r--docs/zh-cn/faq_debug.md7
-rw-r--r--docs/zh-cn/reference_glossary.md3
-rw-r--r--tmk_core/avr.mk14
-rw-r--r--tmk_core/rules.mk2
-rwxr-xr-xutil/activate_msys2.sh1
-rwxr-xr-xutil/activate_wsl.sh1
-rwxr-xr-xutil/msys2_install.sh14
-rwxr-xr-xutil/win_shared_install.sh4
-rwxr-xr-xutil/wsl_install.sh15
18 files changed, 2 insertions, 89 deletions
diff --git a/docs/faq_debug.md b/docs/faq_debug.md
index 6c66defbd..08c84fe4f 100644
--- a/docs/faq_debug.md
+++ b/docs/faq_debug.md
@@ -160,10 +160,3 @@ As of now root of its cause is not clear but some build options seem to be relat
160 160
161https://github.com/tmk/tmk_keyboard/issues/266 161https://github.com/tmk/tmk_keyboard/issues/266
162https://geekhack.org/index.php?topic=41989.msg1967778#msg1967778 162https://geekhack.org/index.php?topic=41989.msg1967778#msg1967778
163
164
165
166## FLIP Doesn't Work
167### `AtLibUsbDfu.dll` Not Found
168Remove current driver and reinstall one FLIP provides from DeviceManager.
169http://imgur.com/a/bnwzy
diff --git a/docs/flashing.md b/docs/flashing.md
index ab003308d..1f71c253c 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -26,7 +26,6 @@ Compatible flashers:
26 26
27* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI) 27* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
28* [dfu-programmer](https://github.com/dfu-programmer/dfu-programmer) / `:dfu` in QMK (recommended command line) 28* [dfu-programmer](https://github.com/dfu-programmer/dfu-programmer) / `:dfu` in QMK (recommended command line)
29* [Atmel's Flip](http://www.microchip.com/developmenttools/productdetails.aspx?partno=flip) (not recommended)
30 29
31Flashing sequence: 30Flashing sequence:
32 31
diff --git a/docs/fr-fr/faq_debug.md b/docs/fr-fr/faq_debug.md
index 754c79921..9c12f2917 100644
--- a/docs/fr-fr/faq_debug.md
+++ b/docs/fr-fr/faq_debug.md
@@ -155,11 +155,3 @@ Pour le moment, l'origine du problème n'est pas comprise, mais certaines option
155 155
156https://github.com/tmk/tmk_keyboard/issues/266 156https://github.com/tmk/tmk_keyboard/issues/266
157https://geekhack.org/index.php?topic=41989.msg1967778#msg1967778 157https://geekhack.org/index.php?topic=41989.msg1967778#msg1967778
158
159## FLIP ne marche pas
160
161### `AtLibUsbDfu.dll` Not Found
162
163Supprimez le pilote actuel et réinstallez celui donné par FLIP dans le gestionnaire de périphériques.
164
165http://imgur.com/a/bnwzy
diff --git a/docs/fr-fr/flashing.md b/docs/fr-fr/flashing.md
index c380614a5..74eae4977 100644
--- a/docs/fr-fr/flashing.md
+++ b/docs/fr-fr/flashing.md
@@ -26,7 +26,6 @@ Méthodes de flash compatibles :
26 26
27* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (interface graphique recommandé) 27* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (interface graphique recommandé)
28* [dfu-programmer](https://github.com/dfu-programmer/dfu-programmer) / `:dfu` avec QMK (outil en ligne de commande recommandé) 28* [dfu-programmer](https://github.com/dfu-programmer/dfu-programmer) / `:dfu` avec QMK (outil en ligne de commande recommandé)
29* [Atmel's Flip](http://www.microchip.com/developmenttools/productdetails.aspx?partno=flip) (non recommandé)
30 29
31Ordre des actions : 30Ordre des actions :
32 31
diff --git a/docs/getting_started_vagrant.md b/docs/getting_started_vagrant.md
index da26682d7..7a4541cfc 100644
--- a/docs/getting_started_vagrant.md
+++ b/docs/getting_started_vagrant.md
@@ -20,7 +20,6 @@ The "easy" way to flash the firmware is using a tool from your host OS:
20 20
21* [QMK Toolbox](https://github.com/qmk/qmk_toolbox) (recommended) 21* [QMK Toolbox](https://github.com/qmk/qmk_toolbox) (recommended)
22* [Teensy Loader](https://www.pjrc.com/teensy/loader.html) 22* [Teensy Loader](https://www.pjrc.com/teensy/loader.html)
23* [Atmel FLIP](http://www.atmel.com/tools/flip.aspx)
24 23
25If you want to program via the command line you can uncomment the ['modifyvm'] lines in the Vagrantfile to enable the USB passthrough into Linux and then program using the command line tools like dfu-util/dfu-programmer or you can install the Teensy CLI version. 24If you want to program via the command line you can uncomment the ['modifyvm'] lines in the Vagrantfile to enable the USB passthrough into Linux and then program using the command line tools like dfu-util/dfu-programmer or you can install the Teensy CLI version.
26 25
diff --git a/docs/ja/faq_debug.md b/docs/ja/faq_debug.md
index 8e42aebbb..856e9473a 100644
--- a/docs/ja/faq_debug.md
+++ b/docs/ja/faq_debug.md
@@ -152,10 +152,3 @@ https://geekhack.org/index.php?topic=14290.msg1884034#msg1884034
152 152
153https://github.com/tmk/tmk_keyboard/issues/266 153https://github.com/tmk/tmk_keyboard/issues/266
154https://geekhack.org/index.php?topic=41989.msg1967778#msg1967778 154https://geekhack.org/index.php?topic=41989.msg1967778#msg1967778
155
156
157
158## FLIP が動作しない
159### `AtLibUsbDfu.dll` が見つかりません
160デバイスマネージャから現在のドライバを削除し、FLIP が提供するものを再インストールします。
161http://imgur.com/a/bnwzy
diff --git a/docs/ja/flashing.md b/docs/ja/flashing.md
index 62baa907d..713d4fdf9 100644
--- a/docs/ja/flashing.md
+++ b/docs/ja/flashing.md
@@ -31,7 +31,6 @@ BOOTLOADER = atmel-dfu
31 31
32* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (推奨の GUI) 32* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (推奨の GUI)
33* QMK の [dfu-programmer](https://github.com/dfu-programmer/dfu-programmer) / `:dfu` (推奨のコマンドライン) 33* QMK の [dfu-programmer](https://github.com/dfu-programmer/dfu-programmer) / `:dfu` (推奨のコマンドライン)
34* [Atmel の Flip](http://www.microchip.com/developmenttools/productdetails.aspx?partno=flip) (非推奨)
35 34
36書き込み手順: 35書き込み手順:
37 36
diff --git a/docs/ja/getting_started_vagrant.md b/docs/ja/getting_started_vagrant.md
index 0bc5c4b79..66fb89510 100644
--- a/docs/ja/getting_started_vagrant.md
+++ b/docs/ja/getting_started_vagrant.md
@@ -25,7 +25,6 @@ Vagrant 以外に、適切なプロバイダがインストールされ、その
25 25
26* [QMK Toolbox](https://github.com/qmk/qmk_toolbox) (推奨) 26* [QMK Toolbox](https://github.com/qmk/qmk_toolbox) (推奨)
27* [Teensy ローダー](https://www.pjrc.com/teensy/loader.html) 27* [Teensy ローダー](https://www.pjrc.com/teensy/loader.html)
28* [Atmel FLIP](http://www.atmel.com/tools/flip.aspx)
29 28
30コマンドラインでプログラムしたい場合は、Vagranfile の ['modifyvm'] 行のコメントを解除して Linux への USB パススルーを有効にし、dfu-util/dfu-programmer のようなコマンドラインツールを使ってプログラムすることができます。あるいは Teensy CLI バージョンをインストールすることができます。 29コマンドラインでプログラムしたい場合は、Vagranfile の ['modifyvm'] 行のコメントを解除して Linux への USB パススルーを有効にし、dfu-util/dfu-programmer のようなコマンドラインツールを使ってプログラムすることができます。あるいは Teensy CLI バージョンをインストールすることができます。
31 30
diff --git a/docs/reference_glossary.md b/docs/reference_glossary.md
index 08a22050c..4cdba024e 100644
--- a/docs/reference_glossary.md
+++ b/docs/reference_glossary.md
@@ -46,9 +46,6 @@ An IDE that is popular with many C developers.
46## Firmware 46## Firmware
47The software that controls your MCU. 47The software that controls your MCU.
48 48
49## FLIP
50Software provided by Atmel for flashing AVR devices. We generally recommend [QMK Flasher](https://github.com/qmk/qmk_flasher) instead, but for some advanced use cases FLIP is required.
51
52## git 49## git
53Versioning software used at the command line 50Versioning software used at the command line
54 51
diff --git a/docs/zh-cn/faq_debug.md b/docs/zh-cn/faq_debug.md
index 7eff7f265..71b575ea0 100644
--- a/docs/zh-cn/faq_debug.md
+++ b/docs/zh-cn/faq_debug.md
@@ -139,10 +139,3 @@ https://geekhack.org/index.php?topic=14290.msg1884034#msg1884034
139 139
140https://github.com/tmk/tmk_keyboard/issues/266 140https://github.com/tmk/tmk_keyboard/issues/266
141https://geekhack.org/index.php?topic=41989.msg1967778#msg1967778 141https://geekhack.org/index.php?topic=41989.msg1967778#msg1967778
142
143
144
145## FLIP 不工作
146### `AtLibUsbDfu.dll` 未找到
147从设备管理器中删除当前驱动程序并在设备管理器重新安装一个FLIP提供的程序。
148http://imgur.com/a/bnwzy
diff --git a/docs/zh-cn/reference_glossary.md b/docs/zh-cn/reference_glossary.md
index 7b9adcc2a..0e0521221 100644
--- a/docs/zh-cn/reference_glossary.md
+++ b/docs/zh-cn/reference_glossary.md
@@ -46,9 +46,6 @@ Français (法国)标准键盘布局。用键盘的前六个字母命名。
46## Firmware(固件) 46## Firmware(固件)
47用来控制单片机的软件。 47用来控制单片机的软件。
48 48
49## FLIP
50爱特梅尔(Atmel)提供的AVR器件刷写软件。我们一般推荐 [QMK刷写工具](https://github.com/qmk/qmk_flasher),但是对于一些高级用例,需要FLIP。
51
52## git 49## git
53命令行版本控制软件 50命令行版本控制软件
54 51
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index a8d01a9e8..f5c125771 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -105,13 +105,6 @@ endef
105teensy: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware 105teensy: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
106 $(call EXEC_TEENSY) 106 $(call EXEC_TEENSY)
107 107
108BATCHISP ?= batchisp
109
110flip: $(BUILD_DIR)/$(TARGET).hex check-size
111 $(BATCHISP) -hardware usb -device $(MCU) -operation erase f
112 $(BATCHISP) -hardware usb -device $(MCU) -operation loadbuffer $(BUILD_DIR)/$(TARGET).hex program
113 $(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0
114
115DFU_PROGRAMMER ?= dfu-programmer 108DFU_PROGRAMMER ?= dfu-programmer
116GREP ?= grep 109GREP ?= grep
117 110
@@ -146,13 +139,6 @@ dfu-start:
146 $(DFU_PROGRAMMER) $(MCU) reset 139 $(DFU_PROGRAMMER) $(MCU) reset
147 $(DFU_PROGRAMMER) $(MCU) start 140 $(DFU_PROGRAMMER) $(MCU) start
148 141
149flip-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
150 $(COPY) $(BUILD_DIR)/$(TARGET).eep $(BUILD_DIR)/$(TARGET)eep.hex
151 $(BATCHISP) -hardware usb -device $(MCU) -operation memory EEPROM erase
152 $(BATCHISP) -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(BUILD_DIR)/$(TARGET)eep.hex program
153 $(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0
154 $(REMOVE) $(BUILD_DIR)/$(TARGET)eep.hex
155
156dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep 142dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
157 if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\ 143 if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
158 $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\ 144 $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index a66718cd2..f45fd3792 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -439,7 +439,7 @@ $(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir -p $(OUTPUT) 2>/dev/null)))
439.PHONY : all finish sizebefore sizeafter qmkversion \ 439.PHONY : all finish sizebefore sizeafter qmkversion \
440gccversion build elf hex eep lss sym coff extcoff \ 440gccversion build elf hex eep lss sym coff extcoff \
441clean clean_list debug gdb-config show_path \ 441clean clean_list debug gdb-config show_path \
442program teensy dfu flip dfu-ee flip-ee dfu-start \ 442program teensy dfu dfu-ee dfu-start \
443flash dfu-split-left dfu-split-right \ 443flash dfu-split-left dfu-split-right \
444avrdude-split-left avrdude-split-right \ 444avrdude-split-left avrdude-split-right \
445avrdude-loop usbasp 445avrdude-loop usbasp
diff --git a/util/activate_msys2.sh b/util/activate_msys2.sh
index 07888ffe1..8741cc6b0 100755
--- a/util/activate_msys2.sh
+++ b/util/activate_msys2.sh
@@ -6,7 +6,6 @@ function export_variables {
6 export PATH=$PATH:$util_dir/dfu-programmer 6 export PATH=$PATH:$util_dir/dfu-programmer
7 export PATH=$PATH:$util_dir/dfu-util-0.9-win64 7 export PATH=$PATH:$util_dir/dfu-util-0.9-win64
8 export PATH=$PATH:$util_dir/bootloadHID.2012-12-08/commandline 8 export PATH=$PATH:$util_dir/bootloadHID.2012-12-08/commandline
9 export PATH=$PATH:$util_dir/flip/bin
10 export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin 9 export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin
11 export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin 10 export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
12} 11}
diff --git a/util/activate_wsl.sh b/util/activate_wsl.sh
index 78bbf9ccb..26a47187a 100755
--- a/util/activate_wsl.sh
+++ b/util/activate_wsl.sh
@@ -8,7 +8,6 @@ function export_variables {
8 export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe 8 export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe
9 export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe 9 export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe
10 export BOOTLOADHID_PROGRAMMER=$download_dir/bootloadHID.2012-12-08/commandline/bootloadHID.exe 10 export BOOTLOADHID_PROGRAMMER=$download_dir/bootloadHID.2012-12-08/commandline/bootloadHID.exe
11 export BATCHISP=batchisp.exe
12} 11}
13 12
14export_variables 13export_variables
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index 001f55dc4..55df9c007 100755
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -4,11 +4,10 @@ dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
4download_dir=~/qmk_utils 4download_dir=~/qmk_utils
5avrtools=avr8-gnu-toolchain 5avrtools=avr8-gnu-toolchain
6armtools=gcc-arm-none-eabi 6armtools=gcc-arm-none-eabi
7installflip=false
8util_dir=$(dirname "$0") 7util_dir=$(dirname "$0")
9 8
10echo "Installing dependencies needed for the installation (quazip)" 9echo "Installing dependencies needed for the installation (quazip)"
11pacman --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 10pacman --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
12 11
13source "$dir/win_shared_install.sh" 12source "$dir/win_shared_install.sh"
14 13
@@ -31,19 +30,8 @@ function install_arm {
31 rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip 30 rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip
32} 31}
33 32
34function extract_flip {
35 rm -f -r flip
36 7z -oflip x FlipInstaller.exe
37}
38
39pushd "$download_dir" 33pushd "$download_dir"
40 34
41if [ -f "FlipInstaller.exe" ]; then
42 echo
43 echo "Extracting flip"
44 extract_flip
45fi
46
47if [ ! -d "$avrtools" ]; then 35if [ ! -d "$avrtools" ]; then
48 echo 36 echo
49 echo "The AVR toolchain is not installed." 37 echo "The AVR toolchain is not installed."
diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh
index 1265cb027..072ca47c8 100755
--- a/util/win_shared_install.sh
+++ b/util/win_shared_install.sh
@@ -22,10 +22,6 @@ function install_utils {
22 wget 'https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.zip' 22 wget 'https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.zip'
23 unzip bootloadHID.2012-12-08.zip 23 unzip bootloadHID.2012-12-08.zip
24 24
25 echo "Installing Atmel Flip"
26 wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/Flip%20Installer%20-%203.4.7.112.exe'
27 mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe
28
29 echo "Downloading the QMK driver installer" 25 echo "Downloading the QMK driver installer"
30 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 - 26 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 27
diff --git a/util/wsl_install.sh b/util/wsl_install.sh
index 197d9f089..8ed177ca3 100755
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -31,21 +31,6 @@ source "$dir/win_shared_install.sh"
31 31
32pip3 install -r ${util_dir}/../requirements.txt 32pip3 install -r ${util_dir}/../requirements.txt
33 33
34pushd "$download_dir"
35while true; do
36 echo
37 echo "Flip need to be installed if you want to use that for programming."
38 echo "Please install it to the default location!"
39 read -p "Do you want to install it now? (Y/N) " res
40 case $res in
41 [Yy]* ) cmd.exe /c FlipInstaller.exe; break;;
42 [Nn]* ) break;;
43 * ) echo "Invalid answer";;
44 esac
45done
46popd
47
48
49echo 34echo
50echo "Creating a softlink to the utils directory as ~/qmk_utils." 35echo "Creating a softlink to the utils directory as ~/qmk_utils."
51echo "This is needed so that the the make system can find all utils it need." 36echo "This is needed so that the the make system can find all utils it need."