]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 535c2f6)
Do some cleanup for the API
authorskullY <skullydazed@gmail.com>
Thu, 2 Nov 2017 23:47:39 +0000 (16:47 -0700)
committerskullY <skullydazed@gmail.com>
Thu, 2 Nov 2017 23:47:39 +0000 (16:47 -0700)
13 files changed:
keyboards/ergodone/rules.mk patch | blob | history
keyboards/ergodox_infinity/rules.mk patch | blob | history
keyboards/lets_split/lets_split.h patch | blob | history
keyboards/lets_split/rev2/rev2.h patch | blob | history
keyboards/levinson/levinson.h patch | blob | history
keyboards/levinson/rev1/rev1.h patch | blob | history
keyboards/levinson/rev2/rev2.h patch | blob | history
keyboards/nyquist/nyquist.h patch | blob | history
keyboards/nyquist/rev1/rev1.h patch | blob | history
keyboards/roadkit/keymaps/khord/keymap.c patch | blob | history
keyboards/roadkit/keymaps/singles/keymap.c patch | blob | history
keyboards/roadkit/keymaps/singlesBrent/keymap.c patch | blob | history
keyboards/roadkit/roadkit.h patch | blob | history

diff --git a/keyboards/ergodone/rules.mk b/keyboards/ergodone/rules.mk
index bbad0ae7307de369871dd1e75c0c581e2ccef57e..dee7a14e0d6dc6ff9e88eac9f4b31e16980a3dd7 100644 (file)
--- a/keyboards/ergodone/rules.mk
+++ b/keyboards/ergodone/rules.mk
@@ -92,4 +92,4 @@ ONEHAND_ENABLE          = no  # Disable Onehand
 RGBLIGHT_ENABLE         = no
 MIDI_ENABLE             = no
 
-LAYOUTS = ergodox ergodox_80
\ No newline at end of file
+LAYOUTS = ergodox
diff --git a/keyboards/ergodox_infinity/rules.mk b/keyboards/ergodox_infinity/rules.mk
index cb11152556eb30df3b7994ffba326aaf457a2928..e1cef51c1e1b64cc4520596f56a5a22522780931 100644 (file)
--- a/keyboards/ergodox_infinity/rules.mk
+++ b/keyboards/ergodox_infinity/rules.mk
@@ -86,4 +86,4 @@ LED_DRIVER = is31fl3731c
 LED_WIDTH = 7 
 LED_HEIGHT = 7
 
-LAYOUTS = ergodox ergodox_80
\ No newline at end of file
+LAYOUTS = ergodox
diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h
index d9cfa35a219e056301659131bf4674b134cde5af..c5e1fbe0e67acefe9fb381da18f872e836abab1c 100644 (file)
--- a/keyboards/lets_split/lets_split.h
+++ b/keyboards/lets_split/lets_split.h
@@ -23,7 +23,6 @@
         KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
     )
 
-#define LAYOUT_ortho_4x12 KEYMAP
 #define KC_LAYOUT_ortho_4x12 KC_KEYMAP
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h
index 0c4e8e7de1205744db77cc86bf5bbf2defda24d5..0bc106ef2711be548fc35072b9ae59128203cf0e 100644 (file)
--- a/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@ -57,4 +57,6 @@
        }
 #endif
 
+#define LAYOUT_ortho_4x12 KEYMAP
+
 #endif
diff --git a/keyboards/levinson/levinson.h b/keyboards/levinson/levinson.h
index 3d616195fe10919ca79fbefdf6dec9ddc7d0df1f..9ab2dd116d21ef8b3f3d4bd813b4e535272b4f04 100644 (file)
--- a/keyboards/levinson/levinson.h
+++ b/keyboards/levinson/levinson.h
@@ -23,7 +23,6 @@
         KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
     )
 
-#define LAYOUT_ortho_4x12 KEYMAP
 #define KC_LAYOUT_ortho_4x12 KC_KEYMAP
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/levinson/rev1/rev1.h b/keyboards/levinson/rev1/rev1.h
index 968095cba7223a862bdc1ba698a3e70976f94d9b..73ce92a80b04e20a3fce3b7b251ed718e706e6ba 100644 (file)
--- a/keyboards/levinson/rev1/rev1.h
+++ b/keyboards/levinson/rev1/rev1.h
@@ -57,4 +57,6 @@
        }
 #endif
 
+#define LAYOUT_ortho_4x12 KEYMAP
+
 #endif
