Another ADHD change

2024-08-15 07:54:11 -05:00
parent dd4507cfc4
commit d7d125bada
7 changed files with 131 additions and 419 deletions
--- a/dgvigil/features/macros.c
+++ b/dgvigil/features/macros.c
@@ -3,16 +3,94 @@
 #include "macros.h"


-process_record_result_t process_macro_keycode(uint16_t keycode, keyrecord_t *record) {
+uint8_t mod_state;
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static bool isLinux = false;
+    mod_state = get_mods();
    switch (keycode) {
+
+        case LINUX:
+            if (record->event.pressed) {
+                isLinux = !isLinux;
+            }
+            return false;
+        case COPY:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_C));
+                } else {
+                    tap_code16(LGUI(KC_C));
+                }
+                return false;
+            }
+        case PASTE:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_V));
+                } else {
+                    tap_code16(LGUI(KC_V));
+                }
+            return false;
+            }
+        case CUT:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_X));
+                } else {
+                    tap_code16(LGUI(KC_X));
+                }
+                return false;
+            }
+        case UNDO:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_Z));
+                } else {
+                    tap_code16(LGUI(KC_Z));
+                }
+                return false;
+            }
+        case REDO:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_Y));
+                } else {
+                    tap_code16(LSG(KC_Z));
+                }
+                return false;
+            }
+        case SALL:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_A));
+                } else {
+                    tap_code16(LGUI(KC_A));
+                }
+                return false;
+            }
        case M_PASS1:
            if (record->event.pressed) {
-                SEND_STRING("T3lg3Ranch!2023");
+                SEND_STRING("P0plarLake!2023");
            }
            return false;
        case M_PASS2:
            if (record->event.pressed) {
-               SEND_STRING("P0plarLake!2023");
+               SEND_STRING("CindieOtono!2024");
+            }
+            return false;
+        case M_PASS3:
+            if (record->event.pressed) {
+               SEND_STRING("1290");
+            }
+            return false;
+        case M_PASS4:
+            if (record->event.pressed) {
+               SEND_STRING("Thel0ve0fchrist!");
+            }
+            return false;
+        case SPOTLI:
+            if (record->event.pressed) {
+               tap_code16(LGUI(KC_SPACE));
            }
            return false;
  }
--- a/iris/keymap.c
+++ b/iris/keymap.c
@@ -165,99 +165,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };

-uint8_t mod_state;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static bool isLinux = false;
-    mod_state = get_mods();
-    switch (keycode) {

-        case LINUX:
-            if (record->event.pressed) {
-                isLinux = !isLinux;
-            }
-            return false;
-        case COPY:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_C));
-                } else {
-                    tap_code16(LGUI(KC_C));
-                }
-                return false;
-            }
-        case PASTE:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_V));
-                } else {
-                    tap_code16(LGUI(KC_V));
-                }
-            return false;
-            }
-        case CUT:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_X));
-                } else {
-                    tap_code16(LGUI(KC_X));
-                }
-                return false;
-            }
-        case UNDO:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_Z));
-                } else {
-                    tap_code16(LGUI(KC_Z));
-                }
-                return false;
-            }
-        case REDO:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_Y));
-                } else {
-                    tap_code16(LSG(KC_Z));
-                }
-                return false;
-            }
-        case SALL:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_A));
-                } else {
-                    tap_code16(LGUI(KC_A));
-                }
-                return false;
-            }
-        case M_PASS1:
-            if (record->event.pressed) {
-                SEND_STRING("P0plarLake!2023");
-            }
-            return false;
-        case M_PASS2:
-            if (record->event.pressed) {
-               SEND_STRING("CindieOtono!2024");
-            }
-            return false;
-        case M_PASS3:
-            if (record->event.pressed) {
-               SEND_STRING("1290");
-            }
-            return false;
-        case M_PASS4:
-            if (record->event.pressed) {
-               SEND_STRING("Thel0ve0fchrist!");
-            }
-            return false;
-        case SPOTLI:
-            if (record->event.pressed) {
-               tap_code16(LGUI(KC_SPACE));
-            }
-            return false;
-  }
-    return true;
-}

 // #define ___________THUMB_L3________ MUS_ESC, NAV_BKSP,MOUSE_TAB
 // #define ___________THUMB_R3________ SYM_ENTER,NUM_SPC,FUN_DEL
