aboutsummaryrefslogtreecommitdiff
path: root/keyboards/kbdfans
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-04-27 06:45:17 +0000
committerQMK Bot <hello@qmk.fm>2021-04-27 06:45:17 +0000
commit86ab4fcb71ab6af6eb0e609ec392cf16f4bfa57c (patch)
treeac5740ff4b83723a06d85f80b24d517a7bcae204 /keyboards/kbdfans
parenta8c0954db5b0c39413c49b17c30a626e69373d3e (diff)
parentf9fb52951de60e9428a6c397bf167a6e7e9433f3 (diff)
downloadqmk_firmware-86ab4fcb71ab6af6eb0e609ec392cf16f4bfa57c.tar.gz
qmk_firmware-86ab4fcb71ab6af6eb0e609ec392cf16f4bfa57c.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/kbdfans')
-rw-r--r--keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c42
1 files changed, 1 insertions, 41 deletions
diff --git a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c
index c08e513a7..1648224fd 100644
--- a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c
@@ -1,4 +1,4 @@
1/* Copyright 2020 James Young (@noroadsleft) 1/* Copyright 2020-2021 James Young (@noroadsleft)
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by 4 * it under the terms of the GNU General Public License as published by
@@ -114,31 +114,6 @@ bool led_update_user(led_t led_state) {
114 114
115bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { 115bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
116 switch (keycode) { 116 switch (keycode) {
117 case G_PUSH:
118 if (record->event.pressed) {
119 SEND_STRING("git push origin ");
120 };
121 return false;
122 case G_FTCH:
123 if (record->event.pressed) {
124 if ( get_mods() & MOD_MASK_SHIFT ) {
125 clear_mods();
126 SEND_STRING("git pull upstream ");
127 } else {
128 SEND_STRING("git fetch upstream ");
129 }
130 };
131 return false;
132 case G_BRCH:
133 if (record->event.pressed) {
134 if ( get_mods() & MOD_MASK_SHIFT ) {
135 clear_mods();
136 SEND_STRING("master");
137 } else {
138 SEND_STRING("$(git branch-name)");
139 }
140 };
141 return false;
142 case GO_Q2: 117 case GO_Q2:
143 if (record->event.pressed) { 118 if (record->event.pressed) {
144 layer_move(_QW); 119 layer_move(_QW);
@@ -191,21 +166,6 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
191 } 166 }
192 }; 167 };
193 return true; 168 return true;
194 case KC_Z:
195 if (record->event.pressed) {
196 if ( get_mods() & MOD_MASK_RALT ) {
197 register_code(KC_NUBS);
198 } else {
199 register_code(KC_Z);
200 }
201 } else {
202 if ( get_mods() & MOD_MASK_RALT ) {
203 unregister_code(KC_NUBS);
204 } else {
205 unregister_code(KC_Z);
206 }
207 };
208 return false;
209 default: 169 default:
210 return true; 170 return true;
211 } 171 }