1 Commits

Author SHA1 Message Date
bcce430fbd This commit was manufactured by cvs2svn to create tag
'release080710'.
2008-07-10 19:00:59 +00:00
2 changed files with 8 additions and 19 deletions

View File

@ -1,9 +1,5 @@
$Id: Changelog.txt,v 1.3 2008/07/12 21:23:36 rschaten Exp $ $Id: Changelog.txt,v 1.2 2008/07/10 19:00:59 rschaten Exp $
* Release 080710 * Release 080710
- initial release - initial release
* Release 080712
- fixed usbSendReport() and backslash-key on european keyboards

View File

@ -2,7 +2,7 @@
* \file firmware/main.c * \file firmware/main.c
* \brief Main functions for USB-keyboard * \brief Main functions for USB-keyboard
* \author Ronald Schaten <ronald@schatenseite.de> * \author Ronald Schaten <ronald@schatenseite.de>
* \version $Id: main.c,v 1.5 2008/07/12 21:05:24 rschaten Exp $ * \version $Id: main.c,v 1.1 2008/07/09 20:47:12 rschaten Exp $
* *
* License: GNU GPL v2 (see License.txt) * License: GNU GPL v2 (see License.txt)
*/ */
@ -86,7 +86,7 @@
* - include an USB-hub into the keyboard * - include an USB-hub into the keyboard
* *
* If you are just a little like me, it won't take you much brainstorming to * If you are just a little like me, it won't take you much brainstorming to
* come up with own useful -- or even better: useless -- ideas. ;-) * come up with one useful -- or even better: useless -- ideas. ;-)
* *
* \section sec_install Building and installing * \section sec_install Building and installing
* *
@ -162,8 +162,7 @@
* I don't know if and how keyboard manufacturers face the problem of ghost * I don't know if and how keyboard manufacturers face the problem of ghost
* keys, I didn't take special measurements for this. I hope that the engineers * keys, I didn't take special measurements for this. I hope that the engineers
* at IBM distributed the keys on the matrix in a way that minimizes this * at IBM distributed the keys on the matrix in a way that minimizes this
* problem. Don't misunderstand: I haven't experienced that on this keyboard, * problem.
* but I know that it's a common problem on key-matrixes.
* *
* \section sec_files Files in the distribution * \section sec_files Files in the distribution
* *
@ -190,10 +189,6 @@
* their driver for my project. In fact, this project wouldn't exist without * their driver for my project. In fact, this project wouldn't exist without
* the driver. * the driver.
* *
* And of course I'd like to thank that friend of mine -- I doubt that he'd
* like to read his name in this place, I'll put it in if he wants me to --
* that gave me the idea for this project.
*
* \section sec_license About the license * \section sec_license About the license
* *
* My work - all contents except for the USB driver - is licensed under the GNU * My work - all contents except for the USB driver - is licensed under the GNU
@ -411,12 +406,10 @@ uint8_t usbFunctionWrite(uchar *data, uchar len) {
* \param key key-code * \param key key-code
*/ */
void usbSendReport(uint8_t mode, uint8_t key) { void usbSendReport(uint8_t mode, uint8_t key) {
// buffer for HID reports. we use a private one, so nobody gets disturbed reportBuffer[0] = mode;
uint8_t repBuffer[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; reportBuffer[1] = key;
repBuffer[0] = mode;
repBuffer[2] = key;
while (!usbInterruptIsReady()); // wait while (!usbInterruptIsReady()); // wait
usbSetInterrupt(repBuffer, sizeof(repBuffer)); // send usbSetInterrupt(reportBuffer, sizeof(reportBuffer)); // send
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
@ -435,7 +428,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 }, // 0
{KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved, KEY_Reserved }, // 1 {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_ESCAPE, KEY_Tab, KEY_grave, KEY_1, KEY_Q, KEY_A, KEY_Z, KEY_Reserved }, // 2
{KEY_Euro, KEY_capslock, KEY_F1, KEY_2, KEY_W, KEY_S, KEY_X, KEY_Reserved }, // 3 {KEY_backslash, 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_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_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 {KEY_F5, KEY_DELETE, KEY_F9, KEY_F10, KEY_Reserved, KEY_Reserved, KEY_Return, KEY_Spacebar }, // 6