Merge pull request qmk#12 from obosob/ginny-improv

Fix behaviour of shift for ginny plus keymap fixes
obosob · Feb 6, 2020 · e1816b7 · e1816b7
2 parents 6b67eb5 + 28ddd6c
commit e1816b7
Show file tree

Hide file tree

Showing 9 changed files with 576 additions and 561 deletions.
diff --git a/keyboards/gboards/engine/engine.c b/keyboards/gboards/engine/engine.c
diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h
@@ -96,5 +96,4 @@ void 			CLICK_MOUSE(uint8_t);
 // Shift to internal representation
 // i.e) S(teno)R(ight)F
 #define STN(n) ((C_SIZE)1<<n)
-//#define ENGINE_HOOK(keycode, chord)	case keycode: pr ? (cChord |= (chord)): (cChord &= ~(chord)); break;
-#define ENGINE_HOOK(keycode, chord)	case keycode: cChord |= (chord); break;
+#define ENGINE_HOOK(keycode, chord)	case keycode: pr ? (pressed |= (chord)): (pressed &= ~(chord)); break;
diff --git a/keyboards/ginny/config.h b/keyboards/ginny/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Space saving jazz
 #define NO_ACTION_LAYER
 #define NO_ACTION_TAPPING
-#define NO_ACTION_ONESHOT
+//#define NO_ACTION_ONESHOT
 
 // General keyboard configs
 #define BOOTMAGIC_LITE_ROW 9

diff --git a/keyboards/ginny/config_engine.h b/keyboards/ginny/config_engine.h
@@ -2,37 +2,39 @@
 
 // Configuration options for the engine
 
-#define C_SIZE uint16_t				// type for chord
-#define COMBO_MAX 4						// Longest Combo
+#define C_SIZE uint16_t             // type for chord
+#define COMBO_MAX 4                     // Longest Combo
 
 // Key Aliases, must fit within C_SIZE!
 // These are for Ginni + Asetniop
-#define AA		STN(0)
-#define AS		STN(1)
-#define AE		STN(2)
-#define AT		STN(3)
-#define AN		STN(4)
-#define AI		STN(5)
-#define AO		STN(6)
-#define AP		STN(7)
-#define AL		STN(8)					// Left/Right thumbs
-#define AR		STN(9)
-#define NUM		STN(10)					// Sticky Layer 1
-#define USR   STN(11)					// Sticky Layer 2
-#define CMD		STN(12)					// Sticky Layer 3
+#define AA      STN(0)
+#define AS      STN(1)
+#define AE      STN(2)
+#define AT      STN(3)
+#define AN      STN(4)
+#define AI      STN(5)
+#define AO      STN(6)
+#define AP      STN(7)
+#define AL      STN(8)                  // Left/Right thumbs
+#define AR      STN(9)
+#define NUM     STN(10)                 // Sticky Layer 1
+#define USR     STN(11)                 // Sticky Layer 2
+#define CMD     STN(12)                 // Sticky Layer 3
 
 // Chord to start buffering strokes
-#define COMMAND_MODE	(AI | AN | AT | AE)
+#define COMMAND_MODE    (AI | AN | AT | AE)
 
 // Mapping of QMK Keycodes to chord positions
-#define ENGINE_CONFIG				\
-		ENGINE_HOOK(KC_A, AA) 	\
-		ENGINE_HOOK(KC_S, AS)		\
-		ENGINE_HOOK(KC_E, AE)		\
-		ENGINE_HOOK(KC_T, AT)		\
-		ENGINE_HOOK(KC_N, AN)		\
-		ENGINE_HOOK(KC_I, AI)		\
-		ENGINE_HOOK(KC_O, AO)		\
-		ENGINE_HOOK(KC_P, AP)		\
-		ENGINE_HOOK(KC_L, AL)		\
-		ENGINE_HOOK(KC_R, AR)		
+#define ENGINE_CONFIG               \
+        ENGINE_HOOK(KC_A, AA)       \
+        ENGINE_HOOK(KC_S, AS)       \
+        ENGINE_HOOK(KC_E, AE)       \
+        ENGINE_HOOK(KC_T, AT)       \
+        ENGINE_HOOK(KC_N, AN)       \
+        ENGINE_HOOK(KC_I, AI)       \
+        ENGINE_HOOK(KC_O, AO)       \
+        ENGINE_HOOK(KC_P, AP)       \
+        ENGINE_HOOK(KC_L, AL)       \
+        ENGINE_HOOK(KC_R, AR)       
+
+#define IN_CHORD_MASK (0xFFFF ^ AL)
diff --git a/keyboards/ginny/keymaps/default/dicts.def b/keyboards/ginny/keymaps/default/dicts.def
@@ -16,4 +16,4 @@
 #include "user.def"
 
 // For Debugging
