]> git.donarmstrong.com Git - qmk_firmware.git/blobdiff - keyboards/kinesis/keymaps/xyverz/keymap.c
projects / qmk_firmware.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
KBD75 refactor and Configurator update (#3243)
[qmk_firmware.git] / keyboards / kinesis / keymaps / xyverz / keymap.c
diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c
index b8e06fe305e6038d36e584b79bdbdc7f2ee65386..4b4ad95cfdaef59d84cff570e4756cbdb320d06b 100644 (file)
--- a/keyboards/kinesis/keymaps/xyverz/keymap.c
+++ b/keyboards/kinesis/keymaps/xyverz/keymap.c
@@ -1,4 +1,4 @@
-#include "kinesis.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 #include "eeconfig.h"
 
@@ -19,10 +19,6 @@ extern keymap_config_t keymap_config;
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 /*
 
         Function Keys on All Layers (Keypad toggles):
@@ -46,7 +42,7 @@ extern keymap_config_t keymap_config;
                 |   `  |  INS | Left | Rght |              |  Up  |  Dn  |   /  |   =  |
                 `---------------------------'              `---------------------------'
                                     ,--------------.,--------------.
-                                    |Ctr/ESC| LAlt || RGUI |Ctr/ESC|
+                                    | LCtl  | LAlt || RGUI | RCtl  |
                              ,------|-------|------||------+-------+-------.
                              |      |  Del  | Home || PgUp | Enter |       |
                              | BkSp |   /   |------||------|   /   | Space |
@@ -66,7 +62,7 @@ extern keymap_config_t keymap_config;
                 |   `  |  INS | Left | Rght |              |  Up  |  Dn  |   [  |   ]  |
                 `---------------------------'              `---------------------------'
                                     ,--------------.,--------------.
-                                    |Ctr/ESC| LAlt || RGUI |Ctr/ESC|
+                                    | LCtl  | LAlt || RGUI | RCtl  |
                              ,------|-------|------||------+-------+-------.
                              |      |  Del  | Home || PgUp | Enter |       |
                              | BkSp |   /   |------||------|   /   | Space |
@@ -86,7 +82,7 @@ extern keymap_config_t keymap_config;
                 |   `  |  INS | Left | Rght |              |  Up  |  Dn  |   [  |   ]  |
                 `---------------------------'              `---------------------------'
                                     ,--------------.,--------------.
-                                    |Ctr/ESC| LAlt || RGUI |Ctr/ESC|
+                                    | LCtl  | LAlt || RGUI | RCtl  |
                              ,------|-------|------||------+-------+-------.
                              |      |  Del  | Home || PgUp | Enter |       |
                              | BkSp |   /   |------||------|   /   | Space |
@@ -119,9 +115,9 @@ extern keymap_config_t keymap_config;
        |--------+------+------+------+------+------||------+------+------+------+------+--------|
        | Sleep  |      |      |      |      |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-       | Wake   |      |      |      |      |      ||      | KP 4 | KP 5 | KP 6 | KP + |        |
+       | Wake   |      |QWERTY|Colemk|Dvorak|      ||      | KP 4 | KP 5 | KP 6 | KP + |        |
        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-       |        |      |QWERTY|Colemk|Dvorak|      ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
+       |        |      |      |      |      |      ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
                 |      |      |      |      |              |      |      | KP . |KP Ent|      |
                 `---------------------------'              `----------------------------------'
@@ -136,7 +132,7 @@ extern keymap_config_t keymap_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[_DV] = KEYMAP(
+[_DV] = LAYOUT (
            // Left Hand
            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
            KC_RBRC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
@@ -145,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,
                     KC_GRV,  KC_INS,  KC_LEFT, KC_RGHT,
            // Left Thumb
-                    CTL_T(KC_ESC), KC_LALT,
+                    KC_LCTL, KC_LALT,
                              KC_HOME,
            KC_BSPC, LT(_MD, KC_DEL),  KC_END,
 
@@ -157,21 +153,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
                     KC_UP,   KC_DOWN, KC_SLSH, KC_EQL,
            // Right Thumb
-           KC_RGUI, CTL_T(KC_ESC),
+           KC_RGUI, KC_RCTL,
            KC_PGUP,
            KC_PGDN, LT(_KP, KC_ENT),  KC_SPC
     ),
 
-[_QW] = KEYMAP(
+[_QW] = LAYOUT (
            // Left Hand
            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
-           KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+           KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
            KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
            KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
            KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
                     KC_GRV,  KC_INS,  KC_LEFT, KC_RGHT,
            // Left Thumb
-                    CTL_T(KC_ESC), KC_LALT,
+                    KC_LCTL, KC_LALT,
                              KC_HOME,
            KC_BSPC, LT(_MD, KC_DEL),  KC_END,
 
@@ -183,21 +179,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
                     KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
            // Right Thumb
-           KC_RGUI, CTL_T(KC_ESC),
+           KC_RGUI, KC_RCTL,
            KC_PGUP,
            KC_PGDN, LT(_KP, KC_ENT),  KC_SPC
     ),
 
-[_CM] = KEYMAP(
+[_CM] = LAYOUT (
            // Left Hand
            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
-           KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+           KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
            KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,
            KC_BSPC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,
            KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
                     KC_GRV,  KC_INS,  KC_LEFT, KC_RGHT,
            // Left Thumb
-                    CTL_T(KC_ESC), KC_LALT,
+                    KC_LCTL, KC_LALT,
                              KC_HOME,
            KC_BSPC, LT(_MD, KC_DEL),  KC_END,
 
@@ -209,12 +205,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
                     KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
            // Right Thumb
-           KC_RGUI, CTL_T(KC_ESC),
+           KC_RGUI, KC_RCTL,
            KC_PGUP,
            KC_PGDN, LT(_KP, KC_ENT),  KC_SPC
     ),
 
-[_MD] = KEYMAP(
+[_MD] = LAYOUT (
            // Left Hand
            _______, _______, _______, _______, _______, _______, _______, _______, _______,
            KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
@@ -240,7 +236,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            _______, _______, _______
     ),
 
-[_KP] = KEYMAP(
+[_KP] = LAYOUT (
            // Left Hand
            _______, _______, _______, _______, _______, _______, _______, _______, _______,
            KC_PWR,  _______, _______, _______, _______, _______,
@@ -273,7 +269,7 @@ const uint16_t PROGMEM fn_actions[] = {
 
 };
 
-void persistant_default_layer_set(uint16_t default_layer) {
+void persistent_default_layer_set(uint16_t default_layer) {
   eeconfig_update_default_layer(default_layer);
   default_layer_set(default_layer);
 }
@@ -283,17 +279,17 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
       switch(id) {
         case _DV:
           if (record->event.pressed) {
-            persistant_default_layer_set(1UL<<_DV);
+            persistent_default_layer_set(1UL<<_DV);
           }
           break;
         case _QW:
           if (record->event.pressed) {
-            persistant_default_layer_set(1UL<<_QW);
+            persistent_default_layer_set(1UL<<_QW);
           }
           break;
         case _CM:
           if (record->event.pressed) {
-            persistant_default_layer_set(1UL<<_CM);
+            persistent_default_layer_set(1UL<<_CM);
           }
           break;
       }
@@ -305,7 +301,20 @@ void matrix_init_user(void) {
 
 };
 
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-};
+void led_set_user(uint8_t usb_led) {
+    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
+        PORTF |= (1<<2);
+    } else {
+        PORTF &= ~(1<<2);
+    }
+    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+        PORTF |= (1<<3);
+    } else {
+        PORTF &= ~(1<<3);
+    }
+    if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
+        PORTF |= (1<<1);
+    } else {
+        PORTF &= ~(1<<1);
+    }
+}
Unnamed repository; edit this file 'description' to name the repository.