eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed incorrect definition of the HID_KEYBOARD_SC_D constant in the HID class driver (thanks to Opendous Inc.). 

Add extra comments to the ISPTarget.c source file in the AVRISP-MKII clone project.
This commit is contained in:
Dean Camera 2010-12-13 06:05:05 +00:00
parent 46677b4589
commit 0aa950c241
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LUFA/Drivers/USB/Class/Common/HID.h
View File

@ -111,7 +111,7 @@
#define HID_KEYBOARD_SC_A 0x04 #define HID_KEYBOARD_SC_A 0x04
#define HID_KEYBOARD_SC_B 0x05 #define HID_KEYBOARD_SC_B 0x05
#define HID_KEYBOARD_SC_C 0x06 #define HID_KEYBOARD_SC_C 0x06
#define HID_KEYBOARD_SC_D 0x04 #define HID_KEYBOARD_SC_D 0x07
#define HID_KEYBOARD_SC_E 0x08 #define HID_KEYBOARD_SC_E 0x08
#define HID_KEYBOARD_SC_F 0x09 #define HID_KEYBOARD_SC_F 0x09
#define HID_KEYBOARD_SC_G 0x0A #define HID_KEYBOARD_SC_G 0x0A
@ -239,7 +239,8 @@
#define HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN 0x86 #define HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN 0x86
#define HID_KEYBOARD_SC_INTERNATIONAL1 0x87 #define HID_KEYBOARD_SC_INTERNATIONAL1 0x87
#define HID_KEYBOARD_SC_INTERNATIONAL2 0x88 #define HID_KEYBOARD_SC_INTERNATIONAL2 0x88
#define HID_KEYBOARD_SC_INTERNATIONAL3 0x8A #define HID_KEYBOARD_SC_INTERNATIONAL3 0x89
#define HID_KEYBOARD_SC_INTERNATIONAL4 0x8A
#define HID_KEYBOARD_SC_INTERNATIONAL5 0x8B #define HID_KEYBOARD_SC_INTERNATIONAL5 0x8B
#define HID_KEYBOARD_SC_INTERNATIONAL6 0x8C #define HID_KEYBOARD_SC_INTERNATIONAL6 0x8C
#define HID_KEYBOARD_SC_INTERNATIONAL7 0x8D #define HID_KEYBOARD_SC_INTERNATIONAL7 0x8D

1
LUFA/ManPages/ChangeLog.txt
View File

@ -27,6 +27,7 @@
* - Core: * - Core:
* - Fixed broken USBFOO board drivers due to missing BOARD_USBFOO define * - Fixed broken USBFOO board drivers due to missing BOARD_USBFOO define
* - Fixed HID host class driver incorrectly binding to HID devices that do not have an OUT endpoint * - Fixed HID host class driver incorrectly binding to HID devices that do not have an OUT endpoint
* - Fixed incorrect definition of the HID_KEYBOARD_SC_D constant in the HID class driver (thanks to Opendous Inc.)
* - Library Applications: * - Library Applications:
* - Fixed Benito project discarding incoming data from the USB virtual serial port when the USART is busy * - Fixed Benito project discarding incoming data from the USB virtual serial port when the USART is busy
* - Fixed broken DFU bootloader, added XPLAIN support for bootloader start when XCK jumpered to ground * - Fixed broken DFU bootloader, added XPLAIN support for bootloader start when XCK jumpered to ground

3
Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
View File

@ -117,6 +117,7 @@ volatile uint8_t SoftSPI_BitsRemaining;
/** ISR to handle software SPI transmission and reception */ /** ISR to handle software SPI transmission and reception */
ISR(TIMER1_COMPA_vect, ISR_BLOCK) ISR(TIMER1_COMPA_vect, ISR_BLOCK)
{ {
/* Check if rising edge (output next bit) or falling edge (read in next bit) */
if (!(PINB & (1 << 1))) if (!(PINB & (1 << 1)))
{ {
if (SoftSPI_Data & (1 << 7)) if (SoftSPI_Data & (1 << 7))
@ -178,6 +179,8 @@ void ISPTarget_DisableTargetISP(void)
DDRB &= ~((1 << 1) | (1 << 2)); DDRB &= ~((1 << 1) | (1 << 2));
PORTB &= ~((1 << 0) | (1 << 3)); PORTB &= ~((1 << 0) | (1 << 3));
/* Must re-enable rescue clock once software ISP has exited, as the timer for the rescue clock is
* re-purposed for software SPI */
ISPTarget_ConfigureRescueClock(); ISPTarget_ConfigureRescueClock();
} }
} }