diff --git a/keyboards/levinson/rev2/rev2.h b/keyboards/levinson/rev2/rev2.h
index 968095cba7223a862bdc1ba698a3e70976f94d9b..73ce92a80b04e20a3fce3b7b251ed718e706e6ba 100644 (file)
--- a/keyboards/levinson/rev2/rev2.h
+++ b/keyboards/levinson/rev2/rev2.h
@@ -57,4 +57,6 @@
        }
 #endif
 
+#define LAYOUT_ortho_4x12 KEYMAP
+
 #endif
diff --git a/keyboards/nyquist/nyquist.h b/keyboards/nyquist/nyquist.h
index 8d031b05059cc11b332c7aec7223ccc4001c738c..4677079b41a5fe88a2436c16fe7fec8955470f6f 100644 (file)
--- a/keyboards/nyquist/nyquist.h
+++ b/keyboards/nyquist/nyquist.h
@@ -23,6 +23,4 @@
         KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
     )
 
-#define LAYOUT_ortho_5x12 KEYMAP
-
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/nyquist/rev1/rev1.h b/keyboards/nyquist/rev1/rev1.h
index eeaf15272876e1f78eecbad7fdf5dc1c90d85f3d..abc5dd2c805f626f159b659c35cc819dbf657c1a 100644 (file)
--- a/keyboards/nyquist/rev1/rev1.h
+++ b/keyboards/nyquist/rev1/rev1.h
@@ -63,4 +63,6 @@
        }
 #endif
 
+#define LAYOUT_ortho_5x12 KEYMAP
+
 #endif
diff --git a/keyboards/roadkit/keymaps/khord/keymap.c b/keyboards/roadkit/keymaps/khord/keymap.c
index 2f0b732015f4e0d294df9979c872e34f69f42e52..4eab6d082fa27adf1f18789441bb78fb21a3224a 100644 (file)
--- a/keyboards/roadkit/keymaps/khord/keymap.c
+++ b/keyboards/roadkit/keymaps/khord/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | L1  | L2  |     |     | Layer hold
  */
   [_NP] = /* Numpad */
