Merge remote-tracking branch 'origin/master' into develop

14 files changed, 525 insertions, 0 deletions

diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h
new file mode 100644
index 0000000000..d1fc28ef4d
--- /dev/null
+++ b/keyboards/program_yoink/config.h
@@ -0,0 +1,102 @@
+/*
+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
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0xF10B
+#define DEVICE_VER 0x0001
+#define MANUFACTURER melonbred
+#define PRODUCT program_yoink
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D2, D3, B1, B0 }
+#define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, B2, D6, C2, D5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*Encoder Definition*/
+#define ENCODERS_PAD_A { D1 }
+#define ENCODERS_PAD_B { D0 }
+
+/*RGB*/
+#define RGB_DI_PIN D4
+ #ifdef RGB_DI_PIN
+   #define RGBLED_NUM 5
+   #define RGBLIGHT_HUE_STEP 8
+   #define RGBLIGHT_SAT_STEP 8
+   #define RGBLIGHT_VAL_STEP 8
+   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+ /*== all animations enable ==*/
+   //#define RGBLIGHT_ANIMATIONS
+ /*== or choose animations ==*/
+   //#define RGBLIGHT_EFFECT_BREATHING
+   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+   //#define RGBLIGHT_EFFECT_SNAKE
+   #define RGBLIGHT_EFFECT_KNIGHT
+   //#define RGBLIGHT_EFFECT_CHRISTMAS
+   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+   //#define RGBLIGHT_EFFECT_RGB_TEST
+   //#define RGBLIGHT_EFFECT_ALTERNATING
+ /*== customize breathing effect ==*/
+   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+   //#define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+   /*==== use exp() and sin() ====*/
+   //#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+   //#define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+ #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/program_yoink/info.json b/keyboards/program_yoink/info.json
new file mode 100644
index 0000000000..ddce59b659
--- /dev/null
+++ b/keyboards/program_yoink/info.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "program_yoink",
+    "url": "",
+    "maintainer": "melonbred",
+    "width": 13.75,
+    "height": 4.25,
+    "layouts": {
+        "LAYOUT_default": {
+            "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.75, "y":0}, 
+            	{"x":0, "y":1, "w":1.25}, 
+            	{"x":1.25, "y":1}, 
+            	{"x":2.25, "y":1}, 
+            	{"x":3.25, "y":1}, 
+            	{"x":4.25, "y":1}, 
+            	{"x":5.25, "y":1}, 
+            	{"x":6.25, "y":1}, 
+            	{"x":7.25, "y":1}, 
+            	{"x":8.25, "y":1}, 
+            	{"x":9.25, "y":1}, 
+            	{"x":10.25, "y":1, "w":1.75}, 
+            	{"x":12.75, "y":1}, 
+            	{"x":0, "y":2, "w":1.75}, 
+            	{"x":1.75, "y":2}, 
+            	{"x":2.75, "y":2}, 
+            	{"x":3.75, "y":2}, 
+            	{"x":4.75, "y":2}, 
+            	{"x":5.75, "y":2}, 
+            	{"x":6.75, "y":2}, 
+            	{"x":7.75, "y":2}, 
+            	{"x":8.75, "y":2}, 
+            	{"x":9.75, "y":2, "w":1.25}, 
+            	{"x":12.75, "y":2}, 
+            	{"x":11.25, "y":2.25}, 
+            	{"x":0, "y":3, "w":1.25},
+            	{"x":1.25, "y":3, "w":1.25}, 
+            	{"x":2.5, "y":3, "w":6.25}, 
+            	{"x":8.75, "y":3, "w":1.25}, 
+            	{"x":10.25, "y":3.25}, 
+            	{"x":11.25, "y":3.25}, 
+            	{"x":12.25, "y":3.25}]
+        },
+        "LAYOUT_split_bar": {
+            "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.75, "y":0}, 
+            	{"x":0, "y":1, "w":1.25}, 
+            	{"x":1.25, "y":1}, 
+            	{"x":2.25, "y":1}, 
+            	{"x":3.25, "y":1}, 
+            	{"x":4.25, "y":1}, 
+            	{"x":5.25, "y":1}, 
+            	{"x":6.25, "y":1}, 
+            	{"x":7.25, "y":1}, 
+            	{"x":8.25, "y":1}, 
+            	{"x":9.25, "y":1}, 
+            	{"x":10.25, "y":1, "w":1.75}, 
+            	{"x":12.75, "y":1}, 
+            	{"x":0, "y":2, "w":1.75}, 
+            	{"x":1.75, "y":2}, 
+            	{"x":2.75, "y":2}, 
+            	{"x":3.75, "y":2}, 
+            	{"x":4.75, "y":2}, 
+            	{"x":5.75, "y":2}, 
+            	{"x":6.75, "y":2}, 
+            	{"x":7.75, "y":2}, 
+            	{"x":8.75, "y":2}, 
+            	{"x":9.75, "y":2, "w":1.25}, 
+            	{"x":12.75, "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":5.75, "y":3, "w":2.25}, 
+            	{"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/config.h b/keyboards/program_yoink/keymaps/default/config.h
new file mode 100644
index 0000000000..c4b4470e96
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/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 200
+#endif 
\ No newline at end of file
diff --git a/keyboards/program_yoink/keymaps/default/keymap.c b/keyboards/program_yoink/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1baeeb7579
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/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 layer_names {
+    _BASE,
+    _LAYER1,
+    _LAYER2
+};
+
+// Defines Combos for use in the keymap
+enum combo_events {
+  COMBO_SLSH,
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_default(
+        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_MUTE,
+        KC_TAB,    KC_A, KC_S, KC_D, KC_F, KC_G,  KC_H, KC_J,    KC_K,    KC_L,    KC_ENT,     RGB_VAI,
+        KC_LSFT,    KC_Z,    KC_X, KC_C, KC_V, KC_B,  KC_N, KC_M,    KC_COMM, MT(MOD_RSFT, KC_DOT), KC_UP,  RGB_VAD,
+        KC_LCTL, MT(MOD_LALT, KC_CAPS),                  LT(_LAYER2, KC_SPC),               LT(_LAYER1, KC_DEL), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_default(
+        KC_MINS,  KC_1,    KC_2,   KC_3,      KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,  _______,
+        KC_EQL, _______, _______, _______,   _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT,          _______,
+        _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        KC_LGUI, KC_LALT,                             _______,                   _______, _______, _______,          _______         
+    ), 
+
+    [_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,  _______,
+        _______, _______, _______, _______, _______, _______, RGB_M_B, RGB_M_P, RGB_M_K, RGB_M_G, RGB_M_R,          RGB_HUI,
+        _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______,          RGB_HUD,
+        _______, RGB_TOG,                            XXXXXXX,                   RESET, _______,  _______,          _______
+   ),
+};
+
+
+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_slsh[] = {MT(MOD_RSFT, KC_DOT), KC_COMM, COMBO_END};
+
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_SLSH] = COMBO(combo_slsh,KC_SLSH),
+
+};
+#endif
+        
diff --git a/keyboards/program_yoink/keymaps/default/readme.md b/keyboards/program_yoink/keymaps/default/readme.md
new file mode 100644
index 0000000000..4e0a314f40
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for program_yoink
diff --git a/keyboards/program_yoink/keymaps/default/rules.mk b/keyboards/program_yoink/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/program_yoink/keymaps/split_bar/config.h b/keyboards/program_yoink/keymaps/split_bar/config.h
new file mode 100644
index 0000000000..842b3b8011
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/split_bar/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 200
+#endif 
diff --git a/keyboards/program_yoink/keymaps/split_bar/keymap.c b/keyboards/program_yoink/keymaps/split_bar/keymap.c
new file mode 100644
index 0000000000..f72c152f7b
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/split_bar/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 layer_names {
+    _BASE,
+    _LAYER1,
+    _LAYER2
+};
+
+// Defines Combos for use in the keymap
+enum combo_events {
+  COMBO_SLSH,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_split_bar(
+        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_ENT,           KC_PGUP,
+        KC_LSFT,       KC_Z,                   KC_X,    KC_C,                KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, MT(MOD_RSFT, KC_DOT), KC_UP,            KC_PGDN,
+        MO(_LAYER2),   KC_LGUI,                KC_LALT, LT(_LAYER1, KC_SPC),         KC_SPC,          KC_RALT, KC_RCTL, KC_LEFT,              KC_DOWN,          KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_split_bar(
+        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_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,  _______,
+        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
+    ),
+};
+
+
+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_slsh[] = {MT(MOD_RSFT, KC_DOT), KC_COMM, COMBO_END};
+
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_SLSH] = COMBO(combo_slsh,KC_SLSH),
+
+};
+#endif
+        
+
+    
diff --git a/keyboards/program_yoink/keymaps/split_bar/readme.md b/keyboards/program_yoink/keymaps/split_bar/readme.md
new file mode 100644
index 0000000000..4e0a314f40
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/split_bar/readme.md
@@ -0,0 +1 @@
+# The default keymap for program_yoink
diff --git a/keyboards/program_yoink/keymaps/split_bar/rules.mk b/keyboards/program_yoink/keymaps/split_bar/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/program_yoink/keymaps/split_bar/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/program_yoink/program_yoink.c b/keyboards/program_yoink/program_yoink.c
new file mode 100644
index 0000000000..e549c98e93
--- /dev/null
+++ b/keyboards/program_yoink/program_yoink.c
@@ -0,0 +1,17 @@
+/* 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 "program_yoink.h"
diff --git a/keyboards/program_yoink/program_yoink.h b/keyboards/program_yoink/program_yoink.h
new file mode 100644
index 0000000000..2b64fb306f
--- /dev/null
+++ b/keyboards/program_yoink/program_yoink.h
@@ -0,0 +1,57 @@
+/* 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
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define XXX KC_NO
+
+#define LAYOUT_default( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,      K1C, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,      K2C, \
+    K30, K31,           K34,                K38, K39, K3A,      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, XXX, K1C }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C }, \
+    { K30, K31, XXX, XXX, K34, XXX, XXX, XXX, K38, K39, K3A, XXX, K3C } \
+}
+
+#define LAYOUT_split_bar( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,      K1C, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,      K2C, \
+    K30, K31, K32, K33,      K35,      K37, K38, K39, K3A,      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, XXX, K1C }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C }, \
+    { K30, K31, K32, K33, XXX, K35, XXX, K37, K38, K39, K3A, XXX, K3C } \
+}
+
+
diff --git a/keyboards/program_yoink/readme.md b/keyboards/program_yoink/readme.md
new file mode 100644
index 0000000000..6fa3bf4f7d
--- /dev/null
+++ b/keyboards/program_yoink/readme.md
@@ -0,0 +1,15 @@
+# program_yoink
+
+![program_yoink](https://i.imgur.com/2bBLKJrl.jpeg)
+
+Program Yoink is a 12u main cluster board accompanied by a macro column with optional encoder support and arrow keys.
+
+* Keyboard Maintainer: [melonbred](https://github.com/yourusername)
+* Hardware Supported: The PCBs, controllers supported
+* Hardware Availability: Links to where you can find this hardware
+
+Make example for this keyboard (after setting up your build environment):
+
+    make program_yoink:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/program_yoink/rules.mk b/keyboards/program_yoink/rules.mk
new file mode 100644
index 0000000000..4384a0f014
--- /dev/null
+++ b/keyboards/program_yoink/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes		# Enable rotary encoder