--- a/q8-vial-layout.vil
+++ b/q8-vial-layout.vil
--- a/q8/config.h
+++ b/q8/config.h
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#define VIAL_KEYBOARD_UID {0x77, 0x4C, 0xB1, 0xD7, 0xDD, 0xBE, 0xF6, 0xD2}
-
-#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
-#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 8
--- a/q8/keymap.c
+++ b/q8/keymap.c
@@ -16,29 +16,65 @@

 #include QMK_KEYBOARD_H
 #include "keychron_common.h"
+#include "dgvigil.h"

 // clang-format off

-enum layers{
-    QWERTY,
-    COLEDH,
-    _NAV,
-    _NUM,
-    _SYM,
-    _FUN,
-    _MUS,
-    _MOUSE
+enum combos {
+  FA_GUI,
+  FS_ALT,
+  FD_CTL,
+  JQUOT_GUI,
+  JL_ALT,
+  JK_CTL,
+  TA_GUI,
+  TR_ALT,
+  TS_CTL,
+  NO_GUI,
+  NI_ALT,
+  NE_CTL
 };

+const uint16_t PROGMEM fa_combo[] = {KC_F, KC_A, COMBO_END};
+const uint16_t PROGMEM fs_combo[] = {KC_F, KC_S, COMBO_END};
+const uint16_t PROGMEM fd_combo[] = {KC_F, KC_D, COMBO_END};
+const uint16_t PROGMEM jquote_combo[] = {KC_J, KC_QUOT, COMBO_END};
+const uint16_t PROGMEM jl_combo[] = {KC_J, KC_L, COMBO_END};
+const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
+
+const uint16_t PROGMEM ta_combo[] = {KC_T, KC_A, COMBO_END};
+const uint16_t PROGMEM tr_combo[] = {KC_T, KC_R, COMBO_END};
+const uint16_t PROGMEM ts_combo[] = {KC_T, KC_S, COMBO_END};
+const uint16_t PROGMEM no_combo[] = {KC_N, KC_O, COMBO_END};
+const uint16_t PROGMEM ni_combo[] = {KC_N, KC_I, COMBO_END};
+const uint16_t PROGMEM ne_combo[] = {KC_N, KC_E, COMBO_END};
+
+combo_t key_combos[] = {
+// QWERTY
+  [FA_GUI] = COMBO(fa_combo, KC_LGUI),
+  [FS_ALT] = COMBO(fs_combo, KC_LALT),
+  [FD_CTL] = COMBO(fd_combo, KC_LCTL),
+  [JQUOT_GUI] = COMBO(jquote_combo, KC_RGUI),
+  [JL_ALT] = COMBO(jl_combo, KC_RALT),
+  [JK_CTL] = COMBO(jk_combo, KC_RCTL),
+// COLEMAK-DH
+  [TA_GUI] = COMBO(ta_combo, KC_LGUI),
+  [TR_ALT] = COMBO(tr_combo, KC_LALT),
+  [TS_CTL] = COMBO(ts_combo, KC_LCTL),
+  [NO_GUI] = COMBO(no_combo, KC_RGUI),
+  [NI_ALT] = COMBO(ni_combo, KC_RALT),
+  [NE_CTL] = COMBO(ne_combo, KC_RCTL),};
+
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [QWERTY] = LAYOUT_ansi_69(
+    [_QWERTY] = LAYOUT_ansi_69(
        KC_ESC,  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_MUTE,
        KC_TAB,  __________________BASE_L1____________________,    __________________BASE_R1____________________,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
        KC_CAPS, __________________BASE_L2____________________,              __________________BASE_R2____________________,  KC_QUOT,  KC_ENT,              KC_HOME,
        KC_LSFT,           __________________BASE_L3____________________,     KC_B,     __________________BASE_R3____________________,  KC_RSFT, KC_UP,
        KC_LCTL, KC_LOPTN,        ___________THUMB_L3________,                                   ___________THUMB_R3________,          KC_LEFT, KC_DOWN,    KC_RGHT),

-    [COLEDH] = LAYOUT_ansi_69(
+    [_COLEMAKDH] = LAYOUT_ansi_69(
        KC_ESC,  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_MUTE,
        KC_TAB,  __________________COLEML1____________________,    __________________COLEMR1____________________,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
        KC_CAPS, __________________COLEML2____________________,              __________________COLEMR2____________________,  KC_QUOT,  KC_ENT,              KC_HOME,
@@ -90,8 +126,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [QWERTY] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [COLEDH] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [_QWERTY] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [_COLEMAKDH] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
    [_NAV]   = {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)},
    [_NUM]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
    [_FUN]   = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)},
--- a/q8/rules.mk
+++ b/q8/rules.mk
@@ -1,8 +1,4 @@
-VIA_ENABLE = yes
-VIAL_ENABLE = yes
-VIALRGB_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
-COMBO_ENABLE = yes

 VPATH += keyboards/keychron/common
 SRC += keychron_common.c
--- a/q8/vial.json
+++ b/q8/vial.json
@@ -1,297 +0,0 @@
-{
-  "name": "Keychron Q8",
-  "vendorId": "0x3434",
-  "productId": "0x0181",
-  "lighting": "vialrgb",
-  "customKeycodes": [
-    {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "MCtrl"},
-    {"name": "Launch Pad",      "title": "Launch Pad in macOS",      "shortName": "LPad"},
-    {"name": "Left Option",     "title": "Left Option in macOS",     "shortName": "LOpt"},
-    {"name": "Right Option",    "title": "Right Option in macOS",    "shortName": "ROpt"},
-    {"name": "Left Cmd",        "title": "Left Command in macOS",    "shortName": "LCmd"},
-    {"name": "Right Cmd",       "title": "Right Command in macOS",   "shortName": "RCmd"},
-    {"name": "Siri",            "title": "Siri in macOS",            "shortName": "Siri"},
-    {"name": "Task View",       "title": "Task View in windows",     "shortName": "Task"},
-    {"name": "File Explorer",   "title": "File Explorer in windows", "shortName": "File"},
-    {"name": "Screen Shot",     "title": "Screenshot in macOS",      "shortName": "SShot"},
-    {"name": "Cortana",         "title": "Cortana in windows",       "shortName": "Cortana"}
-  ],
-  "matrix": {"rows": 5, "cols": 15},
-  "layouts": {
-    "keymap": [
-      [
-        {
-          "x": 2.75
-        },
-        "0,2",
-        {
-          "x": 8.85
-        },
-        "0,11",
-        {
-          "x": 3.5000000000000018,
-          "c": "#aaaaaa"
-        },
-        "0,14"
-      ],
-      [
-        {
-          "y": -0.8500000000000001,
-          "x": 13.6,
-          "c": "#cccccc"
-        },
-        "0,12",
-        {
-          "c": "#aaaaaa",
-          "w": 2
-        },
-        "0,13"
-      ],
-      [
-        {
-          "y": -0.9999999999999999,
-          "x": 18.25
-        },
-        "0,0\n\n\n\n\n\n\n\n\ne"
-      ],
-      [
-        {
-          "y": -0.9999999999999999,
-          "x": 19.25
-        },
-        "0,1\n\n\n\n\n\n\n\n\ne",
-        {
-          "x": -19.5,
-          "c": "#777777"
-        },
-        "0,0\nESC",
-        {
-          "c": "#cccccc"
-        },
-        "0,1"
-      ],
-      [
-        {
-          "x": 0.5,
-          "c": "#aaaaaa",
-          "w": 1.5
-        },
-        "1,0",
-        {
-          "c": "#cccccc"
-        },
-        "1,1",
-        {
-          "x": 10.3
-        },
-        "1,11",
-        "1,12",
-        {
-          "w": 1.5
-        },
-        "1,13"
-      ],
-      [
-        {
-          "y": -0.8999999999999999,
-          "x": 17.3,
-          "c": "#aaaaaa"
-        },
-        "1,14"
-      ],
-      [
-        {
-          "y": -0.10000000000000009,
-          "x": 0.25,
-          "w": 1.75
-        },
-        "2,0",
-        {
-          "c": "#cccccc"
-        },
-        "2,1",
-        {
-          "x": 9.75
-        },
-        "2,11",
-        "2,12",
-        {
-          "c": "#777777",
-          "w": 2.25
-        },
-        "2,13"
-      ],
-      [
-        {
-          "y": -0.8999999999999999,
-          "x": 17.5,
-          "c": "#aaaaaa"
-        },
-        "2,14"
-      ],
-      [
-        {
-          "y": -0.10000000000000009,
-          "w": 2.25
-        },
-        "3,0",
-        {
-          "c": "#cccccc"
-        },
-        "3,2",
-        {
-          "x": 10.15
-        },
-        "3,12",
-        {
-          "c": "#aaaaaa",
-          "w": 1.75
-        },
-        "3,13"
-      ],
-      [
-        {
-          "y": -0.75,
-          "x": 16.4,
-          "c": "#777777"
-        },
-        "3,14"
-      ],
-      [
-        {
-          "y": -0.25,
-          "c": "#aaaaaa",
-          "w": 1.25
-        },
-        "4,0",
-        {
-          "w": 1.25
-        },
-        "4,1"
-      ],
-      [
-        {
-          "y": -0.75,
-          "x": 15.4,
-          "c": "#777777"
-        },
-        "4,12",
-        "4,13",
-        "4,14"
-      ],
-      [
-        {
-          "r": 6,
-          "y": -5.7,
-          "x": 3.85,
-          "c": "#cccccc"
-        },
-        "0,3",
-        "0,4",
-        "0,5",
-        "0,6"
-      ],
-      [
-        {
-          "x": 3.35
-        },
-        "1,2",
-        "1,3",
-        "1,4",
-        "1,5"
-      ],
-      [
-        {
-          "x": 3.55
-        },
-        "2,2",
-        "2,3",
-        "2,4",
-        "2,5"
-      ],
-      [
-        {
-          "x": 3.9
-        },
-        "3,3",
-        "3,4",
-        "3,5",
-        "3,6"
-      ],
-      [
-        {
-          "x": 4,
-          "c": "#aaaaaa",
-          "w": 1.25
-        },
-        "4,2",
-        {
-          "c": "#cccccc",
-          "w": 2.25
-        },
-        "4,3",
-        {
-          "c": "#aaaaaa"
-        },
-        "4,6"
-      ],
-      [
-        {
-          "r": -6,
-          "y": -3.2,
-          "x": 8.35,
-          "c": "#cccccc"
-        },
-        "0,7",
-        "0,8",
-        "0,9",
-        "0,10"
-      ],
-      [
-        {
-          "x": 7.9
-        },
-        "1,6",
-        "1,7",
-        "1,8",
-        "1,9",
-        "1,10"
-      ],
-      [
-        {
-          "x": 8.25
-        },
-        "2,7",
-        "2,8",
-        "2,9",
-        "2,10"
-      ],
-      [
-        {
-          "x": 7.8
-        },
-        "3,7",
-        "3,8",
-        "3,9",
-        "3,10",
-        "3,11"
-      ],
-      [
-        {
-          "x": 7.8,
-          "c": "#aaaaaa"
-        },
-        "4,7",
-        {
-          "c": "#cccccc",
-          "w": 2.75
-        },
-        "4,8",
-        {
-          "c": "#aaaaaa"
-        },
-        "4,9"
-      ]
-    ]
-  }
-}