From 35f126ca8239eacf5e5278605f5bd70b6c397ed0 Mon Sep 17 00:00:00 2001 From: Ronald Schaten Date: Sat, 12 Jul 2008 21:05:24 +0000 Subject: [PATCH] fixed usbSendReport() and backslash key --- firmware/main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/firmware/main.c b/firmware/main.c index d1763b8..f4426ad 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -2,7 +2,7 @@ * \file firmware/main.c * \brief Main functions for USB-keyboard * \author Ronald Schaten - * \version $Id: main.c,v 1.4 2008/07/11 19:11:37 rschaten Exp $ + * \version $Id: main.c,v 1.5 2008/07/12 21:05:24 rschaten Exp $ * * License: GNU GPL v2 (see License.txt) */ @@ -411,10 +411,12 @@ uint8_t usbFunctionWrite(uchar *data, uchar len) { * \param key key-code */ void usbSendReport(uint8_t mode, uint8_t key) { - reportBuffer[0] = mode; - reportBuffer[1] = key; + // buffer for HID reports. we use a private one, so nobody gets disturbed + uint8_t repBuffer[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + repBuffer[0] = mode; + repBuffer[2] = key; while (!usbInterruptIsReady()); // wait - usbSetInterrupt(reportBuffer, sizeof(reportBuffer)); // send + usbSetInterrupt(repBuffer, sizeof(repBuffer)); // send } /* ------------------------------------------------------------------------- */ @@ -433,7 +435,7 @@ const uint8_t PROGMEM keymatrix[16][8] = { {KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved }, // 0 {KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved }, // 1 {KEY_ESCAPE, KEY_Tab, KEY_grave, KEY_1, KEY_Q, KEY_A, KEY_Z, KEY_Reserved }, // 2 - {KEY_backslash, KEY_capslock, KEY_F1, KEY_2, KEY_W, KEY_S, KEY_X, KEY_Reserved }, // 3 + {KEY_Euro, KEY_capslock, KEY_F1, KEY_2, KEY_W, KEY_S, KEY_X, KEY_Reserved }, // 3 {KEY_F4, KEY_F3, KEY_F2, KEY_3, KEY_E, KEY_D, KEY_C, KEY_Reserved }, // 4 {KEY_G, KEY_T, KEY_5, KEY_4, KEY_R, KEY_F, KEY_V, KEY_B }, // 5 {KEY_F5, KEY_DELETE, KEY_F9, KEY_F10, KEY_Reserved, KEY_Reserved, KEY_Return, KEY_Spacebar }, // 6