-#include "dicts/testing/test.def"
+//#include "dicts/testing/test.def"
diff --git a/keyboards/ginny/keymaps/default/dicts/aset/en-keymap.def b/keyboards/ginny/keymaps/default/dicts/aset/en-keymap.def
diff --git a/keyboards/ginny/keymaps/default/dicts/aset/layer-keymap.def b/keyboards/ginny/keymaps/default/dicts/aset/layer-keymap.def
@@ -1,22 +1,22 @@
 // Thumb Keys
-PRES(AL,																																		KC_LSFT)
-PRES(AR,																																		KC_SPC)
+PRES(AL,											         KC_LSFT)
+PRES(AR,											          KC_SPC)
 
 // Layer Switches 
 // To Number
-SPEC(	 		 AR	| AA | AT | AN | AP,													SPEC_STICKY, 		NUM)
-SPEC(NUM | AR | AA | AT | AN | AP,													SPEC_STICKY, 		NUM)
-SPEC(CMD | AR | AA | AT | AN | AP,													SPEC_STICKY, 		NUM)
-SPEC(USR | AR | AA | AT | AN | AP,													SPEC_STICKY,		NUM)
+SPEC(      AA | AT | AN | AP,                       SPEC_STICKY, NUM)
+SPEC(NUM | AA | AT | AN | AP,                       SPEC_STICKY, NUM)
+SPEC(CMD | AA | AT | AN | AP,                       SPEC_STICKY, NUM)
+SPEC(USR | AA | AT | AN | AP,                       SPEC_STICKY, NUM)
 
 // To Command
-SPEC(			 AR	 | AS | AE | AI | AO,													SPEC_STICKY,		CMD)
-SPEC(NUM | AR  | AS | AE | AI | AO,													SPEC_STICKY,		CMD)
-SPEC(CMD | AR  | AE | AI | AO,															SPEC_STICKY,		NUM)
-SPEC(USR | AR  | AE | AI | AO,															SPEC_STICKY,		CMD)
+SPEC(      AS | AE | AI | AO,                       SPEC_STICKY, CMD)
+SPEC(NUM | AS | AE | AI | AO,                       SPEC_STICKY, CMD)
+SPEC(CMD | AS | AE | AI | AO,                       SPEC_STICKY, CMD)
+SPEC(USR | AS | AE | AI | AO,                       SPEC_STICKY, CMD)
 
 // To User
