Align use of atmega32a program script (#5259)
* Remove duplicate 'program' files and refactor to use atmega32a_program.py * Update readme references from 'program' to 'atmega32a_program.py'
This commit is contained in:
parent
c025d813ba
commit
205ffc277c
19 changed files with 12 additions and 655 deletions
|
@ -1,106 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>, Sebastian Kaim <sebb@sebb767.de>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
import usb
|
|
||||||
|
|
||||||
|
|
||||||
def checkForKeyboardInNormalMode():
|
|
||||||
"""Returns a device if a ps2avrGB device in normal made (that is in keyboard mode) or None if it is not found."""
|
|
||||||
return usb.core.find(idVendor=0x20A0, idProduct=0x422D)
|
|
||||||
|
|
||||||
def checkForKeyboardInBootloaderMode():
|
|
||||||
"""Returns True if a ps2avrGB device in bootloader (flashable) mode is found and False otherwise."""
|
|
||||||
return (usb.core.find(idVendor=0x16c0, idProduct=0x05df) is not None)
|
|
||||||
|
|
||||||
def flashKeyboard(firmware_file):
|
|
||||||
"""Calls bootloadHID to flash the given file to the device."""
|
|
||||||
print('Flashing firmware to device ...')
|
|
||||||
if os.system('bootloadHID -r "%s"' % firmware_file) == 0:
|
|
||||||
print('\nDone!')
|
|
||||||
else:
|
|
||||||
print('\nbootloadHID returned an error.')
|
|
||||||
|
|
||||||
def printDeviceInfo(dev):
|
|
||||||
"""Prints all infos for a given USB device"""
|
|
||||||
print('Device Information:')
|
|
||||||
print(' idVendor: %d (0x%04x)' % (dev.idVendor, dev.idVendor))
|
|
||||||
print(' idProduct: %d (0x%04x)' % (dev.idProduct, dev.idProduct))
|
|
||||||
print('Manufacturer: %s' % (dev.iManufacturer))
|
|
||||||
print('Serial: %s' % (dev.iSerialNumber))
|
|
||||||
print('Product: %s' % (dev.iProduct), end='\n\n')
|
|
||||||
|
|
||||||
def sendDeviceToBootloaderMode(dev):
|
|
||||||
"""Tries to send a given ps2avrGB keyboard to bootloader mode to allow flashing."""
|
|
||||||
try:
|
|
||||||
dev.set_configuration()
|
|
||||||
|
|
||||||
request_type = usb.util.build_request_type(
|
|
||||||
usb.util.CTRL_OUT,
|
|
||||||
usb.util.CTRL_TYPE_CLASS,
|
|
||||||
usb.util.CTRL_RECIPIENT_DEVICE)
|
|
||||||
|
|
||||||
USBRQ_HID_SET_REPORT = 0x09
|
|
||||||
HID_REPORT_OPTION = 0x0301
|
|
||||||
|
|
||||||
dev.ctrl_transfer(request_type, USBRQ_HID_SET_REPORT, HID_REPORT_OPTION, 0, [0, 0, 0xFF] + [0] * 5)
|
|
||||||
except usb.core.USBError:
|
|
||||||
# for some reason I keep getting USBError, but it works!
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
print('Usage: %s <firmware.hex>' % sys.argv[0])
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
kb = checkForKeyboardInNormalMode()
|
|
||||||
|
|
||||||
if kb is not None:
|
|
||||||
print('Found a keyboard in normal mode. Attempting to send it to bootloader mode ...', end='')
|
|
||||||
printDeviceInfo(kb)
|
|
||||||
sendDeviceToBootloaderMode(kb)
|
|
||||||
print(' done.')
|
|
||||||
print("Hint: If your keyboard can't be set to bootloader mode automatically, plug it in while pressing the bootloader key to do so manually.")
|
|
||||||
print(" You can find more infos about this here: https://github.com/qmk/qmk_firmware/tree/master/keyboards/ps2avrGB#setting-the-board-to-bootloader-mode")
|
|
||||||
|
|
||||||
attempts = 12 # 60 seconds
|
|
||||||
found = False
|
|
||||||
for attempt in range(1, attempts + 1):
|
|
||||||
print("Searching for keyboard in bootloader mode (%i/%i) ... " % (attempt, attempts), end='')
|
|
||||||
|
|
||||||
if checkForKeyboardInBootloaderMode():
|
|
||||||
print('Found', end='\n\n')
|
|
||||||
flashKeyboard(sys.argv[1])
|
|
||||||
found = True
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
print('Nothing.', end='')
|
|
||||||
|
|
||||||
if attempt != attempts: # no need to wait on the last attempt
|
|
||||||
print(' Sleeping 5 seconds.', end='')
|
|
||||||
time.sleep(5)
|
|
||||||
|
|
||||||
# print a newline
|
|
||||||
print()
|
|
||||||
|
|
||||||
if not found:
|
|
||||||
print("Couldn't find a flashable keyboard. Aborting.")
|
|
||||||
sys.exit(2)
|
|
||||||
|
|
|
@ -45,4 +45,4 @@ OPT_DEFS = -DDEBUG_LEVEL=0
|
||||||
SRC += i2c_master.c
|
SRC += i2c_master.c
|
||||||
|
|
||||||
# programming options
|
# programming options
|
||||||
PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex
|
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
|
||||||
|
|
|
@ -36,7 +36,7 @@ $ make
|
||||||
$ sudo cp bootloadHID /usr/bin
|
$ sudo cp bootloadHID /usr/bin
|
||||||
```
|
```
|
||||||
|
|
||||||
In order to use the `./program` script, which can reboot the board into
|
In order to use the `././util/atmega32a_program.py` script, which can reboot the board into
|
||||||
the bootloader, you'll need Python 2 with PyUSB installed:
|
the bootloader, you'll need Python 2 with PyUSB installed:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
|
@ -36,7 +36,7 @@ $ make
|
||||||
$ sudo cp bootloadHID /usr/bin
|
$ sudo cp bootloadHID /usr/bin
|
||||||
```
|
```
|
||||||
|
|
||||||
In order to use the `./program` script, which can reboot the board into
|
In order to use the `./util/atmega32a_program.py` script, which can reboot the board into
|
||||||
the bootloader, you'll need Python 2 with PyUSB installed:
|
the bootloader, you'll need Python 2 with PyUSB installed:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
|
@ -37,7 +37,7 @@ $ brew cask install crosspack-avr
|
||||||
$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
|
$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
|
||||||
```
|
```
|
||||||
|
|
||||||
In order to use the `./program` script, which can reboot the board into
|
In order to use the `././util/atmega32a_program.py` script, which can reboot the board into
|
||||||
the bootloader, you'll need Python 2 with PyUSB installed:
|
the bootloader, you'll need Python 2 with PyUSB installed:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
|
@ -1,74 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
import usb
|
|
||||||
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
print('Usage: %s <firmware.hex>' % sys.argv[0])
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
print('Searching for ps2avrGB... ', end='')
|
|
||||||
|
|
||||||
dev = usb.core.find(idVendor=0x20A0, idProduct=0x422D)
|
|
||||||
if dev is None:
|
|
||||||
raise ValueError('Device not found')
|
|
||||||
|
|
||||||
print('Found', end='\n\n')
|
|
||||||
|
|
||||||
print('Device Information:')
|
|
||||||
print(' idVendor: %d (0x%04x)' % (dev.idVendor, dev.idVendor))
|
|
||||||
print(' idProduct: %d (0x%04x)' % (dev.idProduct, dev.idProduct))
|
|
||||||
print('Manufacturer: %s' % (dev.iManufacturer))
|
|
||||||
print('Serial: %s' % (dev.iSerialNumber))
|
|
||||||
print('Product: %s' % (dev.iProduct), end='\n\n')
|
|
||||||
|
|
||||||
print('Transferring control to bootloader... ', end='')
|
|
||||||
|
|
||||||
dev.set_configuration()
|
|
||||||
|
|
||||||
request_type = usb.util.build_request_type(
|
|
||||||
usb.util.CTRL_OUT,
|
|
||||||
usb.util.CTRL_TYPE_CLASS,
|
|
||||||
usb.util.CTRL_RECIPIENT_DEVICE)
|
|
||||||
|
|
||||||
USBRQ_HID_SET_REPORT = 0x09
|
|
||||||
HID_REPORT_OPTION = 0x0301
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
dev.ctrl_transfer(
|
|
||||||
request_type,
|
|
||||||
USBRQ_HID_SET_REPORT,
|
|
||||||
HID_REPORT_OPTION,
|
|
||||||
0,
|
|
||||||
[0, 0, 0xFF] + [0] * 5
|
|
||||||
)
|
|
||||||
except usb.core.USBError:
|
|
||||||
# for some reason I keep getting USBError, but it works!
|
|
||||||
pass
|
|
||||||
|
|
||||||
# wait a bit until bootloader starts up
|
|
||||||
time.sleep(2)
|
|
||||||
|
|
||||||
print('OK')
|
|
||||||
print('Programming...')
|
|
||||||
if os.system('bootloadHID -r "%s"' % sys.argv[1]) == 0:
|
|
||||||
print('\nDone!')
|
|
|
@ -58,6 +58,6 @@ CUSTOM_MATRIX = yes
|
||||||
SRC = matrix.c i2c.c backlight.c
|
SRC = matrix.c i2c.c backlight.c
|
||||||
|
|
||||||
# programming options
|
# programming options
|
||||||
PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex
|
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
|
||||||
|
|
||||||
LAYOUTS = ortho_5x12
|
LAYOUTS = ortho_5x12
|
||||||
|
|
|
@ -29,7 +29,7 @@ $ brew cask install crosspack-avr
|
||||||
$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
|
$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
|
||||||
```
|
```
|
||||||
|
|
||||||
In order to use the `./program` script, which can reboot the board into
|
In order to use the `./util/atmega32a_program.py` script, which can reboot the board into
|
||||||
the bootloader, you'll need Python 2 with PyUSB installed:
|
the bootloader, you'll need Python 2 with PyUSB installed:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
|
@ -1,105 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>, Sebastian Kaim <sebb@sebb767.de>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
import usb
|
|
||||||
|
|
||||||
|
|
||||||
def checkForKeyboardInNormalMode():
|
|
||||||
"""Returns a device if a ps2avrGB device in normal made (that is in keyboard mode) or None if it is not found."""
|
|
||||||
return usb.core.find(idVendor=0x20A0, idProduct=0x422D)
|
|
||||||
|
|
||||||
def checkForKeyboardInBootloaderMode():
|
|
||||||
"""Returns True if a ps2avrGB device in bootloader (flashable) mode is found and False otherwise."""
|
|
||||||
return (usb.core.find(idVendor=0x16c0, idProduct=0x05df) is not None)
|
|
||||||
|
|
||||||
def flashKeyboard(firmware_file):
|
|
||||||
"""Calls bootloadHID to flash the given file to the device."""
|
|
||||||
print('Flashing firmware to device ...')
|
|
||||||
if os.system('bootloadHID -r "%s"' % firmware_file) == 0:
|
|
||||||
print('\nDone!')
|
|
||||||
else:
|
|
||||||
print('\nbootloadHID returned an error.')
|
|
||||||
|
|
||||||
def printDeviceInfo(dev):
|
|
||||||
"""Prints all infos for a given USB device"""
|
|
||||||
print('Device Information:')
|
|
||||||
print(' idVendor: %d (0x%04x)' % (dev.idVendor, dev.idVendor))
|
|
||||||
print(' idProduct: %d (0x%04x)' % (dev.idProduct, dev.idProduct))
|
|
||||||
print('Manufacturer: %s' % (dev.iManufacturer))
|
|
||||||
print('Serial: %s' % (dev.iSerialNumber))
|
|
||||||
print('Product: %s' % (dev.iProduct), end='\n\n')
|
|
||||||
|
|
||||||
def sendDeviceToBootloaderMode(dev):
|
|
||||||
"""Tries to send a given ps2avrGB keyboard to bootloader mode to allow flashing."""
|
|
||||||
try:
|
|
||||||
dev.set_configuration()
|
|
||||||
|
|
||||||
request_type = usb.util.build_request_type(
|
|
||||||
usb.util.CTRL_OUT,
|
|
||||||
usb.util.CTRL_TYPE_CLASS,
|
|
||||||
usb.util.CTRL_RECIPIENT_DEVICE)
|
|
||||||
|
|
||||||
USBRQ_HID_SET_REPORT = 0x09
|
|
||||||
HID_REPORT_OPTION = 0x0301
|
|
||||||
|
|
||||||
dev.ctrl_transfer(request_type, USBRQ_HID_SET_REPORT, HID_REPORT_OPTION, 0, [0, 0, 0xFF] + [0] * 5)
|
|
||||||
except usb.core.USBError:
|
|
||||||
# for some reason I keep getting USBError, but it works!
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
print('Usage: %s <firmware.hex>' % sys.argv[0])
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
kb = checkForKeyboardInNormalMode()
|
|
||||||
|
|
||||||
if kb is not None:
|
|
||||||
print('Found a keyboard in normal mode. Attempting to send it to bootloader mode ...', end='')
|
|
||||||
sendDeviceToBootloaderMode(kb)
|
|
||||||
print(' done.')
|
|
||||||
print("Hint: If your keyboard can't be set to bootloader mode automatically, plug it in while pressing the bootloader key to do so manually.")
|
|
||||||
print(" You can find more infos about this here: https://github.com/qmk/qmk_firmware/tree/master/keyboards/ps2avrGB#setting-the-board-to-bootloader-mode")
|
|
||||||
|
|
||||||
attempts = 12 # 60 seconds
|
|
||||||
found = False
|
|
||||||
for attempt in range(1, attempts + 1):
|
|
||||||
print("Searching for keyboard in bootloader mode (%i/%i) ... " % (attempt, attempts), end='')
|
|
||||||
|
|
||||||
if checkForKeyboardInBootloaderMode():
|
|
||||||
print('Found', end='\n\n')
|
|
||||||
flashKeyboard(sys.argv[1])
|
|
||||||
found = True
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
print('Nothing.', end='')
|
|
||||||
|
|
||||||
if attempt != attempts: # no need to wait on the last attempt
|
|
||||||
print(' Sleeping 5 seconds.', end='')
|
|
||||||
time.sleep(5)
|
|
||||||
|
|
||||||
# print a newline
|
|
||||||
print()
|
|
||||||
|
|
||||||
if not found:
|
|
||||||
print("Couldn't find a flashable keyboard. Aborting.")
|
|
||||||
sys.exit(2)
|
|
||||||
|
|
|
@ -32,4 +32,4 @@ CUSTOM_MATRIX = yes
|
||||||
SRC = matrix.c i2c.c
|
SRC = matrix.c i2c.c
|
||||||
|
|
||||||
# programming options
|
# programming options
|
||||||
PROGRAM_CMD = ./keyboards/mehkee96/program $(TARGET).hex
|
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
|
||||||
|
|
|
@ -30,7 +30,7 @@ $ brew cask install crosspack-avr
|
||||||
$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
|
$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
|
||||||
```
|
```
|
||||||
|
|
||||||
In order to use the `./program` script, which can reboot the board into
|
In order to use the `./util/atmega32a_program.py` script, which can reboot the board into
|
||||||
the bootloader, you'll need Python 2 with PyUSB installed:
|
the bootloader, you'll need Python 2 with PyUSB installed:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
|
@ -1,105 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>, Sebastian Kaim <sebb@sebb767.de>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
import usb
|
|
||||||
|
|
||||||
|
|
||||||
def checkForKeyboardInNormalMode():
|
|
||||||
"""Returns a device if a ps2avrGB device in normal made (that is in keyboard mode) or None if it is not found."""
|
|
||||||
return usb.core.find(idVendor=0x20A0, idProduct=0x422D)
|
|
||||||
|
|
||||||
def checkForKeyboardInBootloaderMode():
|
|
||||||
"""Returns True if a ps2avrGB device in bootloader (flashable) mode is found and False otherwise."""
|
|
||||||
return (usb.core.find(idVendor=0x16c0, idProduct=0x05df) is not None)
|
|
||||||
|
|
||||||
def flashKeyboard(firmware_file):
|
|
||||||
"""Calls bootloadHID to flash the given file to the device."""
|
|
||||||
print('Flashing firmware to device ...')
|
|
||||||
if os.system('bootloadHID -r "%s"' % firmware_file) == 0:
|
|
||||||
print('\nDone!')
|
|
||||||
else:
|
|
||||||
print('\nbootloadHID returned an error.')
|
|
||||||
|
|
||||||
def printDeviceInfo(dev):
|
|
||||||
"""Prints all infos for a given USB device"""
|
|
||||||
print('Device Information:')
|
|
||||||
print(' idVendor: %d (0x%04x)' % (dev.idVendor, dev.idVendor))
|
|
||||||
print(' idProduct: %d (0x%04x)' % (dev.idProduct, dev.idProduct))
|
|
||||||
print('Manufacturer: %s' % (dev.iManufacturer))
|
|
||||||
print('Serial: %s' % (dev.iSerialNumber))
|
|
||||||
print('Product: %s' % (dev.iProduct), end='\n\n')
|
|
||||||
|
|
||||||
def sendDeviceToBootloaderMode(dev):
|
|
||||||
"""Tries to send a given ps2avrGB keyboard to bootloader mode to allow flashing."""
|
|
||||||
try:
|
|
||||||
dev.set_configuration()
|
|
||||||
|
|
||||||
request_type = usb.util.build_request_type(
|
|
||||||
usb.util.CTRL_OUT,
|
|
||||||
usb.util.CTRL_TYPE_CLASS,
|
|
||||||
usb.util.CTRL_RECIPIENT_DEVICE)
|
|
||||||
|
|
||||||
USBRQ_HID_SET_REPORT = 0x09
|
|
||||||
HID_REPORT_OPTION = 0x0301
|
|
||||||
|
|
||||||
dev.ctrl_transfer(request_type, USBRQ_HID_SET_REPORT, HID_REPORT_OPTION, 0, [0, 0, 0xFF] + [0] * 5)
|
|
||||||
except usb.core.USBError:
|
|
||||||
# for some reason I keep getting USBError, but it works!
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
print('Usage: %s <firmware.hex>' % sys.argv[0])
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
kb = checkForKeyboardInNormalMode()
|
|
||||||
|
|
||||||
if kb is not None:
|
|
||||||
print('Found a keyboard in normal mode. Attempting to send it to bootloader mode ...', end='')
|
|
||||||
sendDeviceToBootloaderMode(kb)
|
|
||||||
print(' done.')
|
|
||||||
print("Hint: If your keyboard can't be set to bootloader mode automatically, plug it in while pressing the bootloader key to do so manually.")
|
|
||||||
print(" You can find more infos about this here: https://github.com/qmk/qmk_firmware/tree/master/keyboards/ps2avrGB#setting-the-board-to-bootloader-mode")
|
|
||||||
|
|
||||||
attempts = 12 # 60 seconds
|
|
||||||
found = False
|
|
||||||
for attempt in range(1, attempts + 1):
|
|
||||||
print("Searching for keyboard in bootloader mode (%i/%i) ... " % (attempt, attempts), end='')
|
|
||||||
|
|
||||||
if checkForKeyboardInBootloaderMode():
|
|
||||||
print('Found', end='\n\n')
|
|
||||||
flashKeyboard(sys.argv[1])
|
|
||||||
found = True
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
print('Nothing.', end='')
|
|
||||||
|
|
||||||
if attempt != attempts: # no need to wait on the last attempt
|
|
||||||
print(' Sleeping 5 seconds.', end='')
|
|
||||||
time.sleep(5)
|
|
||||||
|
|
||||||
# print a newline
|
|
||||||
print()
|
|
||||||
|
|
||||||
if not found:
|
|
||||||
print("Couldn't find a flashable keyboard. Aborting.")
|
|
||||||
sys.exit(2)
|
|
||||||
|
|
|
@ -47,4 +47,4 @@ CUSTOM_MATRIX = yes
|
||||||
SRC = matrix.c i2c.c
|
SRC = matrix.c i2c.c
|
||||||
|
|
||||||
# programming options
|
# programming options
|
||||||
PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex
|
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
|
||||||
|
|
|
@ -1,105 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>, Sebastian Kaim <sebb@sebb767.de>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
import usb
|
|
||||||
|
|
||||||
|
|
||||||
def checkForKeyboardInNormalMode():
|
|
||||||
"""Returns a device if a ps2avrGB device in normal made (that is in keyboard mode) or None if it is not found."""
|
|
||||||
return usb.core.find(idVendor=0x20A0, idProduct=0x422D)
|
|
||||||
|
|
||||||
def checkForKeyboardInBootloaderMode():
|
|
||||||
"""Returns True if a ps2avrGB device in bootloader (flashable) mode is found and False otherwise."""
|
|
||||||
return (usb.core.find(idVendor=0x16c0, idProduct=0x05df) is not None)
|
|
||||||
|
|
||||||
def flashKeyboard(firmware_file):
|
|
||||||
"""Calls bootloadHID to flash the given file to the device."""
|
|
||||||
print('Flashing firmware to device ...')
|
|
||||||
if os.system('bootloadHID -r "%s"' % firmware_file) == 0:
|
|
||||||
print('\nDone!')
|
|
||||||
else:
|
|
||||||
print('\nbootloadHID returned an error.')
|
|
||||||
|
|
||||||
def printDeviceInfo(dev):
|
|
||||||
"""Prints all infos for a given USB device"""
|
|
||||||
print('Device Information:')
|
|
||||||
print(' idVendor: %d (0x%04x)' % (dev.idVendor, dev.idVendor))
|
|
||||||
print(' idProduct: %d (0x%04x)' % (dev.idProduct, dev.idProduct))
|
|
||||||
print('Manufacturer: %s' % (dev.iManufacturer))
|
|
||||||
print('Serial: %s' % (dev.iSerialNumber))
|
|
||||||
print('Product: %s' % (dev.iProduct), end='\n\n')
|
|
||||||
|
|
||||||
def sendDeviceToBootloaderMode(dev):
|
|
||||||
"""Tries to send a given ps2avrGB keyboard to bootloader mode to allow flashing."""
|
|
||||||
try:
|
|
||||||
dev.set_configuration()
|
|
||||||
|
|
||||||
request_type = usb.util.build_request_type(
|
|
||||||
usb.util.CTRL_OUT,
|
|
||||||
usb.util.CTRL_TYPE_CLASS,
|
|
||||||
usb.util.CTRL_RECIPIENT_DEVICE)
|
|
||||||
|
|
||||||
USBRQ_HID_SET_REPORT = 0x09
|
|
||||||
HID_REPORT_OPTION = 0x0301
|
|
||||||
|
|
||||||
dev.ctrl_transfer(request_type, USBRQ_HID_SET_REPORT, HID_REPORT_OPTION, 0, [0, 0, 0xFF] + [0] * 5)
|
|
||||||
except usb.core.USBError:
|
|
||||||
# for some reason I keep getting USBError, but it works!
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
print('Usage: %s <firmware.hex>' % sys.argv[0])
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
kb = checkForKeyboardInNormalMode()
|
|
||||||
|
|
||||||
if kb is not None:
|
|
||||||
print('Found a keyboad in normal mode. Attempting to send it to bootloader mode ...', end='')
|
|
||||||
sendDeviceToBootloaderMode(kb)
|
|
||||||
print(' done.')
|
|
||||||
print("Hint: If your keyboard can't be set to bootloader mode automatically, plug it in while pressing the bootloader key to do so manually.")
|
|
||||||
print(" You can find more infos about this here: https://github.com/qmk/qmk_firmware/tree/master/keyboards/ps2avrGB#setting-the-board-to-bootloader-mode")
|
|
||||||
|
|
||||||
attempts = 12 # 60 seconds
|
|
||||||
found = False
|
|
||||||
for attempt in range(1, attempts + 1):
|
|
||||||
print("Searching for keyboard in bootloader mode (%i/%i) ... " % (attempt, attempts), end='')
|
|
||||||
|
|
||||||
if checkForKeyboardInBootloaderMode():
|
|
||||||
print('Found', end='\n\n')
|
|
||||||
flashKeyboard(sys.argv[1])
|
|
||||||
found = True
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
print('Nothing.', end='')
|
|
||||||
|
|
||||||
if attempt != attempts: # no need to wait on the last attempt
|
|
||||||
print(' Sleeping 5 seconds.', end='')
|
|
||||||
time.sleep(5)
|
|
||||||
|
|
||||||
# print a newline
|
|
||||||
print()
|
|
||||||
|
|
||||||
if not found:
|
|
||||||
print("Couldn't find a flashable keyboard. Aborting.")
|
|
||||||
sys.exit(2)
|
|
||||||
|
|
|
@ -44,5 +44,5 @@ CUSTOM_MATRIX = yes
|
||||||
SRC = matrix.c i2c.c backlight_ps2avrGB.c
|
SRC = matrix.c i2c.c backlight_ps2avrGB.c
|
||||||
|
|
||||||
# programming options
|
# programming options
|
||||||
PROGRAM_CMD = ./keyboards/winkeyless/bface/program .build/$(TARGET).hex
|
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ $ brew cask install crosspack-avr
|
||||||
$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
|
$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
|
||||||
```
|
```
|
||||||
|
|
||||||
In order to use the `./program` script, which can reboot the board into
|
In order to use the `./util/atmega32a_program.py` script, which can reboot the board into
|
||||||
the bootloader, you'll need Python 2 with PyUSB installed:
|
the bootloader, you'll need Python 2 with PyUSB installed:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
|
@ -1,74 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
import usb
|
|
||||||
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
print('Usage: %s <firmware.hex>' % sys.argv[0])
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
print('Searching for ps2avrGB... ', end='')
|
|
||||||
|
|
||||||
dev = usb.core.find(idVendor=0x20A0, idProduct=0x422D)
|
|
||||||
if dev is None:
|
|
||||||
raise ValueError('Device not found')
|
|
||||||
|
|
||||||
print('Found', end='\n\n')
|
|
||||||
|
|
||||||
print('Device Information:')
|
|
||||||
print(' idVendor: %d (0x%04x)' % (dev.idVendor, dev.idVendor))
|
|
||||||
print(' idProduct: %d (0x%04x)' % (dev.idProduct, dev.idProduct))
|
|
||||||
print('Manufacturer: %s' % (dev.iManufacturer))
|
|
||||||
print('Serial: %s' % (dev.iSerialNumber))
|
|
||||||
print('Product: %s' % (dev.iProduct), end='\n\n')
|
|
||||||
|
|
||||||
print('Transferring control to bootloader... ', end='')
|
|
||||||
|
|
||||||
dev.set_configuration()
|
|
||||||
|
|
||||||
request_type = usb.util.build_request_type(
|
|
||||||
usb.util.CTRL_OUT,
|
|
||||||
usb.util.CTRL_TYPE_CLASS,
|
|
||||||
usb.util.CTRL_RECIPIENT_DEVICE)
|
|
||||||
|
|
||||||
USBRQ_HID_SET_REPORT = 0x09
|
|
||||||
HID_REPORT_OPTION = 0x0301
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
dev.ctrl_transfer(
|
|
||||||
request_type,
|
|
||||||
USBRQ_HID_SET_REPORT,
|
|
||||||
HID_REPORT_OPTION,
|
|
||||||
0,
|
|
||||||
[0, 0, 0xFF] + [0] * 5
|
|
||||||
)
|
|
||||||
except usb.core.USBError:
|
|
||||||
# for some reason I keep getting USBError, but it works!
|
|
||||||
pass
|
|
||||||
|
|
||||||
# wait a bit until bootloader starts up
|
|
||||||
time.sleep(2)
|
|
||||||
|
|
||||||
print('OK')
|
|
||||||
print('Programming...')
|
|
||||||
if os.system('bootloadHID -r "%s"' % sys.argv[1]) == 0:
|
|
||||||
print('\nDone!')
|
|
|
@ -59,4 +59,4 @@ SRC = matrix.c i2c.c backlight.c
|
||||||
|
|
||||||
|
|
||||||
# programming options
|
# programming options
|
||||||
PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex
|
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
|
||||||
|
|
|
@ -1,74 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
import usb
|
|
||||||
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
print('Usage: %s <firmware.hex>' % sys.argv[0])
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
print('Searching for ps2avrGB... ', end='')
|
|
||||||
|
|
||||||
dev = usb.core.find(idVendor=0x20A0, idProduct=0x422D)
|
|
||||||
if dev is None:
|
|
||||||
raise ValueError('Device not found')
|
|
||||||
|
|
||||||
print('Found', end='\n\n')
|
|
||||||
|
|
||||||
print('Device Information:')
|
|
||||||
print(' idVendor: %d (0x%04x)' % (dev.idVendor, dev.idVendor))
|
|
||||||
print(' idProduct: %d (0x%04x)' % (dev.idProduct, dev.idProduct))
|
|
||||||
print('Manufacturer: %s' % (dev.iManufacturer))
|
|
||||||
print('Serial: %s' % (dev.iSerialNumber))
|
|
||||||
print('Product: %s' % (dev.iProduct), end='\n\n')
|
|
||||||
|
|
||||||
print('Transferring control to bootloader... ', end='')
|
|
||||||
|
|
||||||
dev.set_configuration()
|
|
||||||
|
|
||||||
request_type = usb.util.build_request_type(
|
|
||||||
usb.util.CTRL_OUT,
|
|
||||||
usb.util.CTRL_TYPE_CLASS,
|
|
||||||
usb.util.CTRL_RECIPIENT_DEVICE)
|
|
||||||
|
|
||||||
USBRQ_HID_SET_REPORT = 0x09
|
|
||||||
HID_REPORT_OPTION = 0x0301
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
dev.ctrl_transfer(
|
|
||||||
request_type,
|
|
||||||
USBRQ_HID_SET_REPORT,
|
|
||||||
HID_REPORT_OPTION,
|
|
||||||
0,
|
|
||||||
[0, 0, 0xFF] + [0] * 5
|
|
||||||
)
|
|
||||||
except usb.core.USBError:
|
|
||||||
# for some reason I keep getting USBError, but it works!
|
|
||||||
pass
|
|
||||||
|
|
||||||
# wait a bit until bootloader starts up
|
|
||||||
time.sleep(2)
|
|
||||||
|
|
||||||
print('OK')
|
|
||||||
print('Programming...')
|
|
||||||
if os.system('bootloadHID -r "%s"' % sys.argv[1]) == 0:
|
|
||||||
print('\nDone!')
|
|
Loading…
Reference in a new issue