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

diff --cc Scan/MatrixARM/matrix_scan.c
index 669314329efff3079c93dc065e45800b54cae004,017161d7e4d482a08a4ac1067f28ef1ca749372d..bbce1dfae458632a99e4731439b33df510fba990
--- 1/Scan/MatrixARM/matrix_scan.c
--- 2/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 );
                }
        }