Keymap: Preonic kuatsure updates 2018-Nov (#4500)

* preonic-kuatsure: ctrl / esc in one key + hello ` again

* preonic-kuatsure: remove esc on lower

* preonic-kuatsure: programmy macros

* user-kuatsure: turn off console all the time

* preonic-kuatsure: auto shift, but only for numbers

* preonic-kuatsure: remove programmery macros

* preonic-kuatsure: move braces, parens, etc over to raise

backwards compat

move &*() on lower

* preonic-kuatsure: stop with the full rep of game layer

5 files changed, 38 insertions, 24 deletions

diff --git a/keyboards/preonic/keymaps/kuatsure/config.h b/keyboards/preonic/keymaps/kuatsure/config.h
index ba0ed525e0..bae774211a 100644
--- a/keyboards/preonic/keymaps/kuatsure/config.h
+++ b/keyboards/preonic/keymaps/kuatsure/config.h
@@ -3,6 +3,9 @@
 
 #include "config_common.h"
 
+#define NO_AUTO_SHIFT_SPECIAL
+#define NO_AUTO_SHIFT_ALPHA
+
 #ifdef AUDIO_ENABLE
     #define STARTUP_SONG SONG(PREONIC_SOUND)
     // #define STARTUP_SONG SONG(NO_SOUND)
diff --git a/keyboards/preonic/keymaps/kuatsure/keymap.c b/keyboards/preonic/keymaps/kuatsure/keymap.c
index 63c3937fca..5a7fa40e56 100644
--- a/keyboards/preonic/keymaps/kuatsure/keymap.c
+++ b/keyboards/preonic/keymaps/kuatsure/keymap.c
@@ -32,17 +32,19 @@ enum preonic_keycodes {
   GAME_MOD,
   LOWER,
   RAISE,
+
+  END_OF_LINE,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Qwerty
  * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+ * | Esc/C|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -50,32 +52,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT_preonic_grid_wrapper( \
-  KC_ESC,  _________________NUMBER_L1_________________, _________________NUMBER_R1_________________, KC_BSPC, \
+  KC_GRV,  _________________NUMBER_L1_________________, _________________NUMBER_R1_________________, KC_BSPC, \
   KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSLS, \
-  KC_LCTL, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, \
+  KT_CESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, \
   KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT,  \
   KC_LEAD, GAME, KC_LALT, KC_LGUI, LOWER,       KC_SPC, KC_SPC,      RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT  \
 ),
 
 /* Game
+ *
+ * Mostly transparent, but wanted to disable gui key, and give different raise / lower layers ( game_mod ).
+ * Also give a key to get back to qwerty layout.
+ *
  * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Leader|Qwerty| Alt  |  Spc |Game+ |    Space    |Game+ | Left | Down |  Up  |Right |
+ * |      |Qwerty|      |  Spc |Game+ |             |Game+ |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_GAME] = LAYOUT_preonic_grid_wrapper( \
-  KC_ESC,  _________________NUMBER_L1_________________, _________________NUMBER_R1_________________, KC_BSPC, \
-  KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSLS, \
-  KC_LCTL, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, \
-  KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT,  \
-  KC_LEAD, QWERTY, KC_LALT, KC_SPC, GAME_MOD,   KC_SPC, KC_SPC,   GAME_MOD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT  \
+  _______, _______, _______, _______, _______,  _______, _______, _______,  _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______,  _______, _______, _______,  _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______,  _______, _______, _______,  _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______,  _______, _______, _______,  _______, _______, _______, _______, \
+  _______, QWERTY,  _______, KC_SPC,  GAME_MOD, _______, _______, GAME_MOD, _______, _______, _______, _______  \
 ),
 
 /* Game Modifiers
@@ -101,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Lower
  * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   <  |   >  |      |      |      |
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |      |      |      |  Up  |      |   `  |      |   {  |   }  |  _   |      |  |   |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
@@ -109,35 +115,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      | Vol- | Prev | Play | Next | Vol+ |   -  |   [  |   ]  |      |  ?   |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Mute |      |      |      |     Esc     |      | Home | PgUp | PgDwn| End  |
+ * |      | Mute |      |      |      |             |      | Home | PgUp | PgDwn| End  |
  * `-----------------------------------------------------------------------------------'
  */
 [_LOWER] = LAYOUT_preonic_grid_wrapper( \
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,   KC_PERC, KC_CIRC, KC_LT,   KC_GT,   _______, _______, _______, \
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,   KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
   _______, _______, _______, KC_UP,   _______,  KC_GRV,  _______, KC_LCBR, KC_RCBR, KC_UNDS, _______, KC_PIPE, \
   _______, KC_DEL,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_TILD, KC_EQL,  KC_LPRN, KC_RPRN, KC_PLUS, KC_COLN, KC_DQT , \
   _______, KC_VOLD, KC_MRWD, KC_MPLY, KC_MFFD,  KC_VOLU, KC_MINS, KC_LBRC, KC_RBRC, _______, KC_QUES, _______, \
-  _______, KC_MUTE, _______, _______, _______,  KC_ESC,  KC_ESC,  _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END   \
+  _______, KC_MUTE, _______, _______, _______,  _______, _______, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END   \
 ),
 
 /* Raise
  * ,-----------------------------------------------------------------------------------.
  * | E`~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |      | Bksp |
+ * |      |  F9  |  F10 |  F11 |  F12 |      |      |   {  |   }  |      |      | Bksp |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F5  |  F6  |  F7  |  F8  |      |      |      |      |      |      |      |
+ * |      |  F5  |  F6  |  F7  |  F8  |      |      |   (  |   )  |   <  |   >  |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |      |      |      |      |      |      |      |
+ * |      |  F1  |  F2  |  F3  |  F4  |      |      |   [  |   ]  |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |    Enter    |      | Home | PgUp | PgDwn| End  |
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_preonic_grid_wrapper( \
   KC_GESC, KC_EXLM, KC_AT, KC_HASH,    KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
-  _______, ____________FUNCTION_3____________, _______, _______, _______, _______, _______, _______, KC_BSPC, \
-  _______, ____________FUNCTION_2____________, _______, _______, _______, _______, _______, _______, _______, \
-  _______, ____________FUNCTION_1____________, _______, _______, _______, _______, _______, _______, _______, \
+  _______, ____________FUNCTION_3____________, _______, _______, KC_LCBR, KC_RCBR, _______, _______, KC_BSPC, \
+  _______, ____________FUNCTION_2____________, _______, _______, KC_LPRN, KC_RPRN, KC_LT,   KC_GT,   _______, \
+  _______, ____________FUNCTION_1____________, _______, _______, KC_LBRC, KC_RBRC, _______, _______, _______, \
   _______, _______, _______, _______, _______, KC_ENT,  KC_ENT,  _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END   \
 ),
 
diff --git a/keyboards/preonic/keymaps/kuatsure/rules.mk b/keyboards/preonic/keymaps/kuatsure/rules.mk
index 9369f99a9e..4aacc70513 100644
--- a/keyboards/preonic/keymaps/kuatsure/rules.mk
+++ b/keyboards/preonic/keymaps/kuatsure/rules.mk
@@ -1,2 +1,3 @@
 BACKLIGHT_ENABLE  = no
 LEADER_ENABLE = yes
+AUTO_SHIFT_ENABLE = yes
diff --git a/users/kuatsure/kuatsure.h b/users/kuatsure/kuatsure.h
index 56fb684ec0..23d3c617cb 100644
--- a/users/kuatsure/kuatsure.h
+++ b/users/kuatsure/kuatsure.h
@@ -8,6 +8,8 @@ void tmux_pane_zoom(void);
 void tmux_pane_switch(uint16_t keycode);
 void tmux_window_switch(uint16_t keycode);
 
+#define KT_CESC CTL_T(KC_ESC)
+
 #undef LEADER_TIMEOUT
 #define LEADER_TIMEOUT 300
 
diff --git a/users/kuatsure/rules.mk b/users/kuatsure/rules.mk
index 11262d0ecf..f0d295aad0 100644
--- a/users/kuatsure/rules.mk
+++ b/users/kuatsure/rules.mk
@@ -1 +1,3 @@
+CONSOLE_ENABLE = no
+
 SRC += kuatsure.c