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
				
			
		| 
						 | 
				
			
			@ -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:
 | 
			
		||||
 | 
			
		||||
```
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex
 | 
			
		||||
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue