forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed broken Magstripe project and TeensyHID bootloader.

Browse Source
pull/1469/head
Dean Camera 16 years ago
parent d770d98bca
commit a94b191164
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
Bootloaders/TeensyHID/makefile
Unescape View File

@ -75,7 +75,7 @@ BOARD = USBKEY
# F_CPU = 16000000 # F_CPU = 16000000
# F_CPU = 18432000 # F_CPU = 18432000
# F_CPU = 20000000 # F_CPU = 20000000
F_CPU = 8000000 F_CPU = 16000000
# Input clock frequency. # Input clock frequency.
@ -89,7 +89,7 @@ F_CPU = 8000000
# #
# If no clock division is performed on the input clock inside the AVR (via the # If no clock division is performed on the input clock inside the AVR (via the
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_CLOCK = 8000000 F_CLOCK = 16000000
# Output format. (can be srec, ihex, binary) # Output format. (can be srec, ihex, binary)

2
Projects/Magstripe/CircularBitBuffer.h
Unescape View File

@ -47,7 +47,7 @@
#if (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \ #if (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \
defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__)) || defined(__DOXYGEN__) defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__)) || defined(__DOXYGEN__)
/** Maximum number of bits which can be stored into a bit buffer. The memory usage is one eigth of this value per buffer. */ /** Maximum number of bits which can be stored into a bit buffer. The memory usage is one eigth of this value per buffer. */
#define MAX_BITS 20480 #define MAX_BITS 8192
#else #else
#define MAX_BITS 1024 #define MAX_BITS 1024
#endif #endif

4
Projects/Magstripe/Magstripe.c
Unescape View File

@ -316,13 +316,13 @@ bool GetNextReport(USB_KeyboardReport_Data_t* ReportData)
if (OddReport) if (OddReport)
{ {
/* Set the report key code to the key code for the next data bit */ /* Set the report key code to the key code for the next data bit */
ReportData->KeyCode[0] = BitBuffer_GetNextBit(Buffer) ? KEY_1 : KEY_0; ReportData->KeyCode = BitBuffer_GetNextBit(Buffer) ? KEY_1 : KEY_0;
/* If buffer is now empty, a new line must be sent instead of the terminating bit */ /* If buffer is now empty, a new line must be sent instead of the terminating bit */
if (!(Buffer->Elements)) if (!(Buffer->Elements))
{ {
/* Set the keycode to the code for an enter key press */ /* Set the keycode to the code for an enter key press */
ReportData->KeyCode[0] = KEY_ENTER; ReportData->KeyCode = KEY_ENTER;
} }
} }

2
Projects/Magstripe/Magstripe.h
Unescape View File

@ -98,7 +98,7 @@
{ {
uint8_t Modifier; /**< Modifier byte, indicating pressed modifier keys such as CTRL or ALT */ uint8_t Modifier; /**< Modifier byte, indicating pressed modifier keys such as CTRL or ALT */
uint8_t Reserved; /**< Reserved for OEM use, always set to 0 */ uint8_t Reserved; /**< Reserved for OEM use, always set to 0 */
uint8_t KeyCode[6]; /**< Key code array for pressed keys - up to six can be given simultaneously */ uint8_t KeyCode; /**< Key code array for pressed keys - up to six can be given simultaneously */
} USB_KeyboardReport_Data_t; } USB_KeyboardReport_Data_t;
/* Event Handlers: */ /* Event Handlers: */

4
Projects/Magstripe/makefile
Unescape View File

@ -66,7 +66,7 @@ MCU = at90usb1287
# Target board (see library BoardTypes.h documentation, USER or blank for projects not requiring # Target board (see library BoardTypes.h documentation, USER or blank for projects not requiring
# LUFA board drivers). If USER is selected, put custom board drivers in a directory called # LUFA board drivers). If USER is selected, put custom board drivers in a directory called
# "Board" inside the application directory. # "Board" inside the application directory.
BOARD = USBKEY BOARD = USER
# Processor frequency. # Processor frequency.
@ -101,7 +101,7 @@ F_CPU = 16000000
# #
# If no clock division is performed on the input clock inside the AVR (via the # If no clock division is performed on the input clock inside the AVR (via the
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_CLOCK = 8000000 F_CLOCK = 16000000
# Output format. (can be srec, ihex, binary) # Output format. (can be srec, ihex, binary)

Write Preview
Loading…
Cancel
Save