Merge pull request #530 from koron/refine-keymaps-529

fix keymaps
Yowkees · Mar 25, 2024 · 6f3ca3e · 6f3ca3e
2 parents f6ce533 + 90e5491
commit 6f3ca3e
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 42 deletions.
diff --git a/qmk_firmware/keyboards/keyball/keyball39/keymaps/default/keymap.c b/qmk_firmware/keyboards/keyball/keyball39/keymaps/default/keymap.c
@@ -34,21 +34,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_RBRC , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 ,
  KC_F5 , KC_EXLM , S(KC_6) ,S(KC_INT3), S(KC_8) , S(KC_INT1), KC_BTN1 , KC_PGUP , KC_BTN2 , KC_SCLN ,
  S(KC_EQL),S(KC_LBRC),S(KC_7) , S(KC_2) ,S(KC_RBRC), KC_LBRC , KC_DLR , KC_PGDN , KC_BTN3 , KC_F11 ,
- KC_INT1 , KC_EQL , S(KC_3) , _______ , _______ , _______ ,  TO(2) ,  TO(0) , _______ , KC_RALT , KC_RGUI , KC_F12
+ KC_INT1 , KC_EQL , S(KC_3) , _______ , _______ , _______ , TO(2)  , TO(0) , _______ , KC_RALT , KC_RGUI , KC_F12
  ),
 
  [2] = LAYOUT_universal(
  KC_TAB , KC_7 , KC_8 , KC_9 , KC_MINS , KC_NUHS , _______ , KC_BTN3 , _______ , KC_BSPC ,
  S(KC_QUOT), KC_4 , KC_5 , KC_6 ,S(KC_SCLN), S(KC_9) , KC_BTN1 , KC_UP , KC_BTN2 , KC_QUOT ,
  KC_SLSH , KC_1 , KC_2 , KC_3 ,S(KC_MINS), S(KC_NUHS), KC_LEFT , KC_DOWN , KC_RGHT , _______ ,
- KC_ESC , KC_0 , KC_DOT , KC_DEL , KC_ENT , KC_BSPC , _______ ,  _______ , _______ , _______ , _______ , _______
+ KC_ESC , KC_0 , KC_DOT , KC_DEL , KC_ENT , KC_BSPC , _______  , _______ , _______ , _______ , _______ , _______
  ),
 
  [3] = LAYOUT_universal(
  RGB_TOG , AML_TO , AML_I50 , AML_D50 , _______ , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN ,
  RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI , SCRL_DVI , RGB_M_K , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW ,
  RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , SCRL_DVD , CPI_D1K , CPI_D100 , CPI_I100 , CPI_I1K , KBC_SAVE ,
- QK_BOOT  , KBC_RST , _______ , _______ , _______ , _______ , _______ ,  _______ , _______ , _______ , KBC_RST , QK_BOOT
+ QK_BOOT , KBC_RST , _______ , _______ , _______ , _______ , _______  , _______ , _______ , _______ , KBC_RST , QK_BOOT
  ),
 };
 // clang-format on

diff --git a/qmk_firmware/keyboards/keyball/keyball39/keymaps/develop/keymap.c b/qmk_firmware/keyboards/keyball/keyball39/keymaps/develop/keymap.c
@@ -31,10 +31,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 
  [1] = LAYOUT_universal(
- RGB_TOG , _______ , _______ , _______ ,  _______ , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN ,
- RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI ,  SCRL_DVI , RGB_M_K , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW ,
- RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD ,  SCRL_DVD , CPI_D1K , CPI_D100 , CPI_I100 , CPI_I1K , KBC_SAVE ,
- QK_BOOT  , KBC_RST , _______ , _______ ,  _______ , _______ , _______ , _______ , _______ , _______ , KBC_RST , QK_BOOT
+ RGB_TOG , _______ , _______ , _______ , _______ , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN ,
+ RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI , SCRL_DVI , RGB_M_K , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW ,
+ RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , SCRL_DVD , CPI_D1K , CPI_D100 , CPI_I100 , CPI_I1K , KBC_SAVE ,
+ QK_BOOT , KBC_RST , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , KBC_RST , QK_BOOT
  ),
 };
 // clang-format on
