aboutsummaryrefslogtreecommitdiff
path: root/keyboards/program_yoink
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/program_yoink')
-rw-r--r--keyboards/program_yoink/ortho/keymaps/default/keymap.c12
-rw-r--r--keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c12
-rw-r--r--keyboards/program_yoink/program_yoink.c5
-rw-r--r--keyboards/program_yoink/staggered/keymaps/default/keymap.c8
-rw-r--r--keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c12
5 files changed, 22 insertions, 27 deletions
diff --git a/keyboards/program_yoink/ortho/keymaps/default/keymap.c b/keyboards/program_yoink/ortho/keymaps/default/keymap.c
index 6f20f22dd..9b09f21cc 100644
--- a/keyboards/program_yoink/ortho/keymaps/default/keymap.c
+++ b/keyboards/program_yoink/ortho/keymaps/default/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, 39 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______,
40 KC_CAPS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, KC_SCLN, KC_QUOT, _______, _______, _______, 40 KC_CAPS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, KC_SCLN, KC_QUOT, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______ 42 _______, _______, _______, _______, _______, _______, _______
43 ), 43 ),
44 44
45 [_LAYER2] = LAYOUT_ortho( 45 [_LAYER2] = LAYOUT_ortho(
46 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, 46 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
51}; 51};
52 52
53 53
54void encoder_update_user(uint8_t index, bool clockwise) { 54bool encoder_update_user(uint8_t index, bool clockwise) {
55 if (index == 0) { 55 if (index == 0) {
56 if (clockwise) { 56 if (clockwise) {
57 tap_code(KC_VOLU); 57 tap_code(KC_VOLU);
@@ -59,7 +59,8 @@ void encoder_update_user(uint8_t index, bool clockwise) {
59 tap_code(KC_VOLD); 59 tap_code(KC_VOLD);
60 } 60 }
61 } 61 }
62} 62 return true;
63}
63 64
64#ifdef COMBO_ENABLE 65#ifdef COMBO_ENABLE
65const uint16_t PROGMEM combo_ent[] = {KC_DOT, KC_SLSH, COMBO_END}; 66const uint16_t PROGMEM combo_ent[] = {KC_DOT, KC_SLSH, COMBO_END};
@@ -70,6 +71,3 @@ combo_t key_combos[COMBO_COUNT] = {
70 71
71}; 72};
72#endif 73#endif
73
74
75
diff --git a/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c b/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c
index 1c8f93913..9ffc617f0 100644
--- a/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c
+++ b/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, 39 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______,
40 KC_CAPS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, KC_SCLN, KC_QUOT, _______, _______, _______, 40 KC_CAPS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, KC_SCLN, KC_QUOT, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______ 42 _______, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______
43 ), 43 ),
44 44
45 [_LAYER2] = LAYOUT_ortho_split( 45 [_LAYER2] = LAYOUT_ortho_split(
46 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, 46 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
51}; 51};
52 52
53 53
54void encoder_update_user(uint8_t index, bool clockwise) { 54bool encoder_update_user(uint8_t index, bool clockwise) {
55 if (index == 0) { 55 if (index == 0) {
56 if (clockwise) { 56 if (clockwise) {
57 tap_code(KC_VOLU); 57 tap_code(KC_VOLU);
@@ -59,7 +59,8 @@ void encoder_update_user(uint8_t index, bool clockwise) {
59 tap_code(KC_VOLD); 59 tap_code(KC_VOLD);
60 } 60 }
61 } 61 }
62} 62 return true;
63}
63 64
64#ifdef COMBO_ENABLE 65#ifdef COMBO_ENABLE
65const uint16_t PROGMEM combo_ent[] = {KC_K, KC_L, COMBO_END}; 66const uint16_t PROGMEM combo_ent[] = {KC_K, KC_L, COMBO_END};
@@ -70,6 +71,3 @@ combo_t key_combos[COMBO_COUNT] = {
70 71
71}; 72};
72#endif 73#endif
73
74
75
diff --git a/keyboards/program_yoink/program_yoink.c b/keyboards/program_yoink/program_yoink.c
index a974d7f6f..7733aa2ad 100644
--- a/keyboards/program_yoink/program_yoink.c
+++ b/keyboards/program_yoink/program_yoink.c
@@ -16,8 +16,8 @@
16 16
17#include "program_yoink.h" 17#include "program_yoink.h"
18 18
19__attribute__ ((weak)) 19bool encoder_update_kb(uint8_t index, bool clockwise) {
20void encoder_update_user(uint8_t index, bool clockwise) { 20 if (!encoder_update_user(index, clockwise)) return false;
21 if (index == 0) { 21 if (index == 0) {
22 if (clockwise) { 22 if (clockwise) {
23 tap_code(KC_VOLU); 23 tap_code(KC_VOLU);
@@ -25,4 +25,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
25 tap_code(KC_VOLD); 25 tap_code(KC_VOLD);
26 } 26 }
27 } 27 }
28 return true;
28} 29}
diff --git a/keyboards/program_yoink/staggered/keymaps/default/keymap.c b/keyboards/program_yoink/staggered/keymaps/default/keymap.c
index 5aa0c95e6..8a039044a 100644
--- a/keyboards/program_yoink/staggered/keymaps/default/keymap.c
+++ b/keyboards/program_yoink/staggered/keymaps/default/keymap.c
@@ -41,8 +41,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
41 KC_MINS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, _______, 41 KC_MINS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, _______,
42 KC_EQL, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, _______, 42 KC_EQL, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, _______,
43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
44 KC_LGUI, KC_LALT, _______, _______, _______, _______, _______ 44 KC_LGUI, KC_LALT, _______, _______, _______, _______, _______
45 ), 45 ),
46 46
47 [_LAYER2] = LAYOUT_default( 47 [_LAYER2] = LAYOUT_default(
48 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, 48 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
53}; 53};
54 54
55 55
56void encoder_update_user(uint8_t index, bool clockwise) { 56bool encoder_update_user(uint8_t index, bool clockwise) {
57 if (index == 0) { 57 if (index == 0) {
58 if (clockwise) { 58 if (clockwise) {
59 tap_code(KC_VOLU); 59 tap_code(KC_VOLU);
@@ -61,6 +61,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
61 tap_code(KC_VOLD); 61 tap_code(KC_VOLD);
62 } 62 }
63 } 63 }
64 return true;
64} 65}
65 66
66#ifdef COMBO_ENABLE 67#ifdef COMBO_ENABLE
@@ -72,4 +73,3 @@ combo_t key_combos[COMBO_COUNT] = {
72 73
73}; 74};
74#endif 75#endif
75
diff --git a/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c b/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c
index 89865dad3..7bbde7bd0 100644
--- a/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c
+++ b/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, 39 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______,
40 KC_CAPS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, KC_SCLN, KC_QUOT, _______, _______, 40 KC_CAPS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, KC_SCLN, KC_QUOT, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______ 42 _______, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______
43 ), 43 ),
44 44
45 [_LAYER2] = LAYOUT_split_bar( 45 [_LAYER2] = LAYOUT_split_bar(
46 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, 46 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
51}; 51};
52 52
53 53
54void encoder_update_user(uint8_t index, bool clockwise) { 54bool encoder_update_user(uint8_t index, bool clockwise) {
55 if (index == 0) { 55 if (index == 0) {
56 if (clockwise) { 56 if (clockwise) {
57 tap_code(KC_VOLU); 57 tap_code(KC_VOLU);
@@ -59,7 +59,8 @@ void encoder_update_user(uint8_t index, bool clockwise) {
59 tap_code(KC_VOLD); 59 tap_code(KC_VOLD);
60 } 60 }
61 } 61 }
62} 62 return true;
63}
63 64
64#ifdef COMBO_ENABLE 65#ifdef COMBO_ENABLE
65const uint16_t PROGMEM combo_slsh[] = {MT(MOD_RSFT, KC_DOT), KC_COMM, COMBO_END}; 66const uint16_t PROGMEM combo_slsh[] = {MT(MOD_RSFT, KC_DOT), KC_COMM, COMBO_END};
@@ -70,6 +71,3 @@ combo_t key_combos[COMBO_COUNT] = {
70 71
71}; 72};
72#endif 73#endif
73
74
75