Update keymap.c

Updated rgb swirl
Updated encoder
2024-07-28 22:54:58 -05:00 · 2024-07-25 16:06:38 -05:00 · 2024-07-25 15:36:51 -05:00 · 2024-06-24 09:27:12 -05:00 · 2024-06-24 09:20:45 -05:00 · 2024-06-24 09:20:02 -05:00
8 changed files with 887 additions and 107 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "kmk_firmware"]
 	path = kmk_firmware
 	url = git@github.com:KMKfw/kmk_firmware.git
+[submodule "vial-qmk"]
+	path = vial-qmk
+	url = git@github.com:vial-kb/vial-qmk.git
--- a/compile_commands.json
+++ b/compile_commands.json
--- a/dgvigil/definitions/keycodes.h
+++ b/dgvigil/definitions/keycodes.h
@@ -23,7 +23,6 @@ enum {
 enum {
    CUSTOM_KEYCODE_START = SAFE_RANGE,
    QWERTY,
-    COLEMAK,
    LINUX,
    COPY,
    PASTE,
--- a/dgvigil/definitions/keymap_blocks.h
+++ b/dgvigil/definitions/keymap_blocks.h
@@ -17,8 +17,8 @@
 // EMPTY ROW
 #define __________________EMPTY_____________________ _______, _______, _______, _______, _______ 
 // BOOTLOADER
-#define _________________BOOT_R1____________________ _______, _______, QWERTY, _______, QK_BOOTLOADER    
-#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,COLEMAK,_______,_______    
+#define _________________BOOT_R1____________________ _______, _______, _______, _______, QK_BOOTLOADER    
+#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,_______,_______,_______    


 // _BASE
--- a/dgvigil/definitions/layers.h
+++ b/dgvigil/definitions/layers.h
@@ -7,6 +7,5 @@ typedef enum {
  _SYM,
  _FUN,
  _MUS,
-  _MOUSE,
-  _COLEMAK_DH
+  _MOUSE
 } layers_t;
--- a/draculad/keymap.c
+++ b/draculad/keymap.c
@@ -44,19 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       __________________BASE_L3____________________,       __________________BASE_R3____________________,
 //     └────────┴────────┴────────┴────────┼────────┤       ├────────┼────────┴────────┴────────┴────────┘
                                            _______,         _______,
-//                       ┌────────┬────────┼────────┼       ┼────────┼────────┬────────┐
-                          ___________THUMB_L3________,      ___________THUMB_R3________
-                      // └────────┴────────┴────────┘       └────────┴────────┴────────┘
-    ),
-    [_COLEMAK_DH] =  LAYOUT_wrapper(
-//     ┌────────┬────────┬────────┬────────┬────────┐       ┌────────┬────────┬────────┬────────┬────────┐
-       __________________COLEML1____________________,       __________________COLEMR1____________________,
-//     ├────────┼────────┼────────┼────────┼────────┤       ├────────┼────────┼────────┼────────┼────────┤
-       __________________COLEML2____________________,       __________________COLEMR2____________________,
-//     ├────────┼────────┼────────┼────────┼────────┤       ├────────┼────────┼────────┼────────┼────────┤
-       __________________COLEML3____________________,       __________________COLEMR3____________________,
-//     └────────┴────────┴────────┴────────┼────────┤       ├────────┼────────┴────────┴────────┴────────┘
-                                            _______,         _______,
 //                       ┌────────┬────────┼────────┼       ┼────────┼────────┬────────┐
                          ___________THUMB_L3________,      ___________THUMB_R3________
                      // └────────┴────────┴────────┘       └────────┴────────┴────────┘
@@ -314,11 +301,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                set_single_persistent_default_layer(_QWERTY);
            }
            return false;
-        case COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK_DH);
-            }
-            return false;
        case LINUX:
            if (record->event.pressed) {
                isLinux = !isLinux;
--- a/iris/keymap.c
+++ b/iris/keymap.c
@@ -1,9 +1,5 @@
 #include QMK_KEYBOARD_H

-#ifdef OS_DETECTION_ENABLE
-  #include "os_detection.h"
-#endif
-
 #include "dgvigil.h"

 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
@@ -50,23 +46,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
  ),

