Update keymap.c

.github/workflows/lint_and_compile.yml

@@ -38,6 +38,7 @@ jobs:
                   # qmk compile -kb ferris/sweep -km dgvigil
                   echo "Building QMK for keebio/iris/rev8"
                   qmk compile -kb keebio/iris/rev8 -km dgvigil
+                  qmk compile -kb keebio/iris/rev8 -km via
                   # echo "Building QMK for bluebell/swoop"
                   # qmk compile -kb bluebell/swoop -km dgvigil -e CONVERT_TO=promicro_rp2040
                   find -maxdepth 1 -name "*.hex"

dgvigil/definitions/keycodes.h

@@ -22,7 +22,9 @@ enum {
 
 enum {
     CUSTOM_KEYCODE_START = SAFE_RANGE,
-    WINDOWS,
+    QWERTY,
+    COLEMAK,
+    LINUX,
     COPY,
     PASTE,
     CUT,
@@ -49,9 +51,6 @@ enum {
 #define NUM_SPC LT(_NUM, KC_SPC)
 #define FUN_DEL LT(_FUN, KC_DEL)
 
-#define QWERTY   DF(_QWERTY)
-#define COLEMAK  DF(_COLEMAK_DH)
-
 // 2 LEFT THUMB KEYS
 #define FUN_TAB LT(_FUN, KC_TAB)
 // 2 RIGHT THUMB KEYS

dgvigil/definitions/keymap_blocks.h

@@ -17,8 +17,8 @@
 // EMPTY ROW
 #define __________________EMPTY_____________________ _______, _______, _______, _______, _______ 
 // BOOTLOADER
-#define _________________BOOT_R1____________________ _______, _______, _______, _______, QK_BOOTLOADER    
+#define _________________BOOT_R1____________________ _______, _______, QWERTY, _______, QK_BOOTLOADER    
-#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,_______,_______,_______    
+#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,COLEMAK,_______,_______    
 
 
 // _BASE
@@ -69,8 +69,8 @@
 
 // MOUSE
 #define __________________MOU_R1____________________  _______, KC_PSTE, KC_COPY, KC_CUT,  KC_UNDO
-#define __________________MOU_R2____________________  KC_BTN1,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
+#define __________________MOU_R2____________________  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______
-#define __________________MOU_R3____________________  KC_BTN2, KC_WH_L,  KC_WH_D, KC_WH_U, KC_WH_R
+#define __________________MOU_R3____________________  KC_BTN2, KC_BTN1,  KC_WH_D, KC_WH_U, KC_BTN2
 
 // COLEMAK-DH
 #define __________________COLEML1____________________ Q_ESC,  KC_W,   KC_F,    KC_P,    KC_B    

draculad/keymap.c

@@ -44,6 +44,19 @@ 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________
                       // └────────┴────────┴────────┘       └────────┴────────┴────────┘
@@ -293,17 +306,27 @@ bool oled_task_user(void) {
 
 uint8_t mod_state;
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static bool isWindows = false;
+    static bool isLinux = false;
     mod_state = get_mods();
     switch (keycode) {
-        case WINDOWS:
+        case QWERTY:
             if (record->event.pressed) {
-                isWindows = !isWindows;
+                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;
             }
             return false;
         case COPY:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_C));
                 } else {
                     tap_code16(LGUI(KC_C));
@@ -312,7 +335,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case PASTE:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_V));
                 } else {
                     tap_code16(LGUI(KC_V));
@@ -321,7 +344,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case CUT:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_X));
                 } else {
                     tap_code16(LGUI(KC_X));
@@ -330,7 +353,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case UNDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Z));
                 } else {
                     tap_code16(LGUI(KC_Z));
@@ -339,7 +362,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case REDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Y));
                 } else {
                     tap_code16(LSG(KC_Z));
@@ -348,7 +371,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case SALL:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_A));
                 } else {
                     tap_code16(LGUI(KC_A));
@@ -362,17 +385,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case M_PASS2:
             if (record->event.pressed) {
-               SEND_STRING("ThisisThel0ve0fchrist!");
+               SEND_STRING("CindieVerano!2024");
             }
             return false;
         case M_PASS3:
             if (record->event.pressed) {
-               SEND_STRING("1029");
+               SEND_STRING("1290");
             }
             return false;
         case M_PASS4:
             if (record->event.pressed) {
-               SEND_STRING("10242677");
+               SEND_STRING("Thel0ve0fchrist!");
+            }
+            return false;
+        case SPOTLI:
+            if (record->event.pressed) {
+               tap_code16(LGUI(KC_SPACE));              
             }
             return false;      
   }

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,15 +46,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
+
   [_NAV] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, RGB_TOG,
