Fixed broken Magstripe project and TeensyHID bootloader.

diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile
index 2173c35..062a324 100644 (file)
--- a/Bootloaders/TeensyHID/makefile
+++ b/Bootloaders/TeensyHID/makefile
@@ -75,7 +75,7 @@ BOARD  = USBKEY
 #         F_CPU = 16000000\r
 #         F_CPU = 18432000\r
 #         F_CPU = 20000000\r
 #         F_CPU = 16000000\r
 #         F_CPU = 18432000\r
 #         F_CPU = 20000000\r

-F_CPU = 8000000\r
+F_CPU = 16000000\r

 \r
 \r
 # Input clock frequency.\r
 \r
 \r
 # Input clock frequency.\r


@@ -89,7 +89,7 @@ F_CPU = 8000000
 #\r
 #     If no clock division is performed on the input clock inside the AVR (via the\r
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.\r
 #\r
 #     If no clock division is performed on the input clock inside the AVR (via the\r
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.\r

-F_CLOCK = 8000000\r
+F_CLOCK = 16000000\r

 \r
 \r
 # Output format. (can be srec, ihex, binary)\r
 \r
 \r
 # Output format. (can be srec, ihex, binary)\r

diff --git a/Projects/Magstripe/CircularBitBuffer.h b/Projects/Magstripe/CircularBitBuffer.h
index 52410f6..71b9e26 100644 (file)
--- a/Projects/Magstripe/CircularBitBuffer.h
+++ b/Projects/Magstripe/CircularBitBuffer.h
@@ -47,7 +47,7 @@
                #if (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \\r
                     defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__)) || defined(__DOXYGEN__)\r
                        /** Maximum number of bits which can be stored into a bit buffer. The memory usage is one eigth of this value per buffer. */\r
                #if (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \\r
                     defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__)) || defined(__DOXYGEN__)\r
                        /** Maximum number of bits which can be stored into a bit buffer. The memory usage is one eigth of this value per buffer. */\r

-                       #define MAX_BITS 20480\r
+                       #define MAX_BITS 8192\r

                #else\r
                        #define MAX_BITS 1024\r
                #endif\r
                #else\r
                        #define MAX_BITS 1024\r
                #endif\r

diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c
index 0e10053..aef7812 100644 (file)
--- a/Projects/Magstripe/Magstripe.c
+++ b/Projects/Magstripe/Magstripe.c
@@ -316,13 +316,13 @@ bool GetNextReport(USB_KeyboardReport_Data_t* ReportData)
                if (OddReport)\r
                {\r
                        /* Set the report key code to the key code for the next data bit */\r
                if (OddReport)\r
                {\r
                        /* Set the report key code to the key code for the next data bit */\r

-                       ReportData->KeyCode[0] = BitBuffer_GetNextBit(Buffer) ? KEY_1 : KEY_0;\r
+                       ReportData->KeyCode = BitBuffer_GetNextBit(Buffer) ? KEY_1 : KEY_0;\r

                        \r
                        /* If buffer is now empty, a new line must be sent instead of the terminating bit */\r
                        if (!(Buffer->Elements))\r
                        {\r
                                /* Set the keycode to the code for an enter key press */\r
                        \r
                        /* If buffer is now empty, a new line must be sent instead of the terminating bit */\r
                        if (!(Buffer->Elements))\r
                        {\r
                                /* Set the keycode to the code for an enter key press */\r

-                               ReportData->KeyCode[0] = KEY_ENTER;                             \r
+                               ReportData->KeyCode = KEY_ENTER;                                \r

                        }\r
                }\r
 \r
                        }\r
                }\r
 \r

diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h
index 61f3098..fbf68e5 100644 (file)
--- a/Projects/Magstripe/Magstripe.h
+++ b/Projects/Magstripe/Magstripe.h
@@ -98,7 +98,7 @@
                {\r
                        uint8_t Modifier; /**< Modifier byte, indicating pressed modifier keys such as CTRL or ALT */\r
                        uint8_t Reserved; /**< Reserved for OEM use, always set to 0 */\r
                {\r
                        uint8_t Modifier; /**< Modifier byte, indicating pressed modifier keys such as CTRL or ALT */\r
                        uint8_t Reserved; /**< Reserved for OEM use, always set to 0 */\r

-                       uint8_t KeyCode[6]; /**< Key code array for pressed keys - up to six can be given simultaneously */\r
+                       uint8_t KeyCode; /**< Key code array for pressed keys - up to six can be given simultaneously */\r

                } USB_KeyboardReport_Data_t;\r
 \r
        /* Event Handlers: */\r
                } USB_KeyboardReport_Data_t;\r
 \r
        /* Event Handlers: */\r

diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile
index 98cf23d..25f3fa4 100644 (file)
--- 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.
 # 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.
 
 
 # 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.
 #
 #     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)
 
 
 # Output format. (can be srec, ihex, binary)