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
author: MechMerlin <30334081+mechmerlin@users.noreply.github.com> 2018-04-07 23:32:14 -0700
committer: skullydazed <skullydazed@users.noreply.github.com> 2018-04-07 23:32:14 -0700
commit: 1f778684276e90609c183045a72c96c3c12d452c (patch)
tree: 75257bcb0b5f607ef7bcb70dccd6b73d9f7d7d07 /keyboards/viterbi/keymaps/hexwire/keymap.c
parent: 958521c3596452eef77e9ad69734ad955120b2b5 (diff)
download: qmk_firmware-1f778684276e90609c183045a72c96c3c12d452c.tar.gz
qmk_firmware-1f778684276e90609c183045a72c96c3c12d452c.zip
1 files changed, 13 insertions, 13 deletions
diff --git a/keyboards/viterbi/keymaps/hexwire/keymap.c b/keyboards/viterbi/keymaps/hexwire/keymap.c
index 5c80f94d5..2050c0379 100644
--- a/keyboards/viterbi/keymaps/hexwire/keymap.c
+++ b/keyboards/viterbi/keymaps/hexwire/keymap.c
@@ -39,7 +39,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = KC_KEYMAP(
+  [_QWERTY] = LAYOUT_kc(
  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
     ESC , 1  , 2  , 3  , 4  , 5  ,    ,      6  , 7  , 8  , 9  , 0  ,BSPC,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
@@ -49,11 +49,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
     LSFT, Z  , X  , C  , V  , B  ,    ,      N  , M  ,COMM,DOT ,SLSH, X4 ,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,    ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT,    
+      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,    ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT,
  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
  ),
-  [_COLEMAK] = KC_KEYMAP(
+  [_COLEMAK] = LAYOUT_kc(
  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
     ESC , 1  , 2  , 3  , 4  , 5  ,    ,      6  , 7  , 8  , 9  , 0  ,BSPC,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
@@ -63,11 +63,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
     LSFT, Z  , X  , C  , V  , B  ,    ,      K  , M  ,COMM,DOT ,SLSH, X4 ,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,    ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT,    
+      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,    ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT,
  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
  ),
-  [_DVORAK] = KC_KEYMAP(
+  [_DVORAK] = LAYOUT_kc(
  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
     ESC , 1  , 2  , 3  , 4  , 5  ,    ,      6  , 7  , 8  , 9  , 0  ,BSPC,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
@@ -77,11 +77,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
     LSFT,SCLN, Q  , J  , K  , X  ,    ,      B  , M  , W  , V  , Z  , X4 ,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,    ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT,    
+      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,    ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT,
  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
  ),
-  [_LOWER] = KC_KEYMAP(
+  [_LOWER] = LAYOUT_kc(
  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
     TILD,EXLM, AT ,HASH,DLR ,PERC,    ,     CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
@@ -91,11 +91,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
         ,CPYP,    ,    ,DOWN,LCBR,    ,     RCBR, P1 , P2 , P3 ,MINS,    ,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,     DEL ,    , P0 ,PDOT,    ,    ,    
+         ,    ,    ,    ,    ,    ,    ,     DEL ,    , P0 ,PDOT,    ,    ,
  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
  ),
-  [_RAISE] = KC_KEYMAP(
+  [_RAISE] = LAYOUT_kc(
  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
     TILD,EXLM, AT ,HASH,DLR ,PERC,    ,     CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
@@ -105,11 +105,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,    ,     PLUS,END ,    ,    ,    ,    ,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    
+         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
  ),
-  [_FN3] = KC_KEYMAP(
+  [_FN3] = LAYOUT_kc(
  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
     F12 , F1 , F2 , F3 , F4 , F5 ,    ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    
+         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
  ),
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |      |      |      |      |      |             |      |      |      |      |      |
 * `-----------------------------------------------------------------------------------'
 */
-  [_ADJUST] = KEYMAP( \
+  [_ADJUST] = LAYOUT( \
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
    _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, _______, _______, \
    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, _______, _______, \
author	MechMerlin <30334081+mechmerlin@users.noreply.github.com>	2018-04-07 23:32:14 -0700
committer	skullydazed <skullydazed@users.noreply.github.com>	2018-04-07 23:32:14 -0700
commit	1f778684276e90609c183045a72c96c3c12d452c (patch)
tree	75257bcb0b5f607ef7bcb70dccd6b73d9f7d7d07 /keyboards/viterbi/keymaps/hexwire/keymap.c
parent	958521c3596452eef77e9ad69734ad955120b2b5 (diff)
download	qmk_firmware-1f778684276e90609c183045a72c96c3c12d452c.tar.gz qmk_firmware-1f778684276e90609c183045a72c96c3c12d452c.zip

diff --git a/keyboards/viterbi/keymaps/hexwire/keymap.c b/keyboards/viterbi/keymaps/hexwire/keymap.c index 5c80f94d5..2050c0379 100644 --- a/keyboards/viterbi/keymaps/hexwire/keymap.c +++ b/keyboards/viterbi/keymaps/hexwire/keymap.c
@@ -39,7 +39,7 @@ enum custom_keycodes {
39		39
40	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	40	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
41		41
42	[_QWERTY] = KC_KEYMAP(	42	[_QWERTY] = LAYOUT_kc(
43	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.	43	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
44	ESC , 1 , 2 , 3 , 4 , 5 , , 6 , 7 , 8 , 9 , 0 ,BSPC, ,	44	ESC , 1 , 2 , 3 , 4 , 5 , , 6 , 7 , 8 , 9 , 0 ,BSPC, ,
45	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	45	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
@@ -49,11 +49,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
49	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	49	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
50	LSFT, Z , X , C , V , B , , N , M ,COMM,DOT ,SLSH, X4 , ,	50	LSFT, Z , X , C , V , B , , N , M ,COMM,DOT ,SLSH, X4 , ,
51	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	51	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
52	X3 ,LCTL,LALT,LGUI, X1 ,SPC , , BSPC, X2 ,LEFT,DOWN, UP ,RGHT,	52	X3 ,LCTL,LALT,LGUI, X1 ,SPC , , BSPC, X2 ,LEFT,DOWN, UP ,RGHT,
53	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'	53	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'
54	),	54	),
55		55
56	[_COLEMAK] = KC_KEYMAP(	56	[_COLEMAK] = LAYOUT_kc(
57	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.	57	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
58	ESC , 1 , 2 , 3 , 4 , 5 , , 6 , 7 , 8 , 9 , 0 ,BSPC, ,	58	ESC , 1 , 2 , 3 , 4 , 5 , , 6 , 7 , 8 , 9 , 0 ,BSPC, ,
59	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	59	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
@@ -63,11 +63,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
63	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	63	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
64	LSFT, Z , X , C , V , B , , K , M ,COMM,DOT ,SLSH, X4 , ,	64	LSFT, Z , X , C , V , B , , K , M ,COMM,DOT ,SLSH, X4 , ,
65	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	65	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
66	X3 ,LCTL,LALT,LGUI, X1 ,SPC , , BSPC, X2 ,LEFT,DOWN, UP ,RGHT,	66	X3 ,LCTL,LALT,LGUI, X1 ,SPC , , BSPC, X2 ,LEFT,DOWN, UP ,RGHT,
67	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'	67	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'
68	),	68	),
69		69
70	[_DVORAK] = KC_KEYMAP(	70	[_DVORAK] = LAYOUT_kc(
71	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.	71	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
72	ESC , 1 , 2 , 3 , 4 , 5 , , 6 , 7 , 8 , 9 , 0 ,BSPC, ,	72	ESC , 1 , 2 , 3 , 4 , 5 , , 6 , 7 , 8 , 9 , 0 ,BSPC, ,
73	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	73	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
@@ -77,11 +77,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
77	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	77	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
78	LSFT,SCLN, Q , J , K , X , , B , M , W , V , Z , X4 , ,	78	LSFT,SCLN, Q , J , K , X , , B , M , W , V , Z , X4 , ,
79	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	79	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
80	X3 ,LCTL,LALT,LGUI, X1 ,SPC , , BSPC, X2 ,LEFT,DOWN, UP ,RGHT,	80	X3 ,LCTL,LALT,LGUI, X1 ,SPC , , BSPC, X2 ,LEFT,DOWN, UP ,RGHT,
81	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'	81	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'
82	),	82	),
83		83
84	[_LOWER] = KC_KEYMAP(	84	[_LOWER] = LAYOUT_kc(
85	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.	85	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
86	TILD,EXLM, AT ,HASH,DLR ,PERC, , CIRC,AMPR,ASTR,LPRN,RPRN,BSPC, ,	86	TILD,EXLM, AT ,HASH,DLR ,PERC, , CIRC,AMPR,ASTR,LPRN,RPRN,BSPC, ,
87	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	87	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
@@ -91,11 +91,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
91	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	91	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
92	,CPYP, , ,DOWN,LCBR, , RCBR, P1 , P2 , P3 ,MINS, , ,	92	,CPYP, , ,DOWN,LCBR, , RCBR, P1 , P2 , P3 ,MINS, , ,
93	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	93	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
94	, , , , , , , DEL , , P0 ,PDOT, , ,	94	, , , , , , , DEL , , P0 ,PDOT, , ,
95	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'	95	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'
96	),	96	),
97		97
98	[_RAISE] = KC_KEYMAP(	98	[_RAISE] = LAYOUT_kc(
99	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.	99	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
100	TILD,EXLM, AT ,HASH,DLR ,PERC, , CIRC,AMPR,ASTR,LPRN,RPRN,BSPC, ,	100	TILD,EXLM, AT ,HASH,DLR ,PERC, , CIRC,AMPR,ASTR,LPRN,RPRN,BSPC, ,
101	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	101	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
@@ -105,11 +105,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
105	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	105	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
106	MUTE,MSTP,MPLY,VOLD,PGDN,MINS, , PLUS,END , , , , , ,	106	MUTE,MSTP,MPLY,VOLD,PGDN,MINS, , PLUS,END , , , , , ,
107	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	107	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
108	, , , , , , , , , , , , ,	108	, , , , , , , , , , , , ,
109	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'	109	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'
110	),	110	),
111		111
112	[_FN3] = KC_KEYMAP(	112	[_FN3] = LAYOUT_kc(
113	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.	113	//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
114	F12 , F1 , F2 , F3 , F4 , F5 , , F6 , F7 , F8 , F9 ,F10 ,F11 , ,	114	F12 , F1 , F2 , F3 , F4 , F5 , , F6 , F7 , F8 , F9 ,F10 ,F11 , ,
115	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	115	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
119	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	119	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
120	, , , , , , , , , , , , , ,	120	, , , , , , , , , , , , , ,
121	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|	121	//\|----+----+----+----+----+----+----\| \|----+----+----+----+----+----+----\|
122	, , , , , , , , , , , , ,	122	, , , , , , , , , , , , ,
123	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'	123	//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'
124	),	124	),
125		125
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
134	* \| \| \| \| \| \| \| \| \| \| \| \|	134	* \| \| \| \| \| \| \| \| \| \| \| \|
135	* `-----------------------------------------------------------------------------------'	135	* `-----------------------------------------------------------------------------------'
136	*/	136	*/
137	[_ADJUST] = KEYMAP( \	137	[_ADJUST] = LAYOUT( \
138	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \	138	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
139	_______, RESET , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, _______, _______, \	139	_______, RESET , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, _______, _______, \
140	_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, \	140	_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, \