@@ -46,5 +46,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 void oledkit_render_info_user(void) {
  keyball_oled_render_keyinfo();
  keyball_oled_render_ballinfo();
+ keyball_oled_render_layerinfo();
 }
 #endif
diff --git a/qmk_firmware/keyboards/keyball/keyball39/keymaps/via/keymap.c b/qmk_firmware/keyboards/keyball/keyball39/keymaps/via/keymap.c
@@ -25,30 +25,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // keymap for default (VIA)
  [0] = LAYOUT_universal(
  KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,
- KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN ,
+ KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_MINS ,
  KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH ,
- KC_LCTL , KC_LGUI , KC_LALT ,LT(1,KC_LNG2),LT(2,KC_SPC),LT(3,KC_LNG1),KC_BSPC,LT(2,KC_ENT),LT(1,KC_LNG2),KC_RALT,KC_RGUI, KC_RSFT
+ KC_LCTL , KC_LGUI , KC_LALT ,LSFT_T(KC_LNG2),LT(1,KC_SPC),LT(3,KC_LNG1),KC_BSPC,LT(2,KC_ENT),LSFT_T(KC_LNG2),KC_RALT,KC_RGUI, KC_RSFT
  ),
 
  [1] = LAYOUT_universal(
- S(KC_Q) , S(KC_W) , S(KC_E) , S(KC_R) , S(KC_T) , S(KC_Y) , S(KC_U) , S(KC_I) , S(KC_O) , S(KC_P) ,
- S(KC_A) , S(KC_S) , S(KC_D) , S(KC_F) , S(KC_G) ,  S(KC_H) , S(KC_J) , S(KC_K) , S(KC_L) , KC_QUOT ,
- S(KC_Z) , S(KC_X) , S(KC_C) , S(KC_V) , S(KC_B) ,  S(KC_N) , S(KC_M) ,S(KC_COMM), S(KC_DOT),S(KC_SLSH),
- KC_LCTL , KC_LGUI , KC_LALT , _______ , _______ , _______ , _______ , _______ , _______ , KC_RALT , KC_RGUI , KC_RSFT
+ KC_F1  , KC_F2 , KC_F3 , KC_F4 , KC_RBRC , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10  ,
+ KC_F5  , KC_EXLM , S(KC_6) ,S(KC_INT3), S(KC_8) , S(KC_INT1), KC_BTN1 , KC_PGUP , KC_BTN2 , KC_SCLN ,
+ S(KC_EQL),S(KC_LBRC),S(KC_7)  , S(KC_2) ,S(KC_RBRC),  KC_LBRC , KC_DLR , KC_PGDN , KC_BTN3 , KC_F11 ,
+ KC_INT1 , KC_EQL , S(KC_3) , _______ , _______ , _______ , TO(2) , TO(0) , _______ , KC_RALT , KC_RGUI , KC_F12
  ),
 
  [2] = LAYOUT_universal(
- _______ , KC_7 , KC_8 , KC_9 , _______ , _______ , KC_LEFT , KC_UP , KC_RGHT , _______ ,
-  _______ , KC_4 , KC_5 , KC_6 ,S(KC_SCLN), KC_PGUP , KC_BTN1 , KC_DOWN , KC_BTN2 , KC_BTN3 ,
- _______ , KC_1 , KC_2 , KC_3 ,S(KC_MINS),  KC_PGDN , _______ , _______ , _______ , _______ ,
- _______ , KC_0 , KC_DOT , _______ , _______ , _______ , KC_DEL  , _______ , _______ , _______ , _______ , _______
+ KC_TAB , KC_7  , KC_8 , KC_9 , KC_MINS , KC_NUHS , _______ , KC_BTN3 , _______ , KC_BSPC ,
+ S(KC_QUOT), KC_4  , KC_5 , KC_6 ,S(KC_SCLN), S(KC_9) , KC_BTN1 , KC_UP , KC_BTN2 , KC_QUOT ,
+ KC_SLSH , KC_1  , KC_2 , KC_3 ,S(KC_MINS), S(KC_NUHS), KC_LEFT , KC_DOWN , KC_RGHT , _______ ,
+ KC_ESC , KC_0  , KC_DOT , KC_DEL , KC_ENT , KC_BSPC , _______ , _______ , _______ , _______ , _______ , _______
  ),
 
  [3] = LAYOUT_universal(
- RGB_TOG , AML_TO , AML_I50 , AML_D50 ,  _______ , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN ,
- RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI ,  SCRL_DVI , RGB_M_K , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW ,
- RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD ,  SCRL_DVD , CPI_D1K , CPI_D100 , CPI_I100 , CPI_I1K , KBC_SAVE ,
- QK_BOOT  , KBC_RST , _______ , _______ ,  _______ , _______ , _______ , _______ , _______ , _______ , KBC_RST , QK_BOOT
+ RGB_TOG , AML_TO , AML_I50 , AML_D50 , _______ ,  RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN ,
+ RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI , SCRL_DVI ,  RGB_M_K , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW ,
+ RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , SCRL_DVD ,  CPI_D1K , CPI_D100 , CPI_I100 , CPI_I1K , KBC_SAVE ,
+ QK_BOOT , KBC_RST , _______ , _______ , _______ , _______ ,  _______ , _______ , _______ , _______ , KBC_RST , QK_BOOT
  ),
 };
 // clang-format on

