From b228eb97648525e2f7b7b3f3dc146194b2cca111 Mon Sep 17 00:00:00 2001 From: Charlie Steenhagen Date: Wed, 2 Oct 2024 19:17:17 -0500 Subject: [PATCH] Fixed and added some thigns --- .../aesir/heimdall/keymaps/valhalla/config.h | 2 - .../aesir/heimdall/keymaps/valhalla/keymap.c | 15 +- users/csteamengine/csteamengine.c | 173 ++++++++++++++++++ users/csteamengine/csteamengine.h | 29 +++ 4 files changed, 210 insertions(+), 9 deletions(-) diff --git a/keyboards/aesir/heimdall/keymaps/valhalla/config.h b/keyboards/aesir/heimdall/keymaps/valhalla/config.h index 53905142a5..c2c7065369 100644 --- a/keyboards/aesir/heimdall/keymaps/valhalla/config.h +++ b/keyboards/aesir/heimdall/keymaps/valhalla/config.h @@ -34,5 +34,3 @@ #define RGB_MATRIX_DEFAULT_SAT 255 #define RGB_MATRIX_DEFAULT_VAL 200 #define RGBLIGHT_LIMIT_VAL 125 -#define BOOTMAGIC_ROW 0 -#define BOOTMAGIC_COLUMN 1 diff --git a/keyboards/aesir/heimdall/keymaps/valhalla/keymap.c b/keyboards/aesir/heimdall/keymaps/valhalla/keymap.c index 38bca3bd2f..7fe006efd1 100644 --- a/keyboards/aesir/heimdall/keymaps/valhalla/keymap.c +++ b/keyboards/aesir/heimdall/keymaps/valhalla/keymap.c @@ -21,16 +21,16 @@ enum { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT( - SELECT_WORD, CW_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + SELECT_WORD, CW_TOGG, MOVE_OBSIDIAN_FILE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_FN0), KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_NO, KC_PPLS, KC_END, KC_HOME, KC_NUM, - KC_NO, KC_GRV, 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_DEL, KC_PMNS, KC_PAST, KC_PSLS, - KC_NO, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_KP_DOT, KC_KP_7, KC_KP_8, KC_KP_9, - KC_NO, TD(TD_CAPS_LOCK), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_UP, KC_KP_4, KC_KP_5, KC_KP_6, - RGB_HUI, TD(TD_SC_LSHIFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, TD(TD_SC_RSHIFT), KC_DOWN, KC_KP_1, KC_KP_2, KC_KP_3, - RGB_HUD, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_RIGHT, KC_KP_0, KC_PENT + MO(_FN0), KC_GRV, 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_DEL, KC_PMNS, KC_PAST, KC_PSLS, + OPEN_OBSIDIAN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_KP_DOT, KC_KP_7, KC_KP_8, KC_KP_9, + NEW_OBSIDIAN_NOTE, TD(TD_CAPS_LOCK), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_UP, KC_KP_4, KC_KP_5, KC_KP_6, + OPEN_TICK_TICK, TD(TD_SC_LSHIFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, TD(TD_SC_RSHIFT), KC_DOWN, KC_KP_1, KC_KP_2, KC_KP_3, + TICK_TICK_TASK, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_RIGHT, KC_KP_0, KC_PENT ), [_FN0] = LAYOUT( - SELECT_WORD, CW_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + QK_BOOT, QK_RBT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_FN1), KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_DEL, KC_NO, KC_END, KC_HOME, KC_NUM, KC_NO, KC_GRV, 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_PPLS, KC_PMNS, KC_PAST, KC_PSLS, KC_NO, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_KP_DOT, KC_KP_7, KC_KP_8, KC_KP_9, @@ -118,6 +118,7 @@ bool rgb_matrix_indicators_user(void) { } bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + return true; } diff --git a/users/csteamengine/csteamengine.c b/users/csteamengine/csteamengine.c index 3456f5c946..8c85494520 100644 --- a/users/csteamengine/csteamengine.c +++ b/users/csteamengine/csteamengine.c @@ -28,6 +28,178 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (!process_record_keymap(keycode, record)) { return false; } + + switch (keycode) { + case ITS_DONE: + if (record->event.pressed) { + SEND_STRING(":itsdoneintensifies:"); + } else { + } + break; + case MARGED: + if (record->event.pressed) { + SEND_STRING(":marged:"); + } else { + } + break; + case LOL: + if (record->event.pressed) { + SEND_STRING(":lol:"); + } else { + } + break; + case MVP: + if (record->event.pressed) { + SEND_STRING(":mvp:"); + } else { + } + break; + case COPY_PATH: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_C)))); + } else { + } + break; + case COPY_FILENAME: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LOPT(SS_LCTL(SS_LSFT(SS_TAP(X_C)))))); + } else { + } + break; + case TICK_TICK_TASK: + if (record->event.pressed) { + SEND_STRING(SS_LOPT(SS_LSFT(SS_TAP(X_A)))); + } else { + } + break; + case OPEN_TICK_TICK: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_E)))); + } else { + } + break; + case TICK_TICK_MINI: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_O)))); + } else { + } + break; + case FRY_DANCE: + if (record->event.pressed) { + SEND_STRING(":frydance:"); + } else { + } + break; + case BENDER_DANCE: + if (record->event.pressed) { + SEND_STRING(":benderdance:"); + } else { + } + break; + case MONKEY_LOOK: + if (record->event.pressed) { + SEND_STRING(":monkey-look:"); + } else { + } + break; + case HARDPASTE: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LSFT(SS_DOWN(X_V)))); + } else { + SEND_STRING(SS_LGUI(SS_LSFT(SS_UP(X_V)))); + } + break; + case LOCK_SCREEN: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LCTL(SS_TAP(X_Q)))); + } else { + } + break; + case INTELLIJ_BACK: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_TAP(X_LEFT_BRACKET))); + } else { + } + break; + case INTELLIJ_FORWARD: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_TAP(X_RIGHT_BRACKET))); + } else { + } + break; + case CMD_SHIFT_T: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_T)))); + } else { + } + break; + case CMD_SHIFT_P: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_P)))); + } else { + } + break; + case REFACTOR: + if (record->event.pressed) { + SEND_STRING(SS_LSFT(SS_TAP(X_F6))); + } else { + } + break; + case RUN: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_TAP(X_4))); + } else { + } + break; + case EXTRACT_METHOD: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LOPT(SS_TAP(X_M)))); + } else { + } + break; + case INSPECT: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LOPT(SS_TAP(X_I)))); + } else { + } + break; + case DISTRACTION_FREE_MODE: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_F12)))); + } else { + } + break; + case DRAGON_DROP: + if (record->event.pressed) { + SEND_STRING(":dragon::droplet:"); + } else { + } + break; + case COPY_PASTA: + if (record->event.pressed) { + SEND_STRING(":copyright::spaghetti:"); + } else { + } + break; + case NEW_OBSIDIAN_NOTE: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LSFT(SS_LOPT(SS_LCTL(SS_TAP(X_O)))))); + } else { + } + break; + case OPEN_OBSIDIAN: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LOPT(SS_LSFT(SS_TAP(X_O))))); + } else { + } + break; + case MOVE_OBSIDIAN_FILE: + if (record->event.pressed) { + SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_M)))); + } else { + } + break; + } // other macros return true; } @@ -47,6 +219,7 @@ bool oled_task_keymap (void) { oled_rotation_t oled_init_user(oled_rotation_t rotation) { startup_timer = timer_read(); + // oled_init(rotation); return oled_init_keymap(rotation); } diff --git a/users/csteamengine/csteamengine.h b/users/csteamengine/csteamengine.h index ccb0eba2ce..81a33f913d 100644 --- a/users/csteamengine/csteamengine.h +++ b/users/csteamengine/csteamengine.h @@ -6,6 +6,35 @@ enum userspace_keycodes { PWTWO, PWTHREE, PWFOUR, + HARDPASTE, + LOCK_SCREEN, + INTELLIJ_BACK, + INTELLIJ_FORWARD, + CMD_SHIFT_T, + CMD_SHIFT_P, + DRAG_SCROLL, + COPY_PASTA, + DRAGON_DROP, + FRY_DANCE, + BENDER_DANCE, + ITS_DONE, + MARGED, + MVP, + LOL, + MONKEY_LOOK, + COPY_PATH, + COPY_FILENAME, + TICK_TICK_TASK, + OPEN_TICK_TICK, + TICK_TICK_MINI, + REFACTOR, + RUN, + EXTRACT_METHOD, + INSPECT, + DISTRACTION_FREE_MODE, + OPEN_OBSIDIAN, + NEW_OBSIDIAN_NOTE, + MOVE_OBSIDIAN_FILE, }; enum layer_names {