Major code cleanup and preparation for PartialMap Macro Module
- Code should be working, but much is untested - All of the old modules will need to update and use the new DefaultMap keymap - There might still be some naming conflicts with some Scan Modules
This commit is contained in:
Jacob Alexander
parent
f3e22fb242
commit
9d423a64a8
81 changed files with 1373 additions and 904 deletions
|
|
@ -1,15 +1,15 @@
|
|||
/* 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
|
||||
|
|
@ -38,11 +38,6 @@
|
|||
|
||||
// ----- Macros -----
|
||||
|
||||
// Make sure we haven't overflowed the buffer
|
||||
#define bufferAdd(byte) \
|
||||
if ( KeyIndex_BufferUsed < KEYBOARD_BUFFER ) \
|
||||
KeyIndex_Buffer[KeyIndex_BufferUsed++] = byte
|
||||
|
||||
|
||||
|
||||
// ----- Variables -----
|
||||
|
|
@ -105,7 +100,7 @@ ISR(USART1_RX_vect)
|
|||
// ----- Functions -----
|
||||
|
||||
// Setup
|
||||
inline void scan_setup()
|
||||
inline void Scan_setup()
|
||||
{
|
||||
// Setup the the USART interface for keyboard data input
|
||||
|
||||
|
|
@ -130,7 +125,7 @@ inline void scan_setup()
|
|||
|
||||
|
||||
// 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++ )
|
||||
|
|
@ -165,7 +160,7 @@ void processKeyValue( uint8_t valueType, uint8_t keyValue )
|
|||
// Key isn't in the buffer yet
|
||||
if ( c == KeyIndex_BufferUsed )
|
||||
{
|
||||
bufferAdd( keyValue );
|
||||
Macro_bufferAdd( keyValue );
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -206,7 +201,7 @@ void removeKeyValue( uint8_t keyValue )
|
|||
}
|
||||
|
||||
// Send data
|
||||
uint8_t scan_sendData( uint8_t dataPayload )
|
||||
uint8_t Scan_sendData( uint8_t dataPayload )
|
||||
{
|
||||
// Debug
|
||||
char tmpStr[6];
|
||||
|
|
@ -219,7 +214,7 @@ uint8_t scan_sendData( uint8_t dataPayload )
|
|||
}
|
||||
|
||||
// Signal KeyIndex_Buffer that it has been properly read
|
||||
void scan_finishedWithBuffer( uint8_t sentKeys )
|
||||
void Scan_finishedWithBuffer( uint8_t sentKeys )
|
||||
{
|
||||
// Make sure we aren't in the middle of a receiving a new scancode
|
||||
while ( KeyBufferCount != 0 );
|
||||
|
|
@ -276,7 +271,7 @@ void scan_finishedWithBuffer( uint8_t sentKeys )
|
|||
// Add back lost keys, so they are processed on the next USB send
|
||||
for ( ; key < prevBuffer; key++ )
|
||||
{
|
||||
bufferAdd( KeyIndex_Buffer[key] );
|
||||
Macro_bufferAdd( KeyIndex_Buffer[key] );
|
||||
info_print("Re-appending lost key after USB send...");
|
||||
}
|
||||
|
||||
|
|
@ -285,7 +280,7 @@ void scan_finishedWithBuffer( uint8_t sentKeys )
|
|||
{
|
||||
for ( uint8_t c = 0; c < latched; c++ )
|
||||
{
|
||||
bufferAdd( latchBuffer[c] );
|
||||
Macro_bufferAdd( latchBuffer[c] );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -293,23 +288,23 @@ void scan_finishedWithBuffer( uint8_t sentKeys )
|
|||
}
|
||||
|
||||
// Signal that the keys have been properly sent over USB
|
||||
void scan_finishedWithUSBBuffer( uint8_t sentKeys )
|
||||
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 );
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
/* 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
|
||||
|
|
@ -49,18 +49,18 @@ extern volatile uint8_t KeyIndex_Add_InputSignal;
|
|||
// ----- Functions -----
|
||||
|
||||
// Functions used by main.c
|
||||
void scan_setup( void );
|
||||
uint8_t scan_loop( void );
|
||||
void Scan_setup( void );
|
||||
uint8_t Scan_loop( void );
|
||||
|
||||
|
||||
// Functions available to macro.c
|
||||
uint8_t scan_sendData( uint8_t dataPayload );
|
||||
uint8_t Scan_sendData( uint8_t dataPayload );
|
||||
|
||||
void scan_finishedWithBuffer( uint8_t sentKeys );
|
||||
void scan_finishedWithUSBBuffer( uint8_t sentKeys );
|
||||
void scan_lockKeyboard( void );
|
||||
void scan_unlockKeyboard( void );
|
||||
void scan_resetKeyboard( void );
|
||||
void Scan_finishedWithBuffer( uint8_t sentKeys );
|
||||
void Scan_finishedWithUSBBuffer( uint8_t sentKeys );
|
||||
void Scan_lockKeyboard( void );
|
||||
void Scan_unlockKeyboard( void );
|
||||
void Scan_resetKeyboard( void );
|
||||
|
||||
|
||||
#endif // __SCAN_LOOP_H
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
###| CMake Kiibohd Controller Scan Module |###
|
||||
#
|
||||
# Written by Jacob Alexander in 2013 for the Kiibohd Controller
|
||||
# Written by Jacob Alexander in 2013,2014 for the Kiibohd Controller
|
||||
#
|
||||
# Released into the Public Domain
|
||||
#
|
||||
|
|
@ -18,33 +18,9 @@ set( SCAN_SRCS
|
|||
)
|
||||
|
||||
|
||||
###
|
||||
# Module H files
|
||||
#
|
||||
set( SCAN_HDRS
|
||||
scan_loop.h
|
||||
)
|
||||
|
||||
|
||||
###
|
||||
# File Dependency Setup
|
||||
#
|
||||
ADD_FILE_DEPENDENCIES( scan_loop.c ${SCAN_HDRS} )
|
||||
#add_file_dependencies( scan_loop.c ${SCAN_HDRS} )
|
||||
#add_file_dependencies( macro.c keymap.h facom6684.h )
|
||||
|
||||
|
||||
###
|
||||
# Module Specific Options
|
||||
#
|
||||
add_definitions( -I${HEAD_DIR}/Keymap )
|
||||
|
||||
#| Keymap Settings
|
||||
add_definitions(
|
||||
-DMODIFIER_MASK=facom6684_ModifierMask
|
||||
-DKEYINDEX_MASK=facom6684_ColemakMap
|
||||
#-DKEYINDEX_MASK=facom6684_DefaultMap
|
||||
)
|
||||
|
||||
|
||||
###
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue