aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornielsenz <nielsenz@oregonstate.edu>2016-11-10 13:39:46 -0800
committernielsenz <nielsenz@oregonstate.edu>2016-11-10 13:39:46 -0800
commitf388bb5bdacb39a5309ca7594940184bbf35e84b (patch)
tree3c1c3b9e3f56c734f867f6c4c253998ea63094e1
parent4c0aa02b2e476a8f939586a0da2f28f2a44c83c3 (diff)
downloadqmk_firmware-f388bb5bdacb39a5309ca7594940184bbf35e84b.tar.gz
qmk_firmware-f388bb5bdacb39a5309ca7594940184bbf35e84b.zip
Removed some common functions from my keymap
-rw-r--r--keyboards/planck/keymaps/zach/keymap.c8
-rw-r--r--keyboards/planck/keymaps/zach/zach_common_functions.c9
-rw-r--r--keyboards/preonic/keymaps/zach/keymap.c4
-rw-r--r--keyboards/preonic/keymaps/zach/zach_common_functions.c9
4 files changed, 6 insertions, 24 deletions
diff --git a/keyboards/planck/keymaps/zach/keymap.c b/keyboards/planck/keymaps/zach/keymap.c
index d3cde5bb9..710477df5 100644
--- a/keyboards/planck/keymaps/zach/keymap.c
+++ b/keyboards/planck/keymaps/zach/keymap.c
@@ -33,16 +33,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
33}, 33},
34 34
35[_ADJUST] = { /* ADJUST - Macros, Layer Switching, Function Keys */ 35[_ADJUST] = { /* ADJUST - Macros, Layer Switching, Function Keys */
36 {UNIWIN, Sil_Usr, Sil_Pas, PENGY, DUCK, KC_INS, KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX}, 36 {UNIWIN, XXXXXXX, XXXXXXX, PENGY, DUCK, KC_INS, KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX},
37 {UNILIN, UltiU, UltiP, RANDIG, RANDIG, SWCOLE, COLEMAK, KC_F5, KC_F6, KC_F7, KC_F8, XXXXXXX}, 37 {UNILIN, XXXXXXX, XXXXXXX, RANDIG, RANDIG, SWCOLE, COLEMAK, KC_F5, KC_F6, KC_F7, KC_F8, XXXXXXX},
38 {_______, CADKEY, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX}, 38 {_______, CADKEY, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX},
39 {_______, _______, _______, _______, _______, RESET, RESET, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX} 39 {_______, _______, _______, _______, _______, RESET, RESET, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}
40}, 40},
41 41
42[_UNICODES] = { /* UNICODES - Extra layer for unicode stuff */ 42[_UNICODES] = { /* UNICODES - Extra layer for unicode stuff */
43 {_______, TFLIP, XXXXXXX, FINGER, IBANG, roman7, XXXXXXX, XXXXXXX, ROMAN7, TappyL, TappyR, _______}, 43 {_______, TFLIP, XXXXXXX, XXXXXXX, IBANG, roman7, XXXXXXX, XXXXXXX, ROMAN7, XXXXXXX, XXXXXXX, _______},
44 {KC_DEL, TPUT, FACE, DISFACE, SHRUG, roman4, roman5, roman6, ROMAN4, ROMAN5, ROMAN6, _______}, 44 {KC_DEL, TPUT, FACE, DISFACE, SHRUG, roman4, roman5, roman6, ROMAN4, ROMAN5, ROMAN6, _______},
45 {XXXXXXX, PENIS, BOOBS, LAROW, RAROW, roman1, roman2, roman3, ROMAN1, ROMAN2, ROMAN3, XXXXXXX}, 45 {XXXXXXX, XXXXXXX, XXXXXXX, LAROW, RAROW, roman1, roman2, roman3, ROMAN1, ROMAN2, ROMAN3, XXXXXXX},
46 {_______, _______, _______, _______, _______, KC_SPC, KC_SPC, _______, _______, _______, _______, _______} 46 {_______, _______, _______, _______, _______, KC_SPC, KC_SPC, _______, _______, _______, _______, _______}
47} 47}
48}; 48};
diff --git a/keyboards/planck/keymaps/zach/zach_common_functions.c b/keyboards/planck/keymaps/zach/zach_common_functions.c
index 7d14dcf3f..1f907e6cb 100644
--- a/keyboards/planck/keymaps/zach/zach_common_functions.c
+++ b/keyboards/planck/keymaps/zach/zach_common_functions.c
@@ -45,16 +45,7 @@ enum my_keycodes{
45 TFLIP, 45 TFLIP,
46 TPUT, 46 TPUT,
47 SHRUG, 47 SHRUG,
48 PENIS,
49 BOOBS,
50 Sil_Pas,
51 Sil_Usr,
52 UltiU,
53 UltiP,
54 TappyR,
55 TappyL,
56 RANDIG, 48 RANDIG,
57 FINGER,
58 // Tap_Dance nums 49 // Tap_Dance nums
59 RAI = 0, 50 RAI = 0,
60 LOW, 51 LOW,
diff --git a/keyboards/preonic/keymaps/zach/keymap.c b/keyboards/preonic/keymaps/zach/keymap.c
index 423ca4b86..6ce37840b 100644
--- a/keyboards/preonic/keymaps/zach/keymap.c
+++ b/keyboards/preonic/keymaps/zach/keymap.c
@@ -45,10 +45,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
45}, 45},
46 46
47[_UNICODES] = { /* UNICODES - Extra layer for unicode stuff */ 47[_UNICODES] = { /* UNICODES - Extra layer for unicode stuff */
48 {_______, XXXXXXX, XXXXXXX, FINGER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______}, 48 {_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______},
49 {_______, TFLIP, XXXXXXX, XXXXXXX, IBANG, roman7, XXXXXXX, XXXXXXX, ROMAN7, XXXXXXX, XXXXXXX, _______}, 49 {_______, TFLIP, XXXXXXX, XXXXXXX, IBANG, roman7, XXXXXXX, XXXXXXX, ROMAN7, XXXXXXX, XXXXXXX, _______},
50 {KC_DEL, TPUT, FACE, DISFACE, SHRUG, roman4, roman5, roman6, ROMAN4, ROMAN5, ROMAN6, _______}, 50 {KC_DEL, TPUT, FACE, DISFACE, SHRUG, roman4, roman5, roman6, ROMAN4, ROMAN5, ROMAN6, _______},
51 {XXXXXXX, PENIS, BOOBS, LAROW, RAROW, roman1, roman2, roman3, ROMAN1, ROMAN2, ROMAN3, XXXXXXX}, 51 {XXXXXXX, XXXXXXX, XXXXXXX, LAROW, RAROW, roman1, roman2, roman3, ROMAN1, ROMAN2, ROMAN3, XXXXXXX},
52 {_______, _______, _______, _______, _______, KC_SPC, KC_SPC, _______, _______, _______, _______, _______} 52 {_______, _______, _______, _______, _______, KC_SPC, KC_SPC, _______, _______, _______, _______, _______}
53} 53}
54}; 54};
diff --git a/keyboards/preonic/keymaps/zach/zach_common_functions.c b/keyboards/preonic/keymaps/zach/zach_common_functions.c
index 7d14dcf3f..1f907e6cb 100644
--- a/keyboards/preonic/keymaps/zach/zach_common_functions.c
+++ b/keyboards/preonic/keymaps/zach/zach_common_functions.c
@@ -45,16 +45,7 @@ enum my_keycodes{
45 TFLIP, 45 TFLIP,
46 TPUT, 46 TPUT,
47 SHRUG, 47 SHRUG,
48 PENIS,
49 BOOBS,
50 Sil_Pas,
51 Sil_Usr,
52 UltiU,
53 UltiP,
54 TappyR,
55 TappyL,
56 RANDIG, 48 RANDIG,
57 FINGER,
58 // Tap_Dance nums 49 // Tap_Dance nums
59 RAI = 0, 50 RAI = 0,
60 LOW, 51 LOW,