##| Set the base keyboard .kll map, defaults to "defaultMap" if not found
##| Looks in Scan/<Module Name> for the available BaseMaps
##| TODO Support layering in basemap
-set( BaseMap "50Key" )
+set( BaseMap "kishsaver" )
#set( BaseMap "defaultMap" )
##| Layer additonal .kll maps on the BaseMap, layers are in order from 1st to nth
##| Can be set to ""
-set( DefaultMap "colemak stdFuncMap" )
+set( DefaultMap "colemak kishsaver_unix1 stdFuncMap" )
##| ParitalMaps available on top of the BaseMap. See above for syntax on specifying multiple layers vs. layering
##| Can be set to ""
-set( PartialMaps "" )
-#set( PartialMaps "hhkbpro2" )
+#set( PartialMaps "hhkbpro2_slim" )
// ----- Variables -----
-// Buffer used to inform the macro processing module which keys have been detected as pressed
-volatile uint8_t KeyIndex_Buffer[KEYBOARD_BUFFER];
-volatile uint8_t KeyIndex_BufferUsed;
-
-
// Scan Module command dictionary
const char scanCLIDictName[] = "DPH Module Commands";
const CLIDictItem scanCLIDict[] = {
// CLI Control Variables
uint8_t enableAvgDebug = 0;
uint8_t enableKeyDebug = 0;
-uint8_t enablePressDebug = 1;
+uint8_t enablePressDebug = 0;
uint8_t senseDebugCount = 3; // In order to get boot-time oddities
}
-// Signal KeyIndex_Buffer that it has been properly read
+// Signal from macro module that keys have been processed
// NOTE: Only really required for implementing "tricks" in converters for odd protocols
void Scan_finishedWithMacro( uint8_t sentKeys )
{
}
-// Signal KeyIndex_Buffer that it has been properly read and sent out by the USB module
+// Signal from output module that keys have been processed/sent
// NOTE: Only really required for implementing "tricks" in converters for odd protocols
void Scan_finishedWithOutput( uint8_t sentKeys )
{
// Initial Keypress
Macro_keyState( key, 0x01 );
}
- else if ( keys_debounce[key] >= DEBOUNCE_THRESHOLD )
- {
- // Held Key
- Macro_keyState( key, 0x02 );
- }
keys_debounce[key]++;
}
+ else if ( keys_debounce[key] >= DEBOUNCE_THRESHOLD )
+ {
+ // Held Key
+ Macro_keyState( key, 0x02 );
+ }
// Long form key debugging
if ( enableKeyDebug )
{
// Debug message
// <key> [<strobe>:<mux>] : <sense val> : <delta + threshold> : <margin>
- dbug_msg("0x");
+ dbug_msg("");
printHex_op( key, 1 );
print(" [");
printInt8( strobe );
else
{
// Release Key
- if ( KeyIndex_BufferUsed > 0 && keys_debounce[key] >= DEBOUNCE_THRESHOLD )
+ if ( keys_debounce[key] >= DEBOUNCE_THRESHOLD )
{
Macro_keyState( key, 0x03 );
}