Update for Draculad

.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

dgvigil/definitions/keycodes.h

@@ -23,7 +23,6 @@ enum {
 enum {
     CUSTOM_KEYCODE_START = SAFE_RANGE,
     QWERTY,
-    COLEMAK,
     LINUX,
     COPY,
     PASTE,

dgvigil/definitions/keymap_blocks.h

@@ -17,8 +17,8 @@
 // EMPTY ROW
 #define __________________EMPTY_____________________ _______, _______, _______, _______, _______ 
 // BOOTLOADER
-#define _________________BOOT_R1____________________ _______, _______, QWERTY, _______, QK_BOOTLOADER    
+#define _________________BOOT_R1____________________ _______, _______, _______, _______, QK_BOOTLOADER    
-#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,COLEMAK,_______,_______    
+#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,_______,_______,_______    
 
 
 // _BASE

dgvigil/definitions/layers.h

@@ -7,6 +7,5 @@ typedef enum {
   _SYM,
   _FUN,
   _MUS,
-  _MOUSE,
+  _MOUSE
-  _COLEMAK_DH
+} layers_t;
-} layers_t;

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________
                       // └────────┴────────┴────────┘       └────────┴────────┴────────┘
@@ -71,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //     └────────┴────────┴────────┴────────┼────────┤       ├────────┼────────┴────────┴────────┴────────┘
                                             _______,         _______,
 //                       ┌────────┬────────┼────────┼       ┼────────┼────────┬────────┐
-                         ___________THUMB_3__BLANK__,        ___________THUMB_3__BLANK__
+                         ___________THUMB_L3________,        ___________THUMB_R3________
                       // └────────┴────────┴────────┘       └────────┴────────┴────────┘
 
     ),
@@ -98,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //     └────────┴────────┴────────┴────────┼────────┤       ├────────┼────────┴────────┴────────┴────────┘
                                             _______,         _______,
 //                       ┌────────┬────────┼────────┼       ┼────────┼────────┬────────┐
-                          _________SYM_TH_L3________,        _______, _______, _______
+                          _________SYM_TH_L3________,        ___________THUMB_3__BLANK__
                       // └────────┴────────┴────────┘       └────────┴────────┴────────┘
     ),
     [_FUN] = LAYOUT_wrapper(
@@ -309,16 +296,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     static bool isLinux = false;
     mod_state = get_mods();
     switch (keycode) {
-        case QWERTY:
+
-            if (record->event.pressed) {
-                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;
@@ -400,9 +378,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case SPOTLI:
             if (record->event.pressed) {
-               tap_code16(LGUI(KC_SPACE));              
+               tap_code16(LGUI(KC_SPACE));
             }
-            return false;      
+            return false;
   }
     return true;
 }

iris/keymap.c

@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_NAV] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, RGB_TOG,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, RGB_TOG,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________EMPTY_____________________,                           __________________NAV_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -63,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____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -77,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_____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -91,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____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -105,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_____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -119,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____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -219,20 +219,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case SPOTLI:
             if (record->event.pressed) {
-               tap_code16(LGUI(KC_SPACE));              
+               tap_code16(LGUI(KC_SPACE));
             }
-            return false;      
+            return false;
   }
     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) },
+    [_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_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) },
+    [_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(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) },
+    [_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(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) },
+    [_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(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) },
+    [_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(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(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(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(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) },
 };