[Keyboard] update keymap of zergo keyboard (#10402)

* Rename keyboards/handwired/zergo/keymap.c to keyboards/handwired/zergo/keymaps/default/keymap.c

* Update rules.mk

* Update rules.mk

* Update bootloader.mk

* Update rules.mk

* Update bootloader.mk

* Update info.json

* Update rules.mk

* Update zergo.h

* Update info.json

* Update keymap.c

* Update keyboards/handwired/zergo/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/handwired/zergo/keymaps/default/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* update layout

* update zergo layout

* update layout

* Update keyboards/handwired/zergo/keymaps/default/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

4 files changed, 49 insertions, 41 deletions

diff --git a/keyboards/handwired/zergo/config.h b/keyboards/handwired/zergo/config.h
index 55fbd280c..8bac9970a 100644
--- a/keyboards/handwired/zergo/config.h
+++ b/keyboards/handwired/zergo/config.h
@@ -33,18 +33,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B1, D7, C3, D6, D5, D4 }
 #define MATRIX_COL_PINS { C7, C6, C5, C4, C2, C1, B7, D3, D2, B6, B5, B4, B3, B2 }
-#define UNUSED_PINS
+#define UNUSED_PINS { A0, A1, A2, A3, A4, A5, A6, A7, B0, C0, E0, E1, E4, E5, F0, F1, F2, F3, F4, F5, F6, F7 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/zergo/keymaps/default/keymap.c b/keyboards/handwired/zergo/keymaps/default/keymap.c
index a9dcc82ae..19a2b9b2c 100644
--- a/keyboards/handwired/zergo/keymaps/default/keymap.c
+++ b/keyboards/handwired/zergo/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 E.Zelianin
+ /* Copyright 2020 E.Zelianin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,22 +16,37 @@
 
 #include QMK_KEYBOARD_H
 
+// Each layer gets a name for readability.
+enum zergo_layers {
+    l_main,
+    l_arrows,
+};
+
+//define keycode custom names to better structure view of layout
+#define K_SPCFN LT(l_arrows,KC_SPC)     // tap for space, hold for arrows layer
+#define K_SHHOME MT(MOD_LSFT,KC_HOME)   // tap for home, hold for shift
+#define K_CEND MT(MOD_LCTL,KC_END)      // tap for end, hoild for control
+#define K_SHPGUP MT(MOD_RSFT,KC_PGUP)   // tap for pageup, hoLd for shift
+#define K_CPGDN MT(MOD_RCTL, KC_PGDN)   // tap for pagedown, hold for control
+#define K_LNG LCTL(KC_LSFT)             // control+shift (to change lahguage)
+#define K_CENTER MT(MOD_RCTL,KC_ENTER)  // tap for enter, hold for control
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	LAYOUT(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
-		KC_DEL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, 
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSLS, 
-		KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_RCTL, 
-		MT(MOD_LSFT, KC_HOME), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RBRC, MT(MOD_RSFT, KC_PGUP), 
-		MT(MOD_LCTL, KC_END), KC_DOWN, KC_RGHT, KC_LALT, KC_SPC, KC_ENT, KC_SPC, KC_RALT, KC_LGUI, KC_MENU, MT(MOD_RCTL, KC_PGDN)),
+[l_main] = LAYOUT(
+  KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,         KC_F5,    KC_F6,    KC_F7,    KC_F8,         KC_F9,    KC_F10,   KC_F11,   KC_F12,
+  KC_DEL,   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,          K_LNG,         KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_BSLS,
+  KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,                         KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  K_CENTER,
+  K_SHHOME, KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,          KC_BSPC,       KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RBRC,  K_SHPGUP,
+  K_CEND,   KC_NO,    KC_NO,    KC_LALT,            KC_SPC,        KC_ENT,        K_SPCFN,                      KC_RALT,  KC_APP,   KC_RGUI,  K_CPGDN),
 
-	LAYOUT(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, KC_UP, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+[l_arrows] = LAYOUT(
+  _______,            _______,  _______,  _______,  _______,      _______,    _______,  _______,  _______,      _______,  _______,  _______,  RESET,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,                      KC_ENT,   KC_UP,    KC_BSPC,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,       _______,       KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,            _______,       KC_INS,        _______,                      _______,  _______,  _______,  _______),
 
 };
diff --git a/keyboards/handwired/zergo/rules.mk b/keyboards/handwired/zergo/rules.mk
index e633ab396..ea5530ffa 100644
--- a/keyboards/handwired/zergo/rules.mk
+++ b/keyboards/handwired/zergo/rules.mk
@@ -7,16 +7,16 @@ BOOTLOADER = halfkay
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
+BOOTMAGIC_ENABLE = lite					# Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no						# Mouse keys
+EXTRAKEY_ENABLE = no      			# Audio control and System control
+CONSOLE_ENABLE = no        			# Console for debug
+COMMAND_ENABLE = yes        		# Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no       		# Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
-AUDIO_ENABLE = no           # Audio output
+NKRO_ENABLE = yes           		# USB Nkey Rollover
+BACKLIGHT_ENABLE = no       		# Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        		# Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       		# Enable Bluetooth
+AUDIO_ENABLE = no           		# Audio output
diff --git a/keyboards/handwired/zergo/zergo.h b/keyboards/handwired/zergo/zergo.h
index 5b7695868..ba6532164 100644
--- a/keyboards/handwired/zergo/zergo.h
+++ b/keyboards/handwired/zergo/zergo.h
@@ -19,17 +19,17 @@
 #include "quantum.h"
 
 #define LAYOUT( \
-	K000,       K002, K003, K004, K005,     K006, K007, K008, K009,     K010, K011, K012, K013, \
-	K100, K101, K102, K103, K104, K105, K206, K106, K107, K108, K109, K110, K111, K112, K113, \
-	K200, K201, K202, K203, K204, K205, K306, K207, K208, K209, K210, K211, K212, K213, \
-	K300, K301, K302, K303, K304, K305,     K307, K308, K309, K310, K311, K312, K313, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \
-	K500, K501, K502, K503,       K505, K506, K507,       K509,       K511, K512, K513  \
+	  K000,         K002,  K003,  K004,  K005, K006,  K007, K008, K009, K010, K011, K012, K013, \
+	  K100,  K101,  K102,  K103,  K104,  K105, K206,  K106, K107, K108, K109, K110, K111, K112, K113, \
+	  K200,  K201,  K202,  K203,  K204,  K205,        K306, K207, K208, K209, K210, K211, K212, K213, \
+	  K300,  K301,  K302,  K303,  K304,  K305,        K307, K308, K309, K310, K311, K312, K313, \
+	  K400,  K401,  K402,  K403,  K404,  K405, K406,  K407, K408, K409, K410, K411, K412, K413, \
+	  K500,  K501,  K502,  K503,         K505, K506,  K507,       K509, K510, K512, K513  \
 ) { \
 	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013 }, \
 	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113 }, \
 	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213 }, \
 	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313 }, \
 	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413 }, \
-	{ K500,  K501,  K502,  K503,  KC_NO, K505,  K506,  K507,  KC_NO, K509,  KC_NO, K511,  K512,  K513 }  \
+	{ K500,  K501,  K502,  K503,  KC_NO, K505,  K506,  K507,  KC_NO, K509,  K510,  KC_NO, K512,  K513 }  \
 }