-    SINGLES_KEYMAP(KC_P7,        KC_P8,         KC_P9,   KC_BSPC, \
+    LAYOUT_ortho_4x4(KC_P7,        KC_P8,         KC_P9,   KC_BSPC, \
                    KC_P4,        KC_P5,         KC_P6,   KC_TAB, \
                    KC_P1,        KC_P2,         KC_P3,   KC_PENT, \
                    LT(1, KC_P0), LT(2, KC_SPC), KC_PDOT, KC_PSLS),
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */
   [_L1] = /* LAYER 1 */
-    SINGLES_KEYMAP(RESET,   XXXXXXX, XXXXXXX, KC_DEL, \
+    LAYOUT_ortho_4x4(RESET,   XXXXXXX, XXXXXXX, KC_DEL, \
                    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, \
                    STR192,  STR255,  XXXXXXX, XXXXXXX, \
                    _______, BL_STEP, _______, XXXXXXX),
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */
   [_L2] = /* LAYER 2 */
-    SINGLES_KEYMAP(XXXXXXX, XXXXXXX, ADMIN,   SMSPC1, \
+    LAYOUT_ortho_4x4(XXXXXXX, XXXXXXX, ADMIN,   SMSPC1, \
                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
                    XXXXXXX, _______, XXXXXXX, XXXXXXX)
diff --git a/keyboards/roadkit/keymaps/singles/keymap.c b/keyboards/roadkit/keymaps/singles/keymap.c
index 1c6aa7883f9e4c592684030d1f3dbf1416e65d8e..79831652c794eb2eaa4085229e406aae0c80addc 100644 (file)
--- a/keyboards/roadkit/keymaps/singles/keymap.c
+++ b/keyboards/roadkit/keymaps/singles/keymap.c
@@ -23,12 +23,12 @@ extern keymap_config_t keymap_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NP] = /* Numpad */
-    SINGLES_KEYMAP(KC_KP_7, KC_KP_8,   KC_KP_9, KC_KP_PLUS,  \
+    LAYOUT_ortho_4x4(KC_KP_7, KC_KP_8,   KC_KP_9, KC_KP_PLUS,  \
                    KC_KP_4, KC_KP_5,   KC_KP_6, KC_KP_MINUS, \
                    KC_KP_1, KC_KP_2,   KC_KP_3, KC_KP_ENTER, \
                    KC_KP_0, KC_KP_DOT, TG(_L1), KC_BSPC),
   [_L1] = /* LAYER 1 */
-    SINGLES_KEYMAP(KC_NUMLOCK, KC_TRNS, KC_TRNS,  KC_VOLU, \
+    LAYOUT_ortho_4x4(KC_NUMLOCK, KC_TRNS, KC_TRNS,  KC_VOLU, \
                    KC_TRNS,    KC_UP,   KC_TRNS,  KC_VOLD, \
                    KC_LEFT,    KC_DOWN, KC_RIGHT, KC_TRNS, \
                    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS)
diff --git a/keyboards/roadkit/keymaps/singlesBrent/keymap.c b/keyboards/roadkit/keymaps/singlesBrent/keymap.c
index 13197346a908819b66067287c1b690604881ac2a..19640b52ef7d81b17257599f8044ef50373ec6ec 100644 (file)
--- a/keyboards/roadkit/keymaps/singlesBrent/keymap.c
+++ b/keyboards/roadkit/keymaps/singlesBrent/keymap.c
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */
   [_NP] = /* Numpad */
-    SINGLES_KEYMAP(KC_7,        KC_8,          KC_9,              KC_SLASH,  \
+    LAYOUT_ortho_4x4(KC_7,        KC_8,          KC_9,              KC_SLASH,  \
                    KC_4,        KC_5,          KC_6,              KC_KP_ASTERISK, \
                    KC_1,        KC_2,          KC_3,              KC_MINUS, \
                    TD(TD_0_L3), TD(TD_DOT_L2), TD(TD_KP_PLUS_L1), TD(TD_EQUAL_NP)),
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */
   [_L1] = /* LAYER 1 */
-    SINGLES_KEYMAP(KC_ESCAPE, KC_BSPACE, KC_HOME,  KC_PGUP, \
+    LAYOUT_ortho_4x4(KC_ESCAPE, KC_BSPACE, KC_HOME,  KC_PGUP, \
                    KC_TAB,    KC_UP,     KC_END,   KC_PGDOWN, \
                    KC_LEFT,   KC_DOWN,   KC_RIGHT, KC_KP_ENTER, \
                    KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS),
@@ -181,7 +181,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */                               
   [_L2] = /* LAYER 2 */
-    SINGLES_KEYMAP(KC_SYSTEM_SLEEP,     KC_MS_BTN1,          KC_MS_BTN2,          KC_AUDIO_VOL_UP, \
+    LAYOUT_ortho_4x4(KC_SYSTEM_SLEEP,     KC_MS_BTN1,          KC_MS_BTN2,          KC_AUDIO_VOL_UP, \
                    LALT(KC_F4),         KC_F11,              LGUI(KC_TAB),        KC_AUDIO_VOL_DOWN, \
                    KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, \
                    KC_TRNS,             KC_TRNS,             KC_TRNS,             KC_TRNS),
@@ -199,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */    
   [_L3] = /* LAYER 3 */
-    SINGLES_KEYMAP(KC_WWW_BACK,   KC_WWW_HOME, KC_WWW_FORWARD, KC_F5, \
+    LAYOUT_ortho_4x4(KC_WWW_BACK,   KC_WWW_HOME, KC_WWW_FORWARD, KC_F5, \
                    KC_CALCULATOR, LCTL(KC_Z),  LCTL(KC_Y),     KC_WWW_SEARCH, \
                    LCTL(KC_X),    LCTL(KC_C),  LCTL(KC_V),     LCTL(KC_F), \
                    KC_TRNS,       KC_TRNS,     KC_TRNS,        KC_TRNS),
diff --git a/keyboards/roadkit/roadkit.h b/keyboards/roadkit/roadkit.h
index a82a62e1ed7dbc866ab15b55608527b8641a4dff..486ba5059c79cc28407ea99871428286e107693f 100644 (file)
--- a/keyboards/roadkit/roadkit.h
+++ b/keyboards/roadkit/roadkit.h
@@ -17,7 +17,7 @@
     { K30, KC_NO, K32, KC_NO }  \
 }
 
-#define SINGLES_KEYMAP( \
+#define LAYOUT_ortho_4x4 ( \
     K00, K01, K02, K03, \
     K10, K11, K12, K13, \
     K20, K21, K22, K23, \
@@ -30,6 +30,4 @@
     { K30,   K31,   K32,   K33 }  \
 }
 
-#define LAYOUT_ortho_4x4 SINGLES_KEYMAP
-
 #endif
Unnamed repository; edit this file 'description' to name the repository.