diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-07-01 11:05:10 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-07-01 11:05:10 -0700 |
| commit | 29954efd064fdf635af0895fc53bbaee58a1efda (patch) | |
| tree | 1f8ff6a560e1fe3e90fa78f53895d7c146b59e3a | |
| parent | 738eab0bb13119747260f220f855c1ef7c40fdd9 (diff) | |
Nano refactor and Configurator update (#3275)
* Matrix refactor
* Keymap refactor
* Configurator support
| -rw-r--r-- | keyboards/nano/info.json | 12 | ||||
| -rw-r--r-- | keyboards/nano/keymaps/default/keymap.c | 16 | ||||
| -rw-r--r-- | keyboards/nano/nano.h | 10 |
3 files changed, 24 insertions, 14 deletions
diff --git a/keyboards/nano/info.json b/keyboards/nano/info.json new file mode 100644 index 0000000000..b135a2d097 --- /dev/null +++ b/keyboards/nano/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "Nano", + "url": "", + "maintainer": "qmk", + "width": 4, + "height": 2, + "layouts": { + "LAYOUT": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] + } + } +} diff --git a/keyboards/nano/keymaps/default/keymap.c b/keyboards/nano/keymaps/default/keymap.c index 5fe92aab24..cd9d4549de 100644 --- a/keyboards/nano/keymaps/default/keymap.c +++ b/keyboards/nano/keymaps/default/keymap.c @@ -1,23 +1,19 @@ -#include "nano.h" +#include QMK_KEYBOARD_H #define _MAIN 0 #define _FN 1 -#define KC_ KC_TRNS +#define _______ KC_TRNS #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] = LAYOUT( - VOLU,MPLY,MPRV,PGUP, - VOLD,MUTE,MNXT,PGDN + KC_VOLU, KC_MPLY, KC_MPRV, KC_PGUP, + KC_VOLD, KC_MUTE, KC_MNXT, KC_PGDN ), [_FN] = LAYOUT( - F , ,RHUI, , - RTOG,RMOD,RHUD, + KC_F, _______, RGB_HUI, _______, + RGB_TOG, RGB_MOD, RGB_HUD, _______ ) }; diff --git a/keyboards/nano/nano.h b/keyboards/nano/nano.h index 4d69dc6f8b..21d6c4f30c 100644 --- a/keyboards/nano/nano.h +++ b/keyboards/nano/nano.h @@ -3,10 +3,12 @@ #include "quantum.h" -#define LAYOUT(k01, k02, k03, k04, k05, k06, k07, k08) \ -{ \ - {KC_##k01, KC_##k02, KC_##k03, KC_##k04}, \ - {KC_##k05, KC_##k06, KC_##k07, KC_##k08} \ +#define LAYOUT( \ + k01, k02, k03, k04, \ + k05, k06, k07, k08 \ + ) { \ + { k01, k02, k03, k04 }, \ + { k05, k06, k07, k08 } \ } #endif |