From: CryHam <cryham@gmail.com>
Date: Tue, 1 Mar 2016 18:40:00 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kiibohd/controller
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a848a6bc79285a2e5b3705f126c36e5c5037d5ef;p=kiibohd-controller.git

Merge branch 'master' of github.com:kiibohd/controller
---

a848a6bc79285a2e5b3705f126c36e5c5037d5ef
diff --cc Scan/MatrixARM/matrix_scan.c
index 6693143,017161d..bbce1df
--- a/Scan/MatrixARM/matrix_scan.c
+++ b/Scan/MatrixARM/matrix_scan.c
@@@ -529,11 -505,15 +529,11 @@@ void Matrix_scan( uint16_t scanNum 
  			// final
  			// use saved state if ghosting, or current if not
  			st->cur = ghost > 0 ? st->saved : state->curState;
- 			
+ 
  			//  Send keystate to macro module
- 			KeyPosition k = !st->cur 
+ 			KeyPosition k = !st->cur
  				? (!st->prev ? KeyState_Off : KeyState_Release)
  				: ( st->prev ? KeyState_Hold : KeyState_Press);
 -			//if (!st->cur && !st->prev)  k = KeyState_Off; else
 -			//if ( st->cur &&  st->prev)  k = KeyState_Hold; else
 -			//if ( st->cur && !st->prev)  k = KeyState_Press; else
 -			//if (!st->cur &&  st->prev)  k = KeyState_Release;
  			Macro_keyState( key, k );
  		}
  	}