From 3a7573436ae6ab20973389a4051a8785399539f2 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 22 Jan 2021 18:02:40 -0800 Subject: Program Yoink! refactor (#11636) * split config.h for each variant * split rules.mk for each variant * split source and header files for each variant * move keymaps to the appropriate variant * update keyboard readme * update keymap readmes * differentiate Staggered and Ortho USB Device Strings * clean up formatting in info.json * split info.json files for each variant * break up the info.json for readability * correct key positioning and board dimensions * correct key object sequences * add weak encoder function to keyboard level Allows Configurator-compiled firmware to have encoder functionality. * add variant-specific readme files and bootloader instructions --- .../program_yoink/keymaps/ortho_split/config.h | 25 -------- .../program_yoink/keymaps/ortho_split/keymap.c | 75 ---------------------- .../program_yoink/keymaps/ortho_split/readme.md | 1 - .../program_yoink/keymaps/ortho_split/rules.mk | 1 - 4 files changed, 102 deletions(-) delete mode 100644 keyboards/program_yoink/keymaps/ortho_split/config.h delete mode 100644 keyboards/program_yoink/keymaps/ortho_split/keymap.c delete mode 100644 keyboards/program_yoink/keymaps/ortho_split/readme.md delete mode 100644 keyboards/program_yoink/keymaps/ortho_split/rules.mk (limited to 'keyboards/program_yoink/keymaps/ortho_split') diff --git a/keyboards/program_yoink/keymaps/ortho_split/config.h b/keyboards/program_yoink/keymaps/ortho_split/config.h deleted file mode 100644 index ea7075aecb..0000000000 --- a/keyboards/program_yoink/keymaps/ortho_split/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* 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 . - */ - -#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 deleted file mode 100644 index 6217124bf8..0000000000 --- a/keyboards/program_yoink/keymaps/ortho_split/keymap.c +++ /dev/null @@ -1,75 +0,0 @@ -/* 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 . - */ -#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 deleted file mode 100644 index 0a5899ee45..0000000000 --- a/keyboards/program_yoink/keymaps/ortho_split/readme.md +++ /dev/null @@ -1 +0,0 @@ -# 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 deleted file mode 100644 index ab1e438182..0000000000 --- a/keyboards/program_yoink/keymaps/ortho_split/rules.mk +++ /dev/null @@ -1 +0,0 @@ -COMBO_ENABLE = yes -- cgit v1.2.3