1
0
Fork 0

Refactor and Configurator update for Chocopad (#3099)

* Refactor for Chocopad

* Configurator update
This commit is contained in:
noroadsleft 2018-06-01 12:08:41 -07:00 committed by Drashna Jaelre
parent b5da3b53b3
commit 3364334bfd
3 changed files with 31 additions and 50 deletions

View File

@ -3,7 +3,7 @@
#include "quantum.h" #include "quantum.h"
#define KEYMAP( \ #define LAYOUT( \
A1, A2, A3, A4, \ A1, A2, A3, A4, \
B1, B2, B3, B4, \ B1, B2, B3, B4, \
C1, C2, C3, C4, \ C1, C2, C3, C4, \
@ -16,13 +16,13 @@
} }
// Used to create a keymap using only KC_ prefixed keys // Used to create a keymap using only KC_ prefixed keys
#define KC_KEYMAP( \ #define LAYOUT_kc( \
A1, A2, A3, A4, \ A1, A2, A3, A4, \
B1, B2, B3, B4, \ B1, B2, B3, B4, \
C1, C2, C3, C4, \ C1, C2, C3, C4, \
D1, D2, D3, D4 \ D1, D2, D3, D4 \
) \ ) \
KEYMAP( \ LAYOUT( \
KC_##A1, KC_##A2, KC_##A3, KC_##A4, \ KC_##A1, KC_##A2, KC_##A3, KC_##A4, \
KC_##B1, KC_##B2, KC_##B3, KC_##B4, \ KC_##B1, KC_##B2, KC_##B3, KC_##B4, \
KC_##C1, KC_##C2, KC_##C3, KC_##C4, \ KC_##C1, KC_##C2, KC_##C3, KC_##C4, \

View File

@ -0,0 +1,12 @@
{
"keyboard_name": "Chocopad",
"url": "",
"maintainer": "qmk",
"width": 4,
"height": 4,
"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}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
}
}
}

View File

@ -1,61 +1,30 @@
#include "chocopad.h" #include QMK_KEYBOARD_H
#define _BASE 0 #define _BASE 0
#define _FN1 1 #define _FN1 1
#define _FN2 2 #define _FN2 2
#define KC_ KC_TRNS
#define _______ KC_TRNS #define _______ KC_TRNS
#define KC_X1 MO(_FN1)
#define KC_X2 MO(_FN2)
#define KC_RST RESET
#define KC_BSTP BL_STEP
#define KC_RTOG RGB_TOG
#define KC_RMOD RGB_MOD
#define KC_RHUI RGB_HUI
#define KC_RHUD RGB_HUD
#define KC_RSAI RGB_SAI
#define KC_RSAD RGB_SAD
#define KC_RVAI RGB_VAI
#define KC_RVAD RGB_VAD
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = KC_KEYMAP( [_BASE] = LAYOUT(
//,----+----+----+----. KC_PGUP, KC_HOME, KC_UP, KC_END , \
PGUP,HOME, UP ,END , KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, \
//|----+----+----+----| MO(_FN2), KC_VOLU, KC_MPLY, KC_MPRV, \
PGDN,LEFT,DOWN,RGHT, MO(_FN1), KC_VOLD, KC_MUTE, KC_MNXT \
//|----+----+----+----|
X2 ,VOLU,MPLY,MPRV,
//|----+----+----+----|
X1 ,VOLD,MUTE,MNXT
//`----+----+----+----'
), ),
[_FN1] = LAYOUT(
[_FN1] = KC_KEYMAP( KC_ESC, KC_P7, KC_P8, KC_P9, \
//,----+----+----+----. KC_TAB, KC_P4, KC_P5, KC_P6, \
ESC , P7 , P8 , P9 , KC_ENT, KC_P1, KC_P2, KC_P3, \
//|----+----+----+----| _______, KC_P0, KC_P0, KC_DOT \
TAB , P4 , P5 , P6 ,
//|----+----+----+----|
ENT , P1 , P2 , P3 ,
//|----+----+----+----|
, P0 , P0 ,DOT
//`----+----+----+----'
), ),
[_FN2] = LAYOUT(
[_FN2] = KC_KEYMAP( RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \
//,----+----+----+----. RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, \
RTOG,RHUI,RSAI,RVAI, _______, _______, _______, RESET, \
//|----+----+----+----| BL_STEP, _______, _______, _______ \
RMOD,RHUD,RSAD,RVAD,
//|----+----+----+----|
, , ,RST ,
//|----+----+----+----|
BSTP, , ,
//`----+----+----+----'
) )
}; };