diff --git a/qmk_firmware/keyboards/keyball/keyball44/keymaps/default/keymap.c b/qmk_firmware/keyboards/keyball/keyball44/keymaps/default/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  RGB_TOG , AML_TO , AML_I50 , AML_D50 , _______ , _______ , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN , RGB_M_K ,
  RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI , _______ , SCRL_DVI , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW , _______ , _______ ,
  RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , _______ , SCRL_DVD , CPI_D1K , CPI_D100 , CPI_I100 , CPI_I1K , _______ , KBC_SAVE ,
- QK_BOOT  , KBC_RST , _______ , _______ , _______ , _______ , _______ , _______ , KBC_RST , QK_BOOT
+ QK_BOOT , KBC_RST , _______ , _______ , _______ , _______ , _______ , _______ , KBC_RST , QK_BOOT
  ),
 };
 // clang-format on

diff --git a/qmk_firmware/keyboards/keyball/keyball44/keymaps/develop/keymap.c b/qmk_firmware/keyboards/keyball/keyball44/keymaps/develop/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  RGB_TOG , _______ , _______ , _______ , _______ , _______ , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN , RGB_M_K ,
  RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI , _______ , SCRL_DVI , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW , _______ , _______ ,
  RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , _______ , SCRL_DVD , CPI_D1K , CPI_D100 , CPI_I100 , CPI_I1K , _______ , KBC_SAVE ,
- QK_BOOT  , KBC_RST , _______ , _______ , _______ , _______ , _______ , _______ , KBC_RST , QK_BOOT
+ QK_BOOT , KBC_RST , _______ , _______ , _______ , _______ , _______ , _______ , KBC_RST , QK_BOOT
  ),
 };
 // clang-format on

diff --git a/qmk_firmware/keyboards/keyball/keyball44/keymaps/via/keymap.c b/qmk_firmware/keyboards/keyball/keyball44/keymaps/via/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  RGB_TOG , AML_TO , AML_I50 , AML_D50 , _______ , _______ , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN , RGB_M_K ,
  RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI , _______ , SCRL_DVI , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW , _______ , _______ ,
  RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , _______ , SCRL_DVD , CPI_D1K , CPI_D100 , CPI_I100 , CPI_I1K , _______ , KBC_SAVE ,
- QK_BOOT  , KBC_RST , _______ , _______ , _______ , _______ , _______ , _______ , KBC_RST , QK_BOOT
+ QK_BOOT , KBC_RST , _______ , _______ , _______ , _______ , _______ , _______ , KBC_RST , QK_BOOT
  ),
 };
 // clang-format on

