From b8ff6e5deacf8b18ff07d7c981e5abd091e371f9 Mon Sep 17 00:00:00 2001 From: Dani <58542682+DPoplin@users.noreply.github.com> Date: Sun, 30 Apr 2023 20:35:59 -0500 Subject: [PATCH] Add support for Keebio DSP40 (#443) * add reviung53 vial files * add keebio/dsp40 * Revert "add reviung53 vial files" This reverts commit 074be536deda760843efda31f0c5ee9dbbb5a5e7. * prettify * Update keyboards/keebio/dsp40/rev1/rules.mk Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/keebio/dsp40/keymaps/vial/vial.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * add vial encoder support * fix formatting * remove via lines in json * implement changes from review * Revert changes to dsp40.c * Revert changes to rev1.c * Remove extra spaces --------- Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/keebio/dsp40/keymaps/vial/config.h | 5 + keyboards/keebio/dsp40/keymaps/vial/keymap.c | 75 ++++++ keyboards/keebio/dsp40/keymaps/vial/rules.mk | 7 + keyboards/keebio/dsp40/keymaps/vial/vial.json | 255 ++++++++++++++++++ 4 files changed, 342 insertions(+) create mode 100644 keyboards/keebio/dsp40/keymaps/vial/config.h create mode 100755 keyboards/keebio/dsp40/keymaps/vial/keymap.c create mode 100644 keyboards/keebio/dsp40/keymaps/vial/rules.mk create mode 100644 keyboards/keebio/dsp40/keymaps/vial/vial.json diff --git a/keyboards/keebio/dsp40/keymaps/vial/config.h b/keyboards/keebio/dsp40/keymaps/vial/config.h new file mode 100644 index 0000000000..bc0a528a19 --- /dev/null +++ b/keyboards/keebio/dsp40/keymaps/vial/config.h @@ -0,0 +1,5 @@ +#pragma once + +#define VIAL_KEYBOARD_UID {0xCE, 0xD3, 0x93, 0xC2, 0x74, 0x75, 0xEA, 0xE7} +#define VIAL_UNLOCK_COMBO_ROWS { 0 , 2 } +#define VIAL_UNLOCK_COMBO_COLS { 0 , 11 } diff --git a/keyboards/keebio/dsp40/keymaps/vial/keymap.c b/keyboards/keebio/dsp40/keymaps/vial/keymap.c new file mode 100755 index 0000000000..2812bf2330 --- /dev/null +++ b/keyboards/keebio/dsp40/keymaps/vial/keymap.c @@ -0,0 +1,75 @@ +/* Copyright 2021 Danny Nguyen + +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 + +enum via_layers { + _MAIN, + _FN1, + _FN2, + _FN3, +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }, + [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, + [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, + [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) }, +}; +#endif + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Default Layer + * ,-----------------------------------------------------------. + * | Esc| Q | W | E | R | T | Y | U | I | O | P | BS | + * |-----------------------------------------------------------| + * | Tab | A | S | D | F | G | H | J | K | L | Ent | + * |-----------------------------------------------------------| + * | LSft | Z | X | C | V | B | N | M | , | . | /? | + * |-----------------------------------------------------------| + * | LCtl | LGui| LAlt| spc fn1 | spc fn2 |fn3|RAlt|RCtl | + * `-----------------------------------------------------------' + */ + [_MAIN] = LAYOUT_ortho_4x12( + 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_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, LT(_FN1, KC_SPC), KC_SPC, KC_SPC, LT(_FN2, KC_SPC), MO(_FN3), LT(_FN3, KC_LGUI), KC_RALT, KC_RCTL + ), + + [_FN1] = LAYOUT_ortho_4x12( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),BL_TOGG,BL_INC, BL_DEC, + _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), + + [_FN2] = LAYOUT_ortho_4x12( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [_FN3] = LAYOUT_ortho_4x12( + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/keebio/dsp40/keymaps/vial/rules.mk b/keyboards/keebio/dsp40/keymaps/vial/rules.mk new file mode 100644 index 0000000000..ab00f5cb34 --- /dev/null +++ b/keyboards/keebio/dsp40/keymaps/vial/rules.mk @@ -0,0 +1,7 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +LTO_ENABLE = yes +MOUSEKEY_ENABLE = yes +CONSOLE_ENABLE = yes +COMMAND_ENABLE = no +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keebio/dsp40/keymaps/vial/vial.json b/keyboards/keebio/dsp40/keymaps/vial/vial.json new file mode 100644 index 0000000000..5c334ba592 --- /dev/null +++ b/keyboards/keebio/dsp40/keymaps/vial/vial.json @@ -0,0 +1,255 @@ +{ + "name": "DSP40 Rev. 1", + "vendorId": "0xCB10", + "productId": "0x144C", + "lighting": "qmk_backlight", + "matrix": { + "rows": 4, + "cols": 12 + }, + "layouts": { + "labels": [ + [ + "Row 2", + "Staggered", + "Ortho" + ], + [ + "Row 3", + "Staggered 1.25-1", + "Staggered 1-1.25", + "Ortho" + ], + [ + "Row 4", + "Staggered 1.25 Mods", + "Staggered 1.5 Mods", + "Ortho" + ] + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0\n\n\n\n\n\n\n\n\ne", + "0,1\n\n\n\n\n\n\n\n\ne", + {"x":0.5},"0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + { + "c": "#aaaaaa" + }, + "0,11" + ], + [ + {"x":2.5}, + { + "w": 1.25 + }, + "1,0\n\n\n0,0", + { + "c": "#cccccc" + }, + "1,1\n\n\n0,0", + "1,2\n\n\n0,0", + "1,3\n\n\n0,0", + "1,4\n\n\n0,0", + "1,5\n\n\n0,0", + "1,6\n\n\n0,0", + "1,7\n\n\n0,0", + "1,8\n\n\n0,0", + "1,9\n\n\n0,0", + { + "c": "#777777", + "w": 1.75 + }, + "1,11\n\n\n0,0", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "1,0\n\n\n0,1", + { + "c": "#cccccc" + }, + "1,1\n\n\n0,1", + "1,2\n\n\n0,1", + "1,3\n\n\n0,1", + "1,4\n\n\n0,1", + "1,5\n\n\n0,1", + "1,6\n\n\n0,1", + "1,7\n\n\n0,1", + "1,8\n\n\n0,1", + "1,9\n\n\n0,1", + "1,10\n\n\n0,1", + { + "c": "#aaaaaa" + }, + "1,11\n\n\n0,1" + ], + [ + {"x":2.5}, + { + "w": 1.75 + }, + "2,1\n\n\n1,0", + { + "c": "#cccccc" + }, + "2,2\n\n\n1,0", + "2,3\n\n\n1,0", + "2,4\n\n\n1,0", + "2,5\n\n\n1,0", + "2,6\n\n\n1,0", + "2,7\n\n\n1,0", + "2,8\n.\n\n1,0", + "2,9\n\n\n1,0", + { + "w": 1.25 + }, + "2,10\n\n\n1,0", + { + "c": "#aaaaaa" + }, + "2,11\n\n\n1,0", + { + "x": 0.5, + "w": 1.75 + }, + "2,1\n\n\n1,1", + { + "c": "#cccccc" + }, + "2,2\n\n\n1,1", + "2,3\n\n\n1,1", + "2,4\n\n\n1,1", + "2,5\n\n\n1,1", + "2,6\n\n\n1,1", + "2,7\n\n\n1,1", + "2,8\n.\n\n1,1", + "2,9\n\n\n1,1", + "2,10\n\n\n1,1", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "2,11\n\n\n1,1" + ], + [ + {"x":2.5}, + { + "w": 1.25 + }, + "3,0\n\n\n2,0", + "3,1\n\n\n2,0", + { + "w": 1.25 + }, + "3,2\n\n\n2,0", + { + "c": "#cccccc", + "w": 2.25 + }, + "3,4\n\n\n2,0", + { + "w": 2.75 + }, + "3,7\n\n\n2,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,9\n\n\n2,0", + "3,10\n\n\n2,0", + { + "w": 1.25 + }, + "3,11\n\n\n2,0", + { + "x": 0.5 + }, + "2,0\n\n\n1,2", + { + "c": "#cccccc" + }, + "2,1\n\n\n1,2", + "2,2\n\n\n1,2", + "2,3\n\n\n1,2", + "2,4\n\n\n1,2", + "2,5\n\n\n1,2", + "2,6\n\n\n1,2", + "2,7\n\n\n1,2", + "2,8\n\n\n1,2", + "2,9\n\n\n1,2", + "2,10\n\n\n1,2", + { + "c": "#777777" + }, + "2,11\n\n\n1,2" + ], + [ + { + "y": 0.25, + "c": "#aaaaaa", + "w": 1.5 + }, + "3,0\n\n\n2,1", + "3,1\n\n\n2,1", + { + "w": 1.5 + }, + "3,2\n\n\n2,1", + { + "c": "#cccccc", + "w": 2.25 + }, + "3,4\n\n\n2,1", + { + "w": 2.75 + }, + "3,7\n\n\n2,1", + { + "c": "#aaaaaa" + }, + "3,9\n\n\n2,1", + "3,10\n\n\n2,1", + "3,11\n\n\n2,1" + ], + [ + { + "y": 0.25 + }, + "3,0\n\n\n2,2", + "3,1\n\n\n2,2", + "3,2\n\n\n2,2", + "3,3\n\n\n2,2", + "3,4\n\n\n2,2", + { + "c": "#cccccc" + }, + "3,5\n\n\n2,2", + "3,6\n\n\n2,2", + { + "c": "#aaaaaa" + }, + "3,7\n\n\n2,2", + "3,8\n\n\n2,2", + "3,9\n\n\n2,2", + "3,10\n\n\n2,2", + "3,11\n\n\n2,2" + ] + ] + } + }