eryn/kiibohd-controller
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial MatrixARM implementation

Browse source 
- Cleaned up Macro and USB callback naming
- Added security jumper for automated reload (MCHCK based only)
- Added additional LED position
This commit is contained in:
Jacob Alexander 2014-08-01 01:26:25 -07:00
parent c1f8a2c545
commit d6345c307f
16 changed files with 706 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Macro/PartialMap/macro.c
View file

@ -248,13 +248,6 @@ void Macro_evalResultMacro( ResultMacro *resultMacro )
}
// Called immediately after USB has finished sending a buffer
inline void Macro_finishWithUSBBuffer( uint8_t sentKeys )
{
// XXX Currently not used to trigger anything (with this particular Macro module)
}
// Macro Procesing Loop
// Called once per USB buffer send
inline void Macro_process()
@ -349,8 +342,9 @@ inline void Macro_process()
}
*/
// Signal buffer that we've used it
Scan_finishedWithBuffer( KeyIndex_BufferUsed );
// Signal buffer that we've used it TODO
Scan_finishedWithMacro( 0 );
//Scan_finishedWithBuffer( KeyIndex_BufferUsed );
// If Macro debug mode is set, clear the USB Buffer
if ( macroDebugMode )

45
Macro/PartialMap/macro.h
View file

@ -1,22 +1,17 @@
/* Copyright (C) 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:
* This file is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
* You should have received a copy of the GNU General Public License
* along with this file. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __macro_h
@ -29,31 +24,11 @@
// ----- Defines -----
// Key states (DO NOT USE for analog keyboards)
#define DEPRESSED 0
#define RELEASED 1
#define PRESSED 254
#define HELD 255
// ----- Variables -----
// ----- Macros -----
// ----- Functions -----
void Macro_keyState( uint8_t scanCode, uint8_t state );
void Macro_analogState( uint8_t scanCode, uint8_t state );
void Macro_ledState( uint8_t ledCode, uint8_t state );
void Macro_bufferAdd( uint8_t byte );
void Macro_bufferRemove( uint8_t byte );
void Macro_finishWithUSBBuffer( uint8_t sentKeys );
void Macro_process();
void Macro_setup();