diff --git a/qmk_firmware/keyboards/keyball/keyball46/keymaps/default/keymap.c b/qmk_firmware/keyboards/keyball/keyball46/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ enum keymap_layers {
 #define KC_S_EN LSFT_T(KC_LNG2)
 
 // original
-#define KC_A_JA LT(_BALL, KC_LNG1) // cmd or adjust
+#define KC_A_JA LT(_BALL, KC_LNG1)  // cmd or adjust
 #define KC_AL_CP MT(MOD_LALT, KC_CAPS) // alt or caps lock
 #define KC_G_BS MT(MOD_LGUI, KC_BSPC) // command or back space
 #define KC_G_DEL MT(MOD_LGUI, KC_DEL) // command or delete
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|--------+--------+--------+--------+--------+--------' |--------+--------+--------+--------+--------+--------|
  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, CPI_D1K,CPI_D100,CPI_I100, CPI_I1K,KBC_SAVE,
  //|--------+--------+--------+--------+--------+-------+--------. `--------+--------+--------+--------+--------+--------|
-  QK_BOOT, EE_CLR, _______, _______, _______, _______, _______,SCRL_DVD, SCRL_DVI, _______, KBC_RST
+ QK_BOOT, EE_CLR , _______, _______, _______, _______, _______,SCRL_DVD, SCRL_DVI, _______, KBC_RST
  //`--------+--------' `--------' `--------' `--------+--------' `--------+--------' `--------+--------+--------'
  ),
 

diff --git a/qmk_firmware/keyboards/keyball/keyball46/keymaps/develop/keymap.c b/qmk_firmware/keyboards/keyball/keyball46/keymaps/develop/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  RGB_TOG , _______ , _______ , _______ , _______ , _______ , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN , RGB_M_K ,
  RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI , _______ , _______ , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW , _______ , _______ ,
  RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , _______ , _______ , _______ , CPI_D1K , CPI_D100 , CPI_I100 , CPI_I1K , KBC_SAVE ,
- QK_BOOT  , EE_CLR , _______ , _______ , _______ , _______ , _______ , _______ , SCRL_DVD , SCRL_DVI , _______ , KBC_RST
+ QK_BOOT , EE_CLR  , _______ , _______ , _______ , _______ , _______ , _______ , SCRL_DVD , SCRL_DVI , _______ , KBC_RST
  ),
 };
 // clang-format on

diff --git a/qmk_firmware/keyboards/keyball/keyball46/keymaps/via/keymap.c b/qmk_firmware/keyboards/keyball/keyball46/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ enum keymap_layers {
 #define KC_S_EN LSFT_T(KC_LNG2)
 
 // original
-#define KC_A_JA LT(_BALL, KC_LNG1) // cmd or adjust
+#define KC_A_JA LT(_BALL, KC_LNG1)  // cmd or adjust
 #define KC_AL_CP MT(MOD_LALT, KC_CAPS) // alt or caps lock
 #define KC_G_BS MT(MOD_LGUI, KC_BSPC) // command or back space
 #define KC_G_DEL MT(MOD_LGUI, KC_DEL) // command or delete
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|--------+--------+--------+--------+--------+--------' |--------+--------+--------+--------+--------+--------|
  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, CPI_D1K,CPI_D100,CPI_I100, CPI_I1K,KBC_SAVE,
  //|--------+--------+--------+--------+--------+-------+--------. `--------+--------+--------+--------+--------+--------|
-  QK_BOOT, EE_CLR, _______, _______, _______, _______, _______,SCRL_DVD, SCRL_DVI, _______, KBC_RST
+ QK_BOOT, EE_CLR , _______, _______, _______, _______, _______,SCRL_DVD, SCRL_DVI, _______, KBC_RST
  //`--------+--------' `--------' `--------' `--------+--------' `--------+--------' `--------+--------+--------'
  ),
 

diff --git a/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Both/keymap.c b/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Both/keymap.c
@@ -37,7 +37,7 @@ enum keymap_layers {
 #define KC_S_EN LSFT_T(KC_LNG2)
 
 // original
-#define KC_A_JA LT(_BALL, KC_LNG1) // cmd or adjust
+#define KC_A_JA LT(_BALL, KC_LNG1)  // cmd or adjust
 #define KC_AL_CP MT(MOD_LALT, KC_CAPS) // alt or caps lock
 #define KC_G_BS MT(MOD_LGUI, KC_BSPC) // command or back space
 #define KC_G_DEL MT(MOD_LGUI, KC_DEL) // command or delete
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
  KC_LSFT, KC_SLSH, KC_1, KC_2, KC_3, KC_EQL, KC_GRV, KC_DQT, KC_QUOT, KC_CIRC, KC_TILD, KC_RSFT,
  //|--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------|
- KC_ESC, KC_GRV, KC_0, KC_LNG2,KC_A_DEL, _______, _______, KC_LPRN, KC_RPRN, KC_BSLS
+ KC_ESC, KC_GRV, KC_0, KC_LNG2 ,KC_A_DEL, _______, _______, KC_LPRN, KC_RPRN, KC_BSLS
  //`--------+--------+--------' `--------+--------' `--------+--------' `--------+--------+--------'
  ),
 
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
  KC_LSFT, _______, _______, KC_DOWN, _______, _______, _______, _______, KC_PGDN, _______, _______, KC_RSFT,
  //|--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------|
