Omnikey Blackheart refactor (#3280)

1 files changed, 40 insertions, 39 deletions

diff --git a/keyboards/omnikey_blackheart/keymaps/default/keymap.c b/keyboards/omnikey_blackheart/keymaps/default/keymap.c
index 9dff862e87..3316218700 100644
--- a/keyboards/omnikey_blackheart/keymaps/default/keymap.c
+++ b/keyboards/omnikey_blackheart/keymaps/default/keymap.c
@@ -1,48 +1,49 @@
-#include "omnikey_blackheart.h"
+#include QMK_KEYBOARD_H
 
 // Fillers to make layering more clear
-#define ______ KC_TRNS
-#define XXXXXX KC_NO
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = KEYMAP(\
-	KC_F11	, 	KC_F12 ,	KC_ESC	,	KC_F1	,	KC_F2	,	KC_F3	,	KC_F4	,	KC_F5	,	KC_F6	,	KC_F7	,	KC_F8	,	KC_F9	,	KC_F10	,	KC_F11	,	KC_F12 	,				KC_PSCR	, 	KC_SLCK	, 	KC_PAUS	, 
-	KC_F1	, 	KC_F2  , 	KC_GRV	, 	KC_1	, 	KC_2	, 	KC_3	, 	KC_4	, 	KC_5	, 	KC_6	, 	KC_7	, 	KC_8	, 	KC_9	, 	KC_0	, 	KC_MINS	, 	KC_EQL 	, 	KC_BSPC	, 	KC_INS	, 	KC_HOME	, 	KC_PGUP	, 	KC_NLCK	, KC_PSLS, KC_PAST, KC_PMNS, 
-	KC_F3	, 	KC_F4  , 	KC_TAB	, 	KC_Q	, 	KC_W	, 	KC_E	, 	KC_R	, 	KC_T	,	KC_Y	, 	KC_U	,	KC_I	, 	KC_O	, 	KC_P	, 	KC_LBRC	, 	KC_RBRC	, 	KC_BSLS	,	KC_DEL	, 	KC_END	, 	KC_PGDN	, 	KC_P7	, KC_P8	 , KC_P9  , KC_PPLS, 
-	KC_F5	, 	KC_F6  , 	KC_CAPS	, 	KC_A	, 	KC_S	, 	KC_D	, 	KC_F	, 	KC_G	, 	KC_H	,	KC_J	, 	KC_K	, 	KC_L	, 	KC_SCLN	, 	KC_QUOT	, 				KC_ENT 	,	XXXXXX	, 	XXXXXX	, 	XXXXXX	, 	KC_P4	, KC_P5	 , KC_P6  ,	KC_EQL, 
-	KC_F7	, 	KC_F8  , 	KC_LSFT	, 	KC_Z	, 	KC_X	, 	KC_C	, 	KC_V	, 	KC_B	, 	KC_N	, 	KC_M	, 	KC_COMM	, 	KC_DOT	, 	KC_SLSH	,	KC_RSFT	, 				MO(1)	,	XXXXXX	, 	KC_UP	, 	XXXXXX	, 	KC_P1	, KC_P2	 , KC_P3  ,	KC_PENT, 
-	KC_F9 	, 	KC_F10 ,	KC_LCTL	,   KC_LGUI	, 	KC_LALT	, 	XXXXXX	,		 		KC_SPC	, 										KC_RALT	, 	KC_RGUI	, 	KC_RCTL	, 				XXXXXX 	,	KC_LEFT	, 	KC_DOWN	, 	KC_RIGHT, 		  KC_P0		 , KC_PDOT
-	),
-	
-	[1] = KEYMAP(\
-	KC_F11	, 	KC_F12 ,	KC_ESC	,	KC_F1	,	KC_F2	,	KC_F3	,	KC_F4	,	KC_F5	,	KC_F6	,	KC_F7	,	KC_F8	,	KC_F9	,	KC_F10	,	KC_F11	,	KC_F12 	,				KC_PSCR	, 	KC_SLCK	, 	KC_PAUS	, 
-	KC_F1	, 	KC_F2  , 	RESET	, 	KC_1	, 	KC_2	, 	KC_3	, 	KC_4	, 	KC_5	, 	KC_6	, 	KC_7	, 	KC_8	, 	KC_9	, 	KC_0	, 	KC_MINS	, 	KC_EQL 	, 	KC_BSPC	, 	KC_INS	, 	KC_HOME	, 	KC_PGUP	, 	KC_NLCK	, KC_PSLS, KC_PAST, KC_PMNS, 
-	KC_F3	, 	KC_F4  , 	KC_TAB	, 	KC_Q	, 	KC_W	, 	KC_E	, 	KC_R	, 	KC_T	,	KC_Y	, 	KC_U	,	KC_I	, 	KC_O	, 	KC_P	, 	KC_LBRC	, 	KC_RBRC	, 	KC_BSLS	,	KC_DEL	, 	KC_END	, 	KC_PGDN	, 	KC_P7	, KC_P8	 , KC_P9  , KC_PPLS, 
-	KC_F5	, 	KC_F6  , 	KC_CAPS	, 	KC_A	, 	KC_S	, 	KC_D	, 	KC_F	, 	KC_G	, 	KC_H	,	KC_J	, 	KC_K	, 	KC_L	, 	KC_SCLN	, 	KC_QUOT	, 				KC_ENT 	,	XXXXXX	, 	XXXXXX	, 	XXXXXX	, 	KC_P4	, KC_P5	 , KC_P6  ,	KC_EQL, 
-	KC_F7	, 	KC_F8  , 	KC_LSFT	, 	KC_Z	, 	KC_X	, 	KC_C	, 	KC_V	, 	KC_B	, 	KC_N	, 	KC_M	, 	KC_COMM	, 	KC_DOT	, 	KC_SLSH	,	KC_RSFT	, 				______	,	XXXXXX	, 	KC_UP	, 	XXXXXX	, 	KC_P1	, KC_P2	 , KC_P3  ,	KC_PENT, 
-	KC_F9 	, 	KC_F10 ,	KC_LCTL	,   KC_LGUI	, 	KC_LALT	, 	XXXXXX	,		 		KC_SPC	, 										KC_RALT	, 	KC_RGUI	, 	KC_RCTL	, 				XXXXXX 	,	KC_LEFT	, 	KC_DOWN	, 	KC_RIGHT, 	KC_P0	, KC_PDOT
-	),
+  [0] = LAYOUT(\
+    KC_F11,  KC_F12,      KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_F1,   KC_F2,       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_F3,   KC_F4,       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_F5,   KC_F6,       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,               XXXXXXX, XXXXXXX, XXXXXXX,     KC_P4,   KC_P5,   KC_P6,   KC_EQL,
+    KC_F7,   KC_F8,       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                XXXXXXX, KC_UP,   XXXXXXX,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_F9,   KC_F10,      KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL, XXXXXXX,     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,            KC_PDOT
+  ),
+
+  [1] = LAYOUT(\
+    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______,
+    _______, _______,     RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
+    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
+    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              XXXXXXX, XXXXXXX, XXXXXXX,     _______, _______, _______, _______,
+    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              XXXXXXX, _______, XXXXXXX,     _______, _______, _______, _______,
+    _______, _______,     _______, _______, _______,                   _______,                                     _______, _______, _______, XXXXXXX,     _______, _______, _______,     _______,          _______
+
+  ),
 };
 
 void led_set_kb(uint8_t usb_led) {
-	DDRB |= (1 << 4) | (1 << 5) | (1 << 6);
-
-	if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-		PORTB |= (1 << 4);
-	} else {
-		PORTB &= ~(1 << 4);
-	}
-
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		PORTB |= (1 << 5);
-	} else {
-		PORTB &= ~(1 << 5);
-	}
-
-	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-		PORTB |= (1 << 6);
-	} else {
-		PORTB &= ~(1 << 6);
-	}
+  DDRB |= (1 << 4) | (1 << 5) | (1 << 6);
+
+  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+    PORTB |= (1 << 4);
+  } else {
+    PORTB &= ~(1 << 4);
+  }
+
+  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+    PORTB |= (1 << 5);
+  } else {
+    PORTB &= ~(1 << 5);
+  }
+
+  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+    PORTB |= (1 << 6);
+  } else {
+    PORTB &= ~(1 << 6);
+  }
 }
\ No newline at end of file