summaryrefslogtreecommitdiff
path: root/keyboards/fourier
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-04-07 23:32:14 -0700
committerskullydazed <skullydazed@users.noreply.github.com>2018-04-07 23:32:14 -0700
commit1f778684276e90609c183045a72c96c3c12d452c (patch)
tree75257bcb0b5f607ef7bcb70dccd6b73d9f7d7d07 /keyboards/fourier
parent958521c3596452eef77e9ad69734ad955120b2b5 (diff)
downloadqmk_firmware-1f778684276e90609c183045a72c96c3c12d452c.tar.gz
qmk_firmware-1f778684276e90609c183045a72c96c3c12d452c.zip
More Configurator Warning Fixes (#2716)
* mf68_ble did not have the correct .c and .h files * Fix JC65 KEYMAP to LAYOUT * Change KEYMAP to LAYOUT for s60_x * Convert KEYMAP to LAYOUT for lets_split boards * Convert KEYMAP to LAYOUT * more fixes to keymap for iris * convert KEYMAP to LAYOUT for levinson keyboard * change losinggeneration's KEYMAP to LAYOUT * convert KEYMAP to LAYOUT * convert KEYMAP to LAYOUT for nyquist * convert KEYMAP to LAYOUT * convert KEYMAP to LAYOUT for viterbi * convert KEYMAP to LAYOUT * convert KEYMAP and its subsidiries to the LAYOUT standard * convert KEYMAP and its subsidiries to the new LAYOUT standard
Diffstat (limited to 'keyboards/fourier')
-rw-r--r--keyboards/fourier/fourier.h4
-rw-r--r--keyboards/fourier/keymaps/default/keymap.c12
-rw-r--r--keyboards/fourier/rev1/rev1.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/keyboards/fourier/fourier.h b/keyboards/fourier/fourier.h
index dbe1fd7219..4e9797b35b 100644
--- a/keyboards/fourier/fourier.h
+++ b/keyboards/fourier/fourier.h
@@ -8,13 +8,13 @@
#endif
// Used to create a keymap using only KC_ prefixed keys
-#define KC_KEYMAP( \
+#define LAYOUT_kc( \
LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5, RB7, \
LC1, LC2, LC3, LC4, LC5, LC6, RC1, RC3, RC4, RC5, RC6, RC7, \
LD1, LD2, LD3, LD4, LD5, RD1, RD4, RD5, RD6, RD7 \
) \
- KEYMAP( \
+ LAYOUT( \
KC_##LA1, KC_##LA2, KC_##LA3, KC_##LA4, KC_##LA5, KC_##LA6, KC_##RA1, KC_##RA2, KC_##RA3, KC_##RA4, KC_##RA5, KC_##RA6, KC_##RA7, \
KC_##LB1, KC_##LB2, KC_##LB3, KC_##LB4, KC_##LB5, KC_##LB6, KC_##RB1, KC_##RB2, KC_##RB3, KC_##RB4, KC_##RB5, KC_##RB7, \
KC_##LC1, KC_##LC2, KC_##LC3, KC_##LC4, KC_##LC5, KC_##LC6, KC_##RC1, KC_##RC3, KC_##RC4, KC_##RC5, KC_##RC6, KC_##RC7, \
diff --git a/keyboards/fourier/keymaps/default/keymap.c b/keyboards/fourier/keymaps/default/keymap.c
index 90677b4a2e..d8b11b1110 100644
--- a/keyboards/fourier/keymaps/default/keymap.c
+++ b/keyboards/fourier/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ enum custom_keycodes {
#define KC_RVAD RGB_VAD
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = KC_KEYMAP(
+ [_BASE] = LAYOUT_kc(
//,----+----+----+----+----+----|----+----+----+----+----+----+----.
ESC , Q , W , E , R , T , Y , U , I , O , P ,DEL ,BSPC,
//|----`----`----`----`----`----|----`----`----`----`----`----`----|
@@ -45,11 +45,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|-----`----`----`----`----`----|----`----`----`----`----`--------|
LSFT , Z , X , C , V , B , N , M ,COMM,DOT ,SLSH, RSFT ,
//|-------`----`----`----`----`----|----`----`----`----`----`------|
- LCTL ,LALT,LGUI ,FN1 , SPFN1 , BSFN2 ,RGUI ,RALT , FN2 , RCTL
+ LCTL ,LALT,LGUI ,FN1 , SPFN1 , BSFN2 ,RGUI ,RALT , FN2 , RCTL
//`-----+----+-----+----+--------|--------+-----+-----+-----+------'
),
- [_FN1] = KC_KEYMAP(
+ [_FN1] = LAYOUT_kc(
//,----+----+----+----+----+----|----+----+----+----+----+----+----.
GRV , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,MINS,EQL ,
//|----`----`----`----`----`----|----`----`----`----`----`----`----|
@@ -57,11 +57,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|-----`----`----`----`----`----|----`----`----`----`----`--------|
RMOD ,RHUD,RSAD,RVAD,VOLD,LCBR,RCBR, 1 , 2 , 3 , UP , ,
//|-------`----`----`----`----`----|----`----`----`----`----`------|
- RTOG , , , , , DEL , 0 ,LEFT ,DOWN , RGHT
+ RTOG , , , , , DEL , 0 ,LEFT ,DOWN , RGHT
//`-----+----+-----+----+--------|--------+-----+-----+-----+------'
),
- [_FN2] = KC_KEYMAP(
+ [_FN2] = LAYOUT_kc(
//,----+----+----+----+----+----|----+----+----+----+----+----+----.
TILD,EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,UNDS,PLUS,
//|----`----`----`----`----`----|----`----`----`----`----`----`----|
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|-----`----`----`----`----`----|----`----`----`----`----`--------|
, , ,DEL ,PGDN,END , , , , , , ,
//|-------`----`----`----`----`----|----`----`----`----`----`------|
- , , , , DEL , , , , ,
+ , , , , DEL , , , , ,
//`-----+----+-----+----+--------|--------+-----+-----+-----+------'
)
diff --git a/keyboards/fourier/rev1/rev1.h b/keyboards/fourier/rev1/rev1.h
index c29c0ebabb..9ef9b92330 100644
--- a/keyboards/fourier/rev1/rev1.h
+++ b/keyboards/fourier/rev1/rev1.h
@@ -14,7 +14,7 @@
#endif
#endif
-#define KEYMAP( \
+#define LAYOUT( \
LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5, RB7, \
LC1, LC2, LC3, LC4, LC5, LC6, RC1, RC3, RC4, RC5, RC6, RC7, \