Mercurial > louis > kiibohd-controller

changeset 203:11f9e038812c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'test'
author Jacob Alexander <haata@kiibohd.com>
date Thu, 11 Sep 2014 10:57:58 -0700
parents 048c8a266a08 (diff) 1a68a9a04ad3 (current diff)
children b718fdb741c3
files
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Scan/DPH/scan_loop.c	Thu Sep 11 10:54:50 2014 -0700
+++ b/Scan/DPH/scan_loop.c	Thu Sep 11 10:57:58 2014 -0700
@@ -322,7 +322,7 @@
 
 // Signal KeyIndex_Buffer that it has been properly read
 // NOTE: Only really required for implementing "tricks" in converters for odd protocols
-void Scan_finishedWithBuffer( uint8_t sentKeys )
+void Scan_finishedWithMacro( uint8_t sentKeys )
 {
 	return;
 }
@@ -330,7 +330,7 @@
 
 // Signal KeyIndex_Buffer that it has been properly read and sent out by the USB module
 // NOTE: Only really required for implementing "tricks" in converters for odd protocols
-void Scan_finishedWithUSBBuffer( uint8_t sentKeys )
+void Scan_finishedWithOutput( uint8_t sentKeys )
 {
 	return;
 }
--- a/Scan/DPH/scan_loop.h	Thu Sep 11 10:54:50 2014 -0700
+++ b/Scan/DPH/scan_loop.h	Thu Sep 11 10:57:58 2014 -0700
@@ -53,8 +53,8 @@
 // Functions available to macro.c
 uint8_t Scan_sendData( uint8_t dataPayload );
 
-void Scan_finishedWithBuffer( uint8_t sentKeys );
-void Scan_finishedWithUSBBuffer( uint8_t sentKeys );
+void Scan_finishedWithMacro( uint8_t sentKeys );
+void Scan_finishedWithOutput( uint8_t sentKeys );
 
 
 #endif // __SCAN_LOOP_H