-  [_COLEMAK_DH] = LAYOUT_wrapper(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML1____________________,                           __________________COLEMR1____________________, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML2____________________,                           __________________COLEMR2____________________, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML3____________________, SPOTLI,         _______, __________________COLEMR3____________________, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    ___________THUMB_3__BLANK__,                 ___________THUMB_3__BLANK__
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),

  [_NAV] = LAYOUT_wrapper(
  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, RGB_TOG,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, RGB_TOG,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
     _______, __________________EMPTY_____________________,                           __________________NAV_R1____________________, _______,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -80,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_NUM] = LAYOUT_wrapper(
  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
     _______, __________________NUM_L1____________________,                           _________________BOOT_R1____________________, _______,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -94,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_SYM] = LAYOUT_wrapper(
  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
     _______, __________________SYM_L1____________________,                           __________________EMPTY_____________________, _______,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -108,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

 [_FUN] = LAYOUT_wrapper(
  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
     _______, __________________FUN_L1____________________,                            _________________BOOT_R1____________________, _______,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -122,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_MUS] = LAYOUT_wrapper(
  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
     _______, _________________BOOT_L1____________________,                           __________________EMPTY_____________________, _______,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -136,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_MOUSE] = LAYOUT_wrapper(
  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
     _______, __________________EMPTY_____________________,                           __________________MOU_R1____________________, _______,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -243,64 +226,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    return true;
 }

+// #define ___________THUMB_L3________ MUS_ESC, NAV_BKSP,MOUSE_TAB
+// #define ___________THUMB_R3________ SYM_ENTER,NUM_SPC,FUN_DEL
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_QWERTY] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_NAV] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) },
-    [_NUM] = { ENCODER_CCW_CW(C(KC_LEFT), C(KC_RIGHT)), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(KC_B, KC_B) },
-    [_SYM] = { ENCODER_CCW_CW(C(KC_TAB), S(C(KC_TAB))), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
-    [_MOUSE] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
-    [_FUN] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
-    [_MUS] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
-    [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_QWERTY] = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_NAV]    = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(C(KC_TAB), S(C(KC_TAB))) },
+    [_NUM]    = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
+    [_SYM]    = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
+    [_MOUSE]  = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(A(KC_TAB), S(A(KC_TAB))) },
+    [_FUN]    = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(RGB_VAI, RGB_VAD)  },
+    [_MUS]    = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) },
 };

-
-// Onboard LED
-#ifdef RGBLIGHT_ENABLE
-    // Configure LED
-    void keyboard_post_init_user(void) {
-        // Initialize RGB to static black
-        rgblight_enable_noeeprom();
-        rgblight_sethsv_noeeprom(HSV_BLACK);
-        rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    }
-
-    // Change LED
-    void housekeeping_task_user(void) {
-        // Caps lock status
-        if (host_keyboard_led_state().caps_lock) {
-            rgblight_setrgb_at(4, 4, 0, 0);
-        } else {
-            // Layers
-            switch (get_highest_layer(layer_state | default_layer_state)) {
-                case 0:
-                    rgblight_setrgb_at(4, 4, 4, 0);
-                    break;
-                case 1:
-                    rgblight_setrgb_at(4, 4, 4, 0);
-                    break;
-                case 2:
-                    rgblight_setrgb_at(4, 4, 4, 0);
-                    break;
-                case 3:
-                    rgblight_setrgb_at(4, 4, 4, 0);
-                    break;
-                case 4:
-                    rgblight_setrgb_at(0, 0, 4, 0);
-                    break;
-                case 5:
-                    rgblight_setrgb_at(0, 4, 0, 0);
-                    break;
-                case 6:
-                    rgblight_setrgb_at(0, 0, 4, 0);
-                    break;
-                case 7:
-                    rgblight_setrgb_at(0, 0, 4, 0);
-                    break;
-                case 8:
-                    rgblight_setrgb_at(0, 0, 4, 0);
-                    break;
-            }
-        }
-    }
-#endif
--- a/1
+++ b/1
Author	SHA1	Message	Date
Dave G Vigil Sr	d8ded6f4b3	Update keymap.c	2024-07-28 22:54:58 -05:00
dave	cc5c19df96	Updated rgb swirl	2024-07-25 16:06:38 -05:00
dave	795664a692	Updated encoder	2024-07-25 15:36:51 -05:00
Dave G Vigil Sr	5dcab5e0b6	Update keymap_blocks.h	2024-06-24 09:27:12 -05:00
Dave G Vigil Sr	f73f2816e9	Update layers.h	2024-06-24 09:20:45 -05:00
Dave G Vigil Sr	9cb659c8f1	Update keycodes.h	2024-06-24 09:20:02 -05:00
Dave G Vigil Sr	0d086830f6	Update keymap.c	2024-06-24 09:19:15 -05:00
Dave G Vigil Sr	9627e81f67	Update keymap.c	2024-06-24 09:14:01 -05:00
Dave G Vigil Sr	edd5bb59a2	Update keymap.c	2024-06-24 09:10:58 -05:00