+     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, RGB_TOG,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________EMPTY_____________________,                           __________________NAV_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________NAV_L2____________________,                           __________________NAV_R2____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NAV_L3____________________, WINDOWS,         _______, __________________NAV_R3____________________, _______,
+     _______, __________________NAV_L3____________________, LINUX,         _______, __________________NAV_R3____________________, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     ___________THUMB_L3________,                 ___________THUMB_R3________
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
@@ -66,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_NUM] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________NUM_L1____________________,                           _________________BOOT_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -80,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_SYM] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________SYM_L1____________________,                           __________________EMPTY_____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -94,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  [_FUN] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________FUN_L1____________________,                            _________________BOOT_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -108,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MUS] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, _________________BOOT_L1____________________,                           __________________EMPTY_____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -122,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MOUSE] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________EMPTY_____________________,                           __________________MOU_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -132,36 +129,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                    ___________THUMB_3__BLANK__,                  ___________THUMB_3__BLANK__
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_COLEMAK_DH] = LAYOUT_wrapper(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML1____________________,                           __________________COLEMR1____________________, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML2____________________,                           __________________COLEMR2____________________, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML3____________________, _______,         _______, __________________COLEMR3____________________, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                   ___________THUMB_3__BLANK__,                  ___________THUMB_3__BLANK__
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   )
 };
 
 uint8_t mod_state;
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static bool isWindows = false;
+    static bool isLinux = false;
     mod_state = get_mods();
     switch (keycode) {
-        case WINDOWS:
+
+        case LINUX:
             if (record->event.pressed) {
-                isWindows = !isWindows;
+                isLinux = !isLinux;
             }
             return false;
         case COPY:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_C));
                 } else {
                     tap_code16(LGUI(KC_C));
@@ -170,7 +154,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case PASTE:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_V));
                 } else {
                     tap_code16(LGUI(KC_V));
@@ -179,7 +163,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case CUT:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_X));
                 } else {
                     tap_code16(LGUI(KC_X));
@@ -188,7 +172,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case UNDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Z));
                 } else {
                     tap_code16(LGUI(KC_Z));
@@ -197,7 +181,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case REDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Y));
                 } else {
                     tap_code16(LSG(KC_Z));
@@ -206,7 +190,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case SALL:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_A));
                 } else {
                     tap_code16(LGUI(KC_A));
@@ -220,22 +204,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case M_PASS2:
             if (record->event.pressed) {
-               SEND_STRING("ThisisThel0ve0fchrist!");
+               SEND_STRING("CindieVerano!2024");
             }
             return false;
         case M_PASS3:
             if (record->event.pressed) {
-               SEND_STRING("1029");
+               SEND_STRING("1290");
             }
             return false;
         case M_PASS4:
             if (record->event.pressed) {
-               SEND_STRING("10242677");
+               SEND_STRING("Thel0ve0fchrist!");
             }
             return false;
         case SPOTLI:
             if (record->event.pressed) {
-                    tap_code16(LGUI(KC_SPACE));              
+               tap_code16(LGUI(KC_SPACE));              
             }
             return false;      
   }
@@ -250,56 +234,5 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_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) },
 };
 
-
-// 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