From 6486c7809c06ef52f305528135ee4d97f5daf1b8 Mon Sep 17 00:00:00 2001 From: Rossman360 <53881724+Rossman360@users.noreply.github.com> Date: Mon, 6 Jan 2020 23:36:00 -0500 Subject: [PATCH] Making keymaps based on userspace (#7812) * hope this works * TF working with userspace * rules for tf * Fixed changed default files * delete old keymap * revert tf68 default to default Co-authored-by: Akaash Suresh --- .../tragicforce68/keymaps/rossman360/keymap.c | 80 +------------------ .../tragicforce68/keymaps/rossman360/rules.mk | 1 + users/rossman360/rossman360.c | 26 +----- users/rossman360/rossman360.h | 27 ++++++- 4 files changed, 30 insertions(+), 104 deletions(-) create mode 100644 keyboards/keebio/tragicforce68/keymaps/rossman360/rules.mk diff --git a/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c b/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c index ef3fc729e28..127a0fd1ee4 100755 --- a/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c +++ b/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c @@ -1,19 +1,9 @@ #include QMK_KEYBOARD_H +#include "rossman360.h" #define PGMOD LT(_MOD, KC_PGDN) #define SPCMOD LT(_MOD, KC_SPACE) #define VOLMOD LT(_MOD, KC__MUTE) -#define CMDBSP MT(MOD_LGUI, KC_BSPC) -#define ALTDEL MT(MOD_LALT, KC_DEL) -#define BWORD LCTL(KC_BSPC) -#define LWORD LCTL(KC_LEFT) -#define RWORD LCTL(KC_RIGHT) -#define JUMPBACK LSFT(KC_TAB) -#define UNDO LCTL(KC_Z) -#define XPANDR LCTL(LSFT(KC_X)) -#define NTAB LCTL(KC_T) -#define CTAB LCTL(KC_W) -#define XPANDR LCTL(LSFT(KC_X)) enum layer_names { _BASE, @@ -22,70 +12,6 @@ enum layer_names { _DEL, }; -enum custom_keycodes { - LAUNCHCLOCK = SAFE_RANGE, - CSPEAK, - SPEAK1, - SPEAK2, - SPEAK3, - SPEAK4, - PARADOWN, - WREFRESH, - PMERGE, - REMCAPS, -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { -switch (keycode) { - case CSPEAK: - if (record->event.pressed) { - SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN)); - break; - } - case SPEAK1: - if (record->event.pressed) { - SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_1))); - break; - } - case SPEAK2: - if (record->event.pressed) { - SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_2))); - } - break; - case SPEAK3: - if (record->event.pressed) { - SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_3))); - } - break; - case SPEAK4: - if (record->event.pressed) { - SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_4))); - } - break; - case PARADOWN: - if (record->event.pressed) { - SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN)); - } - break; - case PMERGE: - if (record->event.pressed) { - SEND_STRING(SS_TAP(X_HOME) SS_TAP(X_BSPACE) SS_TAP(X_SPACE) SS_LCTRL(SS_TAP(X_BSPACE)) SS_TAP(X_SPACE)); - } - break; - case WREFRESH: - if (record->event.pressed) { - SEND_STRING(SS_TAP(X_SPACE) SS_TAP(X_BSPACE)); - } - break; - case REMCAPS: - if (record->event.pressed) { - SEND_STRING(SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_LCTRL(SS_TAP(X_LEFT)) SS_TAP(X_DELETE)); - } - break; - }; - return true; -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_split_space( //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────────────┐ ┌────────┬────────┐ @@ -100,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { CMDBSP, ALTDEL, KC_LCTRL, KC_SPACE, SPCMOD, SPCMOD, MO(_DEL), KC_LCTL, KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT //└──────────┴──────────┴──────────┴──────────────────┴────────────────┴───────────────┴─────────────────┴──────────┴──────────┘ └────────┴────────┴────────┘ ), - + [_REV] = LAYOUT_split_space( //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────────────┐ ┌────────┬────────┐ _______, _______, _______, _______, _______, _______,_______, _______,_______, _______, _______, _______, _______, _______, _______, _______, @@ -128,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, LWORD, RWORD, LWORD, RWORD, _______, _______, _______, KC_F2 , _______ //└──────────┴──────────┴──────────┴───────────────────┴────────────────┴──────────────┴─────────────────┴──────────┴──────────┘ └────────┴────────┴────────┘ ), - + [_DEL] = LAYOUT_split_space( //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────────────┐ ┌────────┬────────┐ _______, SPEAK1, SPEAK2, SPEAK3, SPEAK4, _______,_______, _______,_______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keebio/tragicforce68/keymaps/rossman360/rules.mk b/keyboards/keebio/tragicforce68/keymaps/rossman360/rules.mk new file mode 100644 index 00000000000..4c2b0289a2d --- /dev/null +++ b/keyboards/keebio/tragicforce68/keymaps/rossman360/rules.mk @@ -0,0 +1 @@ +BOOTLOADER = atmel-dfu diff --git a/users/rossman360/rossman360.c b/users/rossman360/rossman360.c index ade1b630a82..a1c4ad8f9f5 100644 --- a/users/rossman360/rossman360.c +++ b/users/rossman360/rossman360.c @@ -4,35 +4,11 @@ void my_custom_function(void) { } -#define PGMOD LT(_NUM, KC_PGDN) -#define TABMOD LT(_FN1, KC_TAB) -#define SPCMOD LT(_FN1, KC_SPACE) -#define ENTMOD LT(_FN2, KC_ENTER) -#define ESCMOD LT(_NUM, KC_ESC) -#define RSMOD LT(_FN1, KC_RSHIFT) -#define CMDBSP MT(MOD_LGUI, KC_BSPC) -#define ALTDEL MT(MOD_LALT, KC_DEL) -#define CTRLSP MT(MOD_LCTL, KC_SPACE) -#define BWORD LCTL(KC_BSPC) -#define JUMPBACK LSFT(KC_TAB) -#define LWORD LCTL(KC_LEFT) -#define RWORD LCTL(KC_RIGHT) -#define UNDO LCTL(KC_Z) -#define NTAB LCTL(KC_T) -#define CTAB LCTL(KC_W) -#define XPANDR LCTL(LSFT(KC_X)) -#define TAB1 LCTL(KC_1) -#define TAB2 LCTL(KC_2) -#define TAB3 LCTL(KC_3) -#define TAB4 LCTL(KC_4) -#define RVOLU LCTL(KC_RBRC) -#define RVOLD LCTL(KC_LBRC) - __attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; } - + bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case KC_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader diff --git a/users/rossman360/rossman360.h b/users/rossman360/rossman360.h index 4c3e01a99d6..e5629e20edf 100644 --- a/users/rossman360/rossman360.h +++ b/users/rossman360/rossman360.h @@ -1,6 +1,29 @@ #pragma once - #include "quantum.h" -void my_custom_function(void); +#define BWORD LCTL(KC_BSPC) +#define LWORD LCTL(KC_LEFT) +#define RWORD LCTL(KC_RIGHT) +#define JUMPBACK LSFT(KC_TAB) +#define UNDO LCTL(KC_Z) +#define XPANDR LCTL(LSFT(KC_X)) +#define NTAB LCTL(KC_T) +#define CTAB LCTL(KC_W) +#define XPANDR LCTL(LSFT(KC_X)) +#define CMDBSP MT(MOD_LGUI, KC_BSPC) +#define ALTDEL MT(MOD_LALT, KC_DEL) + +// Define all of +enum custom_keycodes { + KC_MAKE = SAFE_RANGE, + CSPEAK, + SPEAK1, + SPEAK2, + SPEAK3, + SPEAK4, + PARADOWN, + WREFRESH, + PMERGE, + REMCAPS, +};