From b323ab89e0092034e6a11e519ff566479df888b9 Mon Sep 17 00:00:00 2001
From: melonbred <61572569+melonbred@users.noreply.github.com>
Date: Wed, 13 Jan 2021 23:03:12 -0800
Subject: [PATCH] [Keyboard] Added Ortho support to Program Yoink kb (#11534)
* Added Ortho support
* Updated JSON
---
keyboards/program_yoink/info.json | 106 +++++++++++++++++-
.../program_yoink/keymaps/default/keymap.c | 2 +-
.../keymaps/ortho_default/config.h | 25 +++++
.../keymaps/ortho_default/keymap.c | 75 +++++++++++++
.../keymaps/ortho_default/readme.md | 1 +
.../keymaps/ortho_default/rules.mk | 1 +
.../keymaps/ortho_split/config.h | 25 +++++
.../keymaps/ortho_split/keymap.c | 75 +++++++++++++
.../keymaps/ortho_split/readme.md | 1 +
.../keymaps/ortho_split/rules.mk | 1 +
.../program_yoink/keymaps/split_bar/keymap.c | 2 +-
keyboards/program_yoink/program_yoink.h | 27 +++++
12 files changed, 336 insertions(+), 5 deletions(-)
create mode 100644 keyboards/program_yoink/keymaps/ortho_default/config.h
create mode 100644 keyboards/program_yoink/keymaps/ortho_default/keymap.c
create mode 100644 keyboards/program_yoink/keymaps/ortho_default/readme.md
create mode 100644 keyboards/program_yoink/keymaps/ortho_default/rules.mk
create mode 100644 keyboards/program_yoink/keymaps/ortho_split/config.h
create mode 100644 keyboards/program_yoink/keymaps/ortho_split/keymap.c
create mode 100644 keyboards/program_yoink/keymaps/ortho_split/readme.md
create mode 100644 keyboards/program_yoink/keymaps/ortho_split/rules.mk
diff --git a/keyboards/program_yoink/info.json b/keyboards/program_yoink/info.json
index ddce59b659..432e2ab322 100644
--- a/keyboards/program_yoink/info.json
+++ b/keyboards/program_yoink/info.json
@@ -101,7 +101,107 @@
{"x":10.25, "y":3.25},
{"x":11.25, "y":3.25},
{"x":12.25, "y":3.25}]
- }
- }
+ },
+ "LAYOUT_ortho": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12.5, "y":0},
+ {"x":0, "y":1},
+ {"x":1, "y":1},
+ {"x":2, "y":1},
+ {"x":3, "y":1},
+ {"x":4, "y":1},
+ {"x":5, "y":1},
+ {"x":6, "y":1},
+ {"x":7, "y":1},
+ {"x":8, "y":1},
+ {"x":9, "y":1},
+ {"x":10, "y":1},
+ {"x":11, "y":1},
+ {"x":12.5, "y":1},
+ {"x":0, "y":2},
+ {"x":1, "y":2},
+ {"x":2, "y":2},
+ {"x":3, "y":2},
+ {"x":4, "y":2},
+ {"x":5, "y":2},
+ {"x":6, "y":2},
+ {"x":7, "y":2},
+ {"x":8, "y":2},
+ {"x":9, "y":2},
+ {"x":10, "y":2},
+ {"x":12.5, "y":2},
+ {"x":11.25, "y":2.25},
+ {"x":0, "y":3},
+ {"x":1, "y":3},
+ {"x":2, "y":3, "w":7},
+ {"x":9, "y":3},
+ {"x":10.25, "y":3.25},
+ {"x":11.25, "y":3.25},
+ {"x":12.25, "y":3.25}]
+ },
+ "LAYOUT_ortho_split": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12.5, "y":0},
+ {"x":0, "y":1},
+ {"x":1, "y":1},
+ {"x":2, "y":1},
+ {"x":3, "y":1},
+ {"x":4, "y":1},
+ {"x":5, "y":1},
+ {"x":6, "y":1},
+ {"x":7, "y":1},
+ {"x":8, "y":1},
+ {"x":9, "y":1},
+ {"x":10, "y":1},
+ {"x":11, "y":1},
+ {"x":12.5, "y":1},
+ {"x":0, "y":2},
+ {"x":1, "y":2},
+ {"x":2, "y":2},
+ {"x":3, "y":2},
+ {"x":4, "y":2},
+ {"x":5, "y":2},
+ {"x":6, "y":2},
+ {"x":7, "y":2},
+ {"x":8, "y":2},
+ {"x":9, "y":2},
+ {"x":10, "y":2},
+ {"x":12.5, "y":2},
+ {"x":11.25, "y":2.25},
+ {"x":0, "y":3},
+ {"x":1, "y":3},
+ {"x":2, "y":3},
+ {"x":3, "y":3, "w":2.75},
+ {"x":2, "y":3, "w":7},
+ {"x":8, "y":3},
+ {"x":9, "y":3},
+ {"x":10.25, "y":3.25},
+ {"x":11.25, "y":3.25},
+ {"x":12.25, "y":3.25}]
+ }
+ }
}
-
diff --git a/keyboards/program_yoink/keymaps/default/keymap.c b/keyboards/program_yoink/keymaps/default/keymap.c
index 1baeeb7579..5aa0c95e69 100644
--- a/keyboards/program_yoink/keymaps/default/keymap.c
+++ b/keyboards/program_yoink/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_LAYER2] = LAYOUT_default(
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
_______, _______, _______, _______, _______, _______, RGB_M_B, RGB_M_P, RGB_M_K, RGB_M_G, RGB_M_R, RGB_HUI,
_______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, RGB_HUD,
_______, RGB_TOG, XXXXXXX, RESET, _______, _______, _______
diff --git a/keyboards/program_yoink/keymaps/ortho_default/config.h b/keyboards/program_yoink/keymaps/ortho_default/config.h
new file mode 100644
index 0000000000..ea7075aecb
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/ortho_default/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 melonbred
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// place overrides here
+#define TAPPING_TERM 200
+
+#ifdef COMBO_ENABLE
+# define COMBO_COUNT 10
+# define COMBO_TERM 60
+#endif
\ No newline at end of file
diff --git a/keyboards/program_yoink/keymaps/ortho_default/keymap.c b/keyboards/program_yoink/keymaps/ortho_default/keymap.c
new file mode 100644
index 0000000000..6f20f22ddb
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/ortho_default/keymap.c
@@ -0,0 +1,75 @@
+/* Copyright 2020 melonbred
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layers{
+ _BASE,
+ _LAYER1,
+ _LAYER2
+};
+
+// Defines Combos for use in the keymap
+enum combo_events {
+ COMBO_ENT
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_ortho(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_MPLY,
+ CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_PGUP,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_PGDN,
+ MO(_LAYER2), KC_LGUI, LT(_LAYER1, KC_SPC), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [_LAYER1] = LAYOUT_ortho(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______,
+ KC_CAPS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, KC_SCLN, KC_QUOT, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [_LAYER2] = LAYOUT_ortho(
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_K, RGB_M_G, RGB_M_R, RGB_M_SW, _______, RGB_HUI,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_VAD, _______, RGB_HUD,
+ _______, RGB_TOG, XXXXXXX, XXXXXXX, KC_DEL, KC_RALT, KC_RCTL
+ ),
+};
+
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+ if (index == 0) {
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ }
+}
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_ent[] = {KC_DOT, KC_SLSH, COMBO_END};
+
+
+combo_t key_combos[COMBO_COUNT] = {
+ [COMBO_ENT] = COMBO(combo_ent,KC_ENT),
+
+};
+#endif
+
+
+
diff --git a/keyboards/program_yoink/keymaps/ortho_default/readme.md b/keyboards/program_yoink/keymaps/ortho_default/readme.md
new file mode 100644
index 0000000000..bc74170158
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/ortho_default/readme.md
@@ -0,0 +1 @@
+# The default keymap for ortho program_yoink
diff --git a/keyboards/program_yoink/keymaps/ortho_default/rules.mk b/keyboards/program_yoink/keymaps/ortho_default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/ortho_default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/program_yoink/keymaps/ortho_split/config.h b/keyboards/program_yoink/keymaps/ortho_split/config.h
new file mode 100644
index 0000000000..ea7075aecb
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/ortho_split/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 melonbred
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// place overrides here
+#define TAPPING_TERM 200
+
+#ifdef COMBO_ENABLE
+# define COMBO_COUNT 10
+# define COMBO_TERM 60
+#endif
\ No newline at end of file
diff --git a/keyboards/program_yoink/keymaps/ortho_split/keymap.c b/keyboards/program_yoink/keymaps/ortho_split/keymap.c
new file mode 100644
index 0000000000..6217124bf8
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/ortho_split/keymap.c
@@ -0,0 +1,75 @@
+/* Copyright 2020 melonbred
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layers{
+ _BASE,
+ _LAYER1,
+ _LAYER2
+};
+
+// Defines Combos for use in the keymap
+enum combo_events {
+ COMBO_ENT
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_ortho_split(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_MPLY,
+ CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_PGUP,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH, KC_PGDN,
+ KC_LCTL, KC_LALT, MO(_LAYER2), KC_BSPC, LT(_LAYER1, KC_SPC), KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [_LAYER1] = LAYOUT_ortho_split(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______,
+ KC_CAPS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, KC_SCLN, KC_QUOT, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [_LAYER2] = LAYOUT_ortho_split(
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_K, RGB_M_G, RGB_M_R, RGB_M_SW, _______, RGB_HUI,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_VAD, _______, RGB_HUD,
+ _______, RGB_TOG, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL, KC_RALT, KC_RCTL
+ ),
+};
+
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+ if (index == 0) {
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ }
+}
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_ent[] = {KC_K, KC_L, COMBO_END};
+
+
+combo_t key_combos[COMBO_COUNT] = {
+ [COMBO_ENT] = COMBO(combo_ent,KC_ENT),
+
+};
+#endif
+
+
+
diff --git a/keyboards/program_yoink/keymaps/ortho_split/readme.md b/keyboards/program_yoink/keymaps/ortho_split/readme.md
new file mode 100644
index 0000000000..0a5899ee45
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/ortho_split/readme.md
@@ -0,0 +1 @@
+# The split space bar keymap for ortho program_yoink
diff --git a/keyboards/program_yoink/keymaps/ortho_split/rules.mk b/keyboards/program_yoink/keymaps/ortho_split/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/ortho_split/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/program_yoink/keymaps/split_bar/keymap.c b/keyboards/program_yoink/keymaps/split_bar/keymap.c
index f72c152f7b..89865dad32 100644
--- a/keyboards/program_yoink/keymaps/split_bar/keymap.c
+++ b/keyboards/program_yoink/keymaps/split_bar/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_LAYER2] = LAYOUT_split_bar(
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_K, RGB_M_G, RGB_M_R, RGB_M_SW, RGB_HUI,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_VAD, RGB_HUD,
_______, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL, KC_RALT, KC_RCTL
diff --git a/keyboards/program_yoink/program_yoink.h b/keyboards/program_yoink/program_yoink.h
index 2b64fb306f..5aca12c268 100644
--- a/keyboards/program_yoink/program_yoink.h
+++ b/keyboards/program_yoink/program_yoink.h
@@ -54,4 +54,31 @@
{ K30, K31, K32, K33, XXX, K35, XXX, K37, K38, K39, K3A, XXX, K3C } \
}
+#define LAYOUT_ortho( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+ K30, K31, K35, K39, K3A, K3B, K3C \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
+ { K30, K31, XXX, XXX, XXX, K35, XXX, XXX, XXX, K39, K3A, K3B, K3C } \
+}
+
+#define LAYOUT_ortho_split( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+ K30, K31, K32, K34, K36, K38, K39, K3A, K3B, K3C \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
+ { K30, K31, K32, XXX, K34, XXX, K36, XXX, K38, K39, K3A, K3B, K3C } \
+}
+
+