From 99d5cc0eb7108dbea51d000c085d72c94c3e271f Mon Sep 17 00:00:00 2001 From: Matthew Blau Date: Mon, 2 Oct 2023 20:00:20 -0400 Subject: [PATCH 1/3] add support for drop ctrl v1 --- keyboards/massdrop/ctrl/keymaps/vial/config.h | 22 ++ keyboards/massdrop/ctrl/keymaps/vial/keymap.c | 141 +++++++++ keyboards/massdrop/ctrl/keymaps/vial/rules.mk | 3 + .../massdrop/ctrl/keymaps/vial/vial.json | 284 ++++++++++++++++++ 4 files changed, 450 insertions(+) create mode 100644 keyboards/massdrop/ctrl/keymaps/vial/config.h create mode 100644 keyboards/massdrop/ctrl/keymaps/vial/keymap.c create mode 100644 keyboards/massdrop/ctrl/keymaps/vial/rules.mk create mode 100644 keyboards/massdrop/ctrl/keymaps/vial/vial.json diff --git a/keyboards/massdrop/ctrl/keymaps/vial/config.h b/keyboards/massdrop/ctrl/keymaps/vial/config.h new file mode 100644 index 00000000000..ff9bb3f99ef --- /dev/null +++ b/keyboards/massdrop/ctrl/keymaps/vial/config.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Matthew Blau (mrb1105@gmail.com) + * + * 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 + +#define VIAL_KEYBOARD_UID {0xE8, 0xB3, 0x53, 0x4E, 0xEF, 0xFF, 0xD7, 0xC4} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } +#define VIAL_UNLOCK_COMBO_COLS { 2, 13 } +#define VIAL_COMBO_ENTRIES 4 diff --git a/keyboards/massdrop/ctrl/keymaps/vial/keymap.c b/keyboards/massdrop/ctrl/keymaps/vial/keymap.c new file mode 100644 index 00000000000..377bb838462 --- /dev/null +++ b/keyboards/massdrop/ctrl/keymaps/vial/keymap.c @@ -0,0 +1,141 @@ +/* Made by InonL (@InonL), June 2022 + Modified for vial by Matthew Blau (rmblau) + * Based on the default keymap, added two blank layers for VIA + * + * 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 ctrl_keycodes { + U_T_AUTO = QK_KB_0, //USB Extra Port Toggle Auto Detect / Always Active + U_T_AGCR, //USB Toggle Automatic GCR control + DBG_TOG, //DEBUG Toggle On / Off + DBG_MTRX, //DEBUG Toggle Matrix Prints + DBG_KBD, //DEBUG Toggle Keyboard Prints + DBG_MOU, //DEBUG Toggle Mouse Prints + MD_BOOT, //Restart into bootloader after hold timeout +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_VOLU, + _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, + _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; + +#define MODS_SHIFT (get_mods() & MOD_MASK_SHIFT) +#define MODS_CTRL (get_mods() & MOD_MASK_CTRL) +#define MODS_ALT (get_mods() & MOD_MASK_ALT) + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + static uint32_t key_timer; + + switch (keycode) { + case U_T_AUTO: + if (record->event.pressed && MODS_SHIFT && MODS_CTRL) { + TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode"); + } + return false; + case U_T_AGCR: + if (record->event.pressed && MODS_SHIFT && MODS_CTRL) { + TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode"); + } + return false; + case DBG_TOG: + if (record->event.pressed) { + TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode"); + } + return false; + case DBG_MTRX: + if (record->event.pressed) { + TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix"); + } + return false; + case DBG_KBD: + if (record->event.pressed) { + TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard"); + } + return false; + case DBG_MOU: + if (record->event.pressed) { + TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse"); + } + return false; + case MD_BOOT: + if (record->event.pressed) { + key_timer = timer_read32(); + } else { + if (timer_elapsed32(key_timer) >= 500) { + reset_keyboard(); + } + } + return false; + case RGB_TOG: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR); + rgb_matrix_set_color_all(0, 0, 0); + } + break; + case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): { + rgb_matrix_set_flags(LED_FLAG_UNDERGLOW); + rgb_matrix_set_color_all(0, 0, 0); + } + break; + case LED_FLAG_UNDERGLOW: { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_disable_noeeprom(); + } + break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + rgb_matrix_enable_noeeprom(); + } + break; + } + } + return false; + default: + return true; //Process all other keycodes normally + } +} diff --git a/keyboards/massdrop/ctrl/keymaps/vial/rules.mk b/keyboards/massdrop/ctrl/keymaps/vial/rules.mk new file mode 100644 index 00000000000..4f1f3033cf2 --- /dev/null +++ b/keyboards/massdrop/ctrl/keymaps/vial/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +TAP_DANCE_ENABLE = no diff --git a/keyboards/massdrop/ctrl/keymaps/vial/vial.json b/keyboards/massdrop/ctrl/keymaps/vial/vial.json new file mode 100644 index 00000000000..c412d32e5c1 --- /dev/null +++ b/keyboards/massdrop/ctrl/keymaps/vial/vial.json @@ -0,0 +1,284 @@ +{ + "name": "Drop CTRL", + "vendorId": "0x04D8", + "productId": "0xEED2", + "lighting": { + "extends": "qmk_rgblight", + "underglowEffects": [ + ["All Off", 0], + ["Solid Color", 1], + ["Solid Alphas & Mods", 1], + ["Gradient 1", 1], + ["Gradient 2", 1], + ["Breathing", 1], + ["Band 1", 1], + ["Band 2", 1], + ["Band Pinwheel 1", 1], + ["Band Pinwheel 2", 1], + ["Band Spiral 1", 1], + ["Band Spiral 2", 1], + ["Rainbow All", 1], + ["Rainbow Left/Right", 1], + ["Rainbow Up/Down", 1], + ["Rainbow Chevron", 1], + ["Rainbow Out/In", 1], + ["Rainbow Dual Out/In", 1], + ["Rainbow Pinwheel", 1], + ["Rainbow Spiral", 1], + ["Rainbow Dual Beacon", 1], + ["Rainbow Beacon", 1], + ["Rainbow Pinwheels", 1], + ["Raindrops", 1], + ["Raindrops Jellybean", 1], + ["Hue Breathing", 1], + ["Hue Pendulum", 1], + ["Hue Wave", 1], + ["Pixel Rain", 1], + ["Pixel Flow", 1], + ["Pixel Fractal", 1], + ["Typing Heatmap", 1], + ["Digital Rain", 1], + ["Reactive Simple", 1], + ["Reactive", 1], + ["Reactive Wide", 1], + ["Reactive Multiwide", 1], + ["Reactive Cross", 1], + ["Reactive Multicross", 1], + ["Reactive Nexus", 1], + ["Reactive Multinexus", 1], + ["Reactive Rainbow Splash", 1], + ["Reactive Rainbow Multisplash", 1], + ["Reactive Splash", 1], + ["Reactive Multisplash", 1] + ], + "supportedLightingValues": [7, 8, 128, 129, 130, 131] + }, + "customKeycodes": [ + { + "name": "USB Extra Port Detect", + "title": "USB Extra Port Toggle Auto Detect / Always Active", + "shortName": "U_T_AUTO" + }, + { + "name": "USB GCR Control", + "title": "USB Toggle Automatic GCR control", + "shortName": "U_T_AGCR" + }, + { + "name": "Debug Toggle", + "title": "Toggle Debug Mode", + "shortName": "DBG_TOG" + }, + { + "name": "Debug Matrix", + "title": "Toggle Matrix Debug Prints", + "shortName": "DBG_MTRX" + }, + { + "name": "Debug Keyboard", + "title": "Toggle Keyboard Debug Prints", + "shortName": "DBG_KBD" + }, + { + "name": "Debug Mouse", + "title": "Toggle Mouse Debug Prints", + "shortName": "DBG_MOU" + }, + { + "name": "Bootloader", + "title": "Restart into bootloader after holding for 3 seconds", + "shortName": "MD_BOOT" + } + ], + "matrix": {"rows": 11, "cols": 8}, + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.5 + }, + "0,5", + "0,6", + "0,7", + "6,0", + { + "x": 0.5 + }, + "6,1", + "6,2", + "6,3", + "6,4", + { + "x": 0.5 + }, + "6,5", + "6,6", + "6,7" + ], + [ + { + "y": 0.5 + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "7,0", + "7,1", + "7,2", + "7,3", + "7,4", + { + "w": 2 + }, + "7,5", + { + "x": 0.5 + }, + "7,6", + "7,7", + "9,7" + ], + [ + { + "w": 1.5 + }, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "8,0", + "8,1", + "8,2", + "8,3", + "8,4", + { + "w": 1.5 + }, + "8,5", + { + "x": 0.5 + }, + "8,6", + "8,7", + "9,6" + ], + [ + { + "w": 1.75 + }, + "3,0", + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "9,0", + "9,1", + "9,2", + "9,3", + { + "c": "#777777", + "w": 2.25 + }, + "9,4" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "10,0", + "10,1", + "10,2", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "10,3", + { + "x": 1.5, + "c": "#777777" + }, + "9,5" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0", + { + "w": 1.25 + }, + "5,1", + { + "w": 1.25 + }, + "5,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,3", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,4", + { + "w": 1.25 + }, + "5,5", + { + "w": 1.25 + }, + "5,6", + { + "w": 1.25 + }, + "5,7", + { + "x": 0.5, + "c": "#777777" + }, + "10,4", + "10,5", + "10,6" + ] + ] + } +} From b379892325ca85d62bd1d3c5848655469b608de3 Mon Sep 17 00:00:00 2001 From: Matthew Blau Date: Mon, 2 Oct 2023 20:52:11 -0400 Subject: [PATCH 2/3] fix for unlock keyboard combo and add support for vialrgb --- keyboards/massdrop/ctrl/keymaps/vial/config.h | 5 +- keyboards/massdrop/ctrl/keymaps/vial/rules.mk | 1 + .../massdrop/ctrl/keymaps/vial/vial.json | 52 +------------------ 3 files changed, 6 insertions(+), 52 deletions(-) diff --git a/keyboards/massdrop/ctrl/keymaps/vial/config.h b/keyboards/massdrop/ctrl/keymaps/vial/config.h index ff9bb3f99ef..be6af4ce61b 100644 --- a/keyboards/massdrop/ctrl/keymaps/vial/config.h +++ b/keyboards/massdrop/ctrl/keymaps/vial/config.h @@ -15,8 +15,11 @@ */ #pragma once +#define USB_LED_INDICATOR_ENABLE +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES #define VIAL_KEYBOARD_UID {0xE8, 0xB3, 0x53, 0x4E, 0xEF, 0xFF, 0xD7, 0xC4} #define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } -#define VIAL_UNLOCK_COMBO_COLS { 2, 13 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 2 } #define VIAL_COMBO_ENTRIES 4 diff --git a/keyboards/massdrop/ctrl/keymaps/vial/rules.mk b/keyboards/massdrop/ctrl/keymaps/vial/rules.mk index 4f1f3033cf2..4d0924ed448 100644 --- a/keyboards/massdrop/ctrl/keymaps/vial/rules.mk +++ b/keyboards/massdrop/ctrl/keymaps/vial/rules.mk @@ -1,3 +1,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes +VIALRGB_ENABLE = yes TAP_DANCE_ENABLE = no diff --git a/keyboards/massdrop/ctrl/keymaps/vial/vial.json b/keyboards/massdrop/ctrl/keymaps/vial/vial.json index c412d32e5c1..9b11cf21845 100644 --- a/keyboards/massdrop/ctrl/keymaps/vial/vial.json +++ b/keyboards/massdrop/ctrl/keymaps/vial/vial.json @@ -2,57 +2,7 @@ "name": "Drop CTRL", "vendorId": "0x04D8", "productId": "0xEED2", - "lighting": { - "extends": "qmk_rgblight", - "underglowEffects": [ - ["All Off", 0], - ["Solid Color", 1], - ["Solid Alphas & Mods", 1], - ["Gradient 1", 1], - ["Gradient 2", 1], - ["Breathing", 1], - ["Band 1", 1], - ["Band 2", 1], - ["Band Pinwheel 1", 1], - ["Band Pinwheel 2", 1], - ["Band Spiral 1", 1], - ["Band Spiral 2", 1], - ["Rainbow All", 1], - ["Rainbow Left/Right", 1], - ["Rainbow Up/Down", 1], - ["Rainbow Chevron", 1], - ["Rainbow Out/In", 1], - ["Rainbow Dual Out/In", 1], - ["Rainbow Pinwheel", 1], - ["Rainbow Spiral", 1], - ["Rainbow Dual Beacon", 1], - ["Rainbow Beacon", 1], - ["Rainbow Pinwheels", 1], - ["Raindrops", 1], - ["Raindrops Jellybean", 1], - ["Hue Breathing", 1], - ["Hue Pendulum", 1], - ["Hue Wave", 1], - ["Pixel Rain", 1], - ["Pixel Flow", 1], - ["Pixel Fractal", 1], - ["Typing Heatmap", 1], - ["Digital Rain", 1], - ["Reactive Simple", 1], - ["Reactive", 1], - ["Reactive Wide", 1], - ["Reactive Multiwide", 1], - ["Reactive Cross", 1], - ["Reactive Multicross", 1], - ["Reactive Nexus", 1], - ["Reactive Multinexus", 1], - ["Reactive Rainbow Splash", 1], - ["Reactive Rainbow Multisplash", 1], - ["Reactive Splash", 1], - ["Reactive Multisplash", 1] - ], - "supportedLightingValues": [7, 8, 128, 129, 130, 131] - }, + "lighting": "vialrgb", "customKeycodes": [ { "name": "USB Extra Port Detect", From ef5c2cd314f1810a427f4d6f9828508ef1935c36 Mon Sep 17 00:00:00 2001 From: Matthew Blau Date: Mon, 2 Oct 2023 23:29:49 -0400 Subject: [PATCH 3/3] remove empty layers --- keyboards/massdrop/ctrl/keymaps/vial/keymap.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/keyboards/massdrop/ctrl/keymaps/vial/keymap.c b/keyboards/massdrop/ctrl/keymaps/vial/keymap.c index 377bb838462..06a2e5da7bc 100644 --- a/keyboards/massdrop/ctrl/keymaps/vial/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/vial/keymap.c @@ -44,22 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), }; #define MODS_SHIFT (get_mods() & MOD_MASK_SHIFT)