-/* Copyright (C) 2013 by Jacob Alexander
- *
+/* Copyright (C) 2013-2014 by Jacob Alexander
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// ----- Includes -----
-// AVR Includes
-#include <avr/interrupt.h>
-#include <avr/io.h>
-#include <util/delay.h>
+// Compiler Includes
+#include <Lib/ScanLib.h>
// Project Includes
#include <led.h>
// ----- Macros -----
-// Make sure we haven't overflowed the buffer
-#define bufferAdd(byte) \
- if ( KeyIndex_BufferUsed < KEYBOARD_BUFFER ) \
- KeyIndex_Buffer[KeyIndex_BufferUsed++] = byte
-
// ----- Variables -----
volatile uint8_t KeyIndex_Buffer[KEYBOARD_BUFFER];
volatile uint8_t KeyIndex_BufferUsed;
+volatile uint8_t KeyBufferRemove[6];
+volatile uint8_t KeyBufferRemoveCount = 0;
+
static uint8_t KeyBuffer[3];
-static uint8_t KeyBufferCount = 0;
+volatile static uint8_t KeyBufferCount = 0;
{
cli(); // Disable Interrupts
-
// Read part of the scan code (3 8bit chunks) from USART
KeyBuffer[KeyBufferCount] = UDR1;
if ( KeyBufferCount >= 2 )
{
- KeyBufferCount = 0;
-
// Debug
for ( uint8_t c = 0; c <= 2; c++ )
{
print("\n");
processKeyValue( KeyBuffer[1], KeyBuffer[2] );
+
+ KeyBufferCount = 0;
}
else
{
// ----- Functions -----
// Setup
-inline void scan_setup()
+inline void Scan_setup()
{
// Setup the the USART interface for keyboard data input
- // NOTE: The input data signal needs to be inverted for the Teensy USART to properly work
-
+
// Setup baud rate
// 16 MHz / ( 16 * Baud ) = UBRR
// Baud: 4817 -> 16 MHz / ( 16 * 4817 ) = 207.5981
// Main Detection Loop
-inline uint8_t scan_loop()
+inline uint8_t Scan_loop()
{
+ // Remove any "released keys", this is delayed due to buffer release synchronization issues
+ for ( uint8_t c = 0; c < KeyBufferRemoveCount; c++ )
+ {
+ removeKeyValue( KeyBufferRemove[c] );
+ }
+
+ KeyBufferRemoveCount = 0;
+
return 0;
}
break;
// Modifier Key Release
case 0x02:
- removeKeyValue( keyValue );
+ KeyBufferRemove[KeyBufferRemoveCount++] = keyValue;
return;
}
// Key isn't in the buffer yet
if ( c == KeyIndex_BufferUsed )
{
- bufferAdd( keyValue );
+ Macro_bufferAdd( keyValue );
break;
}
}
}
-// Send data
-uint8_t scan_sendData( uint8_t dataPayload )
+// Send data
+uint8_t Scan_sendData( uint8_t dataPayload )
{
// Debug
char tmpStr[6];
}
// Signal KeyIndex_Buffer that it has been properly read
-void scan_finishedWithBuffer( void )
+void Scan_finishedWithBuffer( uint8_t sentKeys )
{
-}
+ // Make sure we aren't in the middle of a receiving a new scancode
+ while ( KeyBufferCount != 0 );
+
+ cli(); // Disable Interrupts
-// Signal that the keys have been properly sent over USB
-void scan_finishedWithUSBBuffer( void )
-{
// Count for number of modifiers to maintain in the buffer
uint8_t filled = 0;
uint8_t latched = 0;
uint8_t latchBuffer[13]; // There are only 13 keys that can possibly be latched at the same time...
uint8_t normal = 0;
+ uint8_t prevBuffer = KeyIndex_BufferUsed;
// Clean out all keys except "special" keys (designated modifiers)
- for ( uint8_t c = 0; c < KeyIndex_BufferUsed; c++ )
+ uint8_t key;
+ for ( key = 0; key < sentKeys; key++ )
{
- switch ( KeyIndex_Buffer[c] )
+ switch ( KeyIndex_Buffer[key] )
{
// Dedicated Modifier Keys
// NOTE: Both shifts are represented as the same scan code
case 0x04:
case 0x05:
case 0x12:
- KeyIndex_Buffer[filled++] = KeyIndex_Buffer[c];
+ KeyIndex_Buffer[filled++] = KeyIndex_Buffer[key];
break;
// Latched Keys, only released if a non-modifier is pressed along with it
// NOTE: This keys do not have a built in repeating
case 0x00:
case 0x01:
case 0x03:
- case 0x0B:
+ //case 0x0B: // XXX Being used as an alternate Enter, since it is labelled as such
case 0x22:
case 0x10:
case 0x11:
case 0x30:
case 0x31:
case 0x40:
- case 0x41:
- latchBuffer[latched++] = KeyIndex_Buffer[c];
+ //case 0x41: // XXX Being used as ESC
+ latchBuffer[latched++] = KeyIndex_Buffer[key];
break;
// Allow the scancode to be removed, normal keys
default:
// Reset the buffer counter
KeyIndex_BufferUsed = filled;
+ // Add back lost keys, so they are processed on the next USB send
+ for ( ; key < prevBuffer; key++ )
+ {
+ Macro_bufferAdd( KeyIndex_Buffer[key] );
+ info_print("Re-appending lost key after USB send...");
+ }
+
// Only "re-add" the latched keys if they weren't used
if ( latched > 0 && normal == 0 )
{
for ( uint8_t c = 0; c < latched; c++ )
{
- bufferAdd( latchBuffer[c] );
+ Macro_bufferAdd( latchBuffer[c] );
}
}
+
+ sei(); // Re-enable Interrupts
+}
+
+// Signal that the keys have been properly sent over USB
+void Scan_finishedWithUSBBuffer( uint8_t sentKeys )
+{
}
// Reset/Hold keyboard
// NOTE: Does nothing with the FACOM6684
-void scan_lockKeyboard( void )
+void Scan_lockKeyboard( void )
{
}
// NOTE: Does nothing with the FACOM6684
-void scan_unlockKeyboard( void )
+void Scan_unlockKeyboard( void )
{
}
// Reset Keyboard
-void scan_resetKeyboard( void )
+void Scan_resetKeyboard( void )
{
// Not a calculated valued...
_delay_ms( 50 );
KeyBufferCount = 0;
+ KeyBufferRemoveCount = 0;
KeyIndex_BufferUsed = 0;
}
projects / kiibohd-controller.git / blobdiff