aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/jj50
diff options
context:
space:
mode:
authorzvecr <git@zvecr.com>2019-03-14 22:55:08 +0000
committerDrashna Jaelre <drashna@live.com>2019-03-14 15:55:08 -0700
commit205ffc277c1b6cb25d11f0938d4df02048870fa5 (patch)
tree449c1448855b51fe7d814b17bc89add848fd9a55 /keyboards/jj50
parentc025d813baf7ca1dcd427b293b36603339ac31f7 (diff)
downloadfirmware-205ffc277c1b6cb25d11f0938d4df02048870fa5.tar.gz
firmware-205ffc277c1b6cb25d11f0938d4df02048870fa5.tar.bz2
firmware-205ffc277c1b6cb25d11f0938d4df02048870fa5.zip
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'
Diffstat (limited to 'keyboards/jj50')
-rw-r--r--keyboards/jj50/README.md2
-rw-r--r--keyboards/jj50/program74
-rw-r--r--keyboards/jj50/rules.mk2
3 files changed, 2 insertions, 76 deletions
diff --git a/keyboards/jj50/README.md b/keyboards/jj50/README.md
index 397889535..f7b8acc64 100644
--- a/keyboards/jj50/README.md
+++ b/keyboards/jj50/README.md
@@ -37,7 +37,7 @@ $ brew cask install crosspack-avr
$ 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:
```
diff --git a/keyboards/jj50/program b/keyboards/jj50/program
deleted file mode 100644
index a88d9cd9b..000000000
--- a/keyboards/jj50/program
+++ /dev/null
@@ -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!')
diff --git a/keyboards/jj50/rules.mk b/keyboards/jj50/rules.mk
index 1a18ec4fe..4ee571918 100644
--- a/keyboards/jj50/rules.mk
+++ b/keyboards/jj50/rules.mk
@@ -58,6 +58,6 @@ CUSTOM_MATRIX = yes
SRC = matrix.c i2c.c backlight.c
# programming options
-PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex
+PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
LAYOUTS = ortho_5x12