-SPEC(			 AA | AS | AE | AT | AN | AI | AO | AP | AL | AR,	SPEC_STICKY,		USR)
-SPEC(NUM | AA | AS | AE | AT | AN | AI | AO | AP | AL | AR,	SPEC_STICKY,		USR)
-SPEC(CMD | AA | AS | AE | AT | AN | AI | AO | AP | AL | AR, SPEC_STICKY,		USR)
-SPEC(USR | AA | AS | AE | AT | AN | AI | AO | AP | AL | AR, SPEC_STICKY,		USR)
+SPEC(      AA | AS | AE | AT | AN | AI | AO | AP,   SPEC_STICKY, USR)
+SPEC(NUM | AA | AS | AE | AT | AN | AI | AO | AP,   SPEC_STICKY, USR)
+SPEC(CMD | AA | AS | AE | AT | AN | AI | AO | AP,   SPEC_STICKY, USR)
+SPEC(USR | AA | AS | AE | AT | AN | AI | AO | AP,   SPEC_STICKY, USR)
diff --git a/keyboards/ginny/keymaps/default/dicts/aset/num-keymap.def b/keyboards/ginny/keymaps/default/dicts/aset/num-keymap.def
@@ -11,7 +11,6 @@ PRES(NUM|AE|AT,
 PRES(NUM|AS|AT,                                                                                     KC_NO)
 PRES(NUM|AN|AO,                                                                                     KC_NO)
 PRES(NUM|AS|AI,                                                                                    KC_EQL)
-PRES(NUM|AA|AS,                                                                                    KC_SPC)
 PRES(NUM|AS|AO,                                                                                    KC_DOT)
 PRES(NUM|AI|AO,                                                                                    KC_EQL)
 PRES(NUM|AS|AN,                                                                                    KC_END)
@@ -27,9 +26,8 @@ PRES(NUM|AE|AO,
 PRES(NUM|AO|AP,                                                                                   KC_SCLN)
 PRES(NUM|AE|AI,                                                                                   KC_COMM)
 PRES(NUM|AE|AP,                                                                                   KC_QUOT)
-PRES(NUM|AN|AI|AO|AP,                                                                              KC_TAB)
-PRES(NUM|AA|AT|AN|AP,                                                                              KC_SPC)
-PRES(NUM|AA|AS|AE|AT|AN|AI|AO|AP,                                                                  KC_SPC)
+PRES(NUM|AA|AS|AE|AT,                                                                              KC_TAB)
+PRES(NUM|AN|AI|AO|AP,                                                                              KC_ENT)
 KEYS(NUM|AS|AP,                         cmb_ea889bef063f6825,                  {KC_LSFT, KC_0, COMBO_END})
 KEYS(NUM|AA|AI,                         cmb_e9bf29584cf72c14,                  {KC_LSFT, KC_1, COMBO_END})
 KEYS(NUM|AA|AO,                         cmb_bff41f9e9cd6fd93,                  {KC_LSFT, KC_9, COMBO_END})
diff --git a/keyboards/ginny/rules.mk b/keyboards/ginny/rules.mk
@@ -1,21 +1,21 @@
 # MCU name
-MCU = atmega32u4
-BOOTLOADER = atmel-dfu
+MCU                 =   atmega32u4
+BOOTLOADER          =   atmel-dfu
 
-CUSTOM_MATRIX			= yes
-VIRTSER_ENABLE		= no
-NKRO_ENABLE				= yes
-DEBOUNCE_TYPE			= eager_pr
+CUSTOM_MATRIX       =   yes
+VIRTSER_ENABLE      =   no
+NKRO_ENABLE         =   no
+DEBOUNCE_TYPE       =   eager_pr
 
 # Lets try and save some space eh?
-MOUSEKEY_ENABLE   = no
-EXTRAKEY_ENABLE   = no
-CONSOLE_ENABLE		= yes
-COMMAND_ENABLE		= no
+MOUSEKEY_ENABLE     =   no
+EXTRAKEY_ENABLE     =   no
+CONSOLE_ENABLE      =   no
+COMMAND_ENABLE      =   no
 
-VPATH						+= keyboards/gboards/engine
-SRC							+= matrix.c engine.c
-QUANTUM_LIB_SRC += i2c_master.c
-OPT_DEFS				+= -DONLYQWERTY 
-#OPT_DEFS				+= -DONLYQWERTY -DDEBUG_MATRIX -save-temps -c
-LTO_ENABLE = yes
+VPATH               +=  keyboards/gboards/engine
+SRC                 +=  matrix.c engine.c
+QUANTUM_LIB_SRC     +=  i2c_master.c
+OPT_DEFS            +=  -DONLYQWERTY 
+#OPT_DEFS           +=  -DONLYQWERTY -DDEBUG_MATRIX -save-temps -c
+LTO_ENABLE          =   yes