- KC_ESC, KC_GRV, KC_LALT, _______, _______, KC_A_BS,KC_LNG1, KC_LPRN, KC_RPRN, KC_BSLS
+ KC_ESC, KC_GRV, KC_LALT, _______, _______, KC_A_BS,KC_LNG1 , KC_LPRN, KC_RPRN, KC_BSLS
  //`--------+--------+--------' `--------+--------' `--------+--------' `--------+--------+--------'
  ),
 
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
  RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, CPI_D1K,CPI_D100,CPI_I100, CPI_I1K,KBC_SAVE,
  //|--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------|
-  QK_BOOT, EE_CLR, _______, _______, _______, _______,SCRL_DVD, SCRL_DVI, _______, KBC_RST
+ QK_BOOT, EE_CLR , _______, _______, _______, _______,SCRL_DVD, SCRL_DVI, _______, KBC_RST
  //`--------+--------+--------' `--------+--------' `--------+--------' `--------+--------+--------'
  ),
 

diff --git a/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Left/keymap.c b/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Left/keymap.c
@@ -37,7 +37,7 @@ enum keymap_layers {
 #define KC_S_EN LSFT_T(KC_LNG2)
 
 // original
-#define KC_A_JA LT(_BALL, KC_LNG1) // cmd or adjust
+#define KC_A_JA LT(_BALL, KC_LNG1)  // cmd or adjust
 #define KC_AL_CP MT(MOD_LALT, KC_CAPS) // alt or caps lock
 #define KC_G_BS MT(MOD_LGUI, KC_BSPC) // command or back space
 #define KC_G_DEL MT(MOD_LGUI, KC_DEL) // command or delete
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|--------+--------+--------+--------+--------+--------| `--------+--------+--------+--------+--------+--------|
  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, CPI_D1K,CPI_D100,CPI_I100, CPI_I1K,KBC_SAVE,
  //|--------+--------+--------+--------+--------+--------' ,--------+-------+--------+--------+--------+--------+--------|
-  QK_BOOT, EE_CLR, _______, _______, _______, _______, _______, SCRL_DVD, SCRL_DVI, _______, KBC_RST
+ QK_BOOT, EE_CLR , _______, _______, _______, _______, _______, SCRL_DVD, SCRL_DVI, _______, KBC_RST
  //`--------+--------+--------' `--------+--------' `--------+--------' `--------' `--------' `--------+--------'
  ),
 

diff --git a/qmk_firmware/keyboards/keyball/keyball61/keymaps/default/keymap.c b/qmk_firmware/keyboards/keyball/keyball61/keymaps/default/keymap.c
@@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  RGB_TOG , AML_TO , AML_I50 , AML_D50 , _______ , _______ , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN , RGB_M_K ,
  RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI , _______ , _______ , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW , _______ , _______ ,
  RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , _______ , _______ , CPI_D1K , CPI_D100 , CPI_I100 , CPI_I1K , KBC_SAVE , KBC_RST ,
- _______ , _______ , SCRL_DVD , SCRL_DVI , SCRL_MO , SCRL_TO , EE_CLR , EE_CLR , KC_HOME , KC_PGDN , KC_PGUP , KC_END , _______ , _______ ,
- QK_BOOT  , _______ , KC_LEFT , KC_DOWN , KC_UP , KC_RGHT , _______ , _______ , KC_BSPC , _______ , _______ , _______ , _______ , QK_BOOT
+ _______ , _______ , SCRL_DVD , SCRL_DVI , SCRL_MO , SCRL_TO , EE_CLR  , EE_CLR  , KC_HOME , KC_PGDN , KC_PGUP , KC_END , _______ , _______ ,
+ QK_BOOT , _______ , KC_LEFT , KC_DOWN , KC_UP , KC_RGHT , _______ , _______ , KC_BSPC , _______ , _______ , _______ , _______ , QK_BOOT
  ),
 };
 // clang-format on