diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-05-22 12:12:50 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-05-22 12:12:50 -0700 |
| commit | 4b1f60a3f5ed223e34ae8381e57f600551ccf085 (patch) | |
| tree | af07325e6ea3e3913a683315f7e790bf3e0ad967 | |
| parent | def0ff48c09e8eae0e00fcd6049358f5ed0ea816 (diff) | |
| download | firmware-4b1f60a3f5ed223e34ae8381e57f600551ccf085.tar.gz firmware-4b1f60a3f5ed223e34ae8381e57f600551ccf085.tar.bz2 firmware-4b1f60a3f5ed223e34ae8381e57f600551ccf085.zip | |
Refactor update for 6ball (#3017)
| -rw-r--r-- | keyboards/6ball/6ball.h | 4 | ||||
| -rw-r--r-- | keyboards/6ball/keymaps/default/keymap.c | 20 |
2 files changed, 8 insertions, 16 deletions
diff --git a/keyboards/6ball/6ball.h b/keyboards/6ball/6ball.h index 34fcc4e6a..234235341 100644 --- a/keyboards/6ball/6ball.h +++ b/keyboards/6ball/6ball.h @@ -3,7 +3,7 @@ #include "quantum.h" -#define KEYMAP( \ +#define LAYOUT( \ k01, k02, k03, \ k04, k05, k06 \ ) \ @@ -11,6 +11,4 @@ { k02, k03, k06, k05, k04, k01 } \ } -#define KC_KEYMAP(k01, k02, k03, k04, k05, k06) KEYMAP(KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06) - #endif diff --git a/keyboards/6ball/keymaps/default/keymap.c b/keyboards/6ball/keymaps/default/keymap.c index f93587ffc..5081161e3 100644 --- a/keyboards/6ball/keymaps/default/keymap.c +++ b/keyboards/6ball/keymaps/default/keymap.c @@ -1,28 +1,22 @@ -#include "6ball.h" +#include QMK_KEYBOARD_H #define _MAIN 0 #define _FN 1 -#define KC_ KC_TRNS - #define KC_CAPW LGUI(LSFT(KC_3)) // Capture whole screen #define KC_CPYW LGUI(LSFT(LCTL(KC_3))) // Copy whole screen #define KC_CAPP LGUI(LSFT(KC_4)) // Capture portion of screen #define KC_CPYP LGUI(LSFT(LCTL(KC_4))) // Copy portion of screen #define KC_X0 LT(_FN, KC_ESC) -#define KC_RTOG RGB_TOG -#define KC_RMOD RGB_MOD -#define KC_RHUI RGB_HUI -#define KC_RHUD RGB_HUD const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_MAIN] = KC_KEYMAP( - F , X0 ,LCTL, - R , D , M + [_MAIN] = LAYOUT( + KC_F, KC_X0, KC_LCTL, + KC_R, KC_D, KC_M ), - [_FN] = KC_KEYMAP( - F , ,RHUI, - RTOG,RMOD,RHUD + [_FN] = LAYOUT( + KC_F, KC_TRNS, RGB_HUI, + RGB_TOG, RGB_MOD, RGB_HUD ) }; |