aboutsummaryrefslogtreecommitdiffstats
path: root/Projects
diff options
context:
space:
mode:
Diffstat (limited to 'Projects')
-rw-r--r--Projects/Magstripe/CircularBitBuffer.h2
-rw-r--r--Projects/Magstripe/Magstripe.c4
-rw-r--r--Projects/Magstripe/Magstripe.h2
-rw-r--r--Projects/Magstripe/makefile4
4 files changed, 6 insertions, 6 deletions
diff --git a/Projects/Magstripe/CircularBitBuffer.h b/Projects/Magstripe/CircularBitBuffer.h
index 52410f649..71b9e26a7 100644
--- a/Projects/Magstripe/CircularBitBuffer.h
+++ b/Projects/Magstripe/CircularBitBuffer.h
@@ -47,7 +47,7 @@
#if (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \
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. */
- #define MAX_BITS 20480
+ #define MAX_BITS 8192
#else
#define MAX_BITS 1024
#endif
diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c
index 0e10053da..aef7812fa 100644
--- a/Projects/Magstripe/Magstripe.c
+++ b/Projects/Magstripe/Magstripe.c
@@ -316,13 +316,13 @@ bool GetNextReport(USB_KeyboardReport_Data_t* ReportData)
if (OddReport)
{
/* 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->Elements))
{
/* Set the keycode to the code for an enter key press */
- ReportData->KeyCode[0] = KEY_ENTER;
+ ReportData->KeyCode = KEY_ENTER;
}
}
diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h
index 61f3098ea..fbf68e51c 100644
--- a/Projects/Magstripe/Magstripe.h
+++ b/Projects/Magstripe/Magstripe.h
@@ -98,7 +98,7 @@
{
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 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;
/* Event Handlers: */
diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile
index 98cf23de0..25f3fa429 100644
--- a/Projects/Magstripe/makefile
+++ b/Projects/Magstripe/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# 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
# "Board" inside the application directory.
-BOARD = USBKEY
+BOARD = USER
# Processor frequency.
@@ -101,7 +101,7 @@ F_CPU = 16000000
#
# 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.
-F_CLOCK = 8000000
+F_CLOCK = 16000000
# Output format. (can be srec, ihex, binary)