From 1b7c3ac0170e87d60f1ddee7ed875cbd84cc7b7c Mon Sep 17 00:00:00 2001 From: TJ Date: Thu, 26 Aug 2021 22:51:49 -0500 Subject: [PATCH] Adalyn (#45) * Initial Vial support for Adalyn * added security --- keyboards/adalyn/adalyn.c | 1 + keyboards/adalyn/adalyn.h | 18 +++++++ keyboards/adalyn/config.h | 39 +++++++++++++++ keyboards/adalyn/info.json | 12 +++++ keyboards/adalyn/keymaps/default/config.h | 6 +++ keyboards/adalyn/keymaps/default/keymap.c | 57 ++++++++++++++++++++++ keyboards/adalyn/keymaps/default/readme.md | 1 + keyboards/adalyn/keymaps/default/rules.mk | 1 + keyboards/adalyn/keymaps/vial/config.h | 6 +++ keyboards/adalyn/keymaps/vial/keymap.c | 50 +++++++++++++++++++ keyboards/adalyn/keymaps/vial/rules.mk | 3 ++ keyboards/adalyn/keymaps/vial/vial.json | 15 ++++++ keyboards/adalyn/readme.md | 3 ++ keyboards/adalyn/rules.mk | 23 +++++++++ 14 files changed, 235 insertions(+) create mode 100644 keyboards/adalyn/adalyn.c create mode 100644 keyboards/adalyn/adalyn.h create mode 100644 keyboards/adalyn/config.h create mode 100644 keyboards/adalyn/info.json create mode 100644 keyboards/adalyn/keymaps/default/config.h create mode 100644 keyboards/adalyn/keymaps/default/keymap.c create mode 100644 keyboards/adalyn/keymaps/default/readme.md create mode 100644 keyboards/adalyn/keymaps/default/rules.mk create mode 100755 keyboards/adalyn/keymaps/vial/config.h create mode 100755 keyboards/adalyn/keymaps/vial/keymap.c create mode 100755 keyboards/adalyn/keymaps/vial/rules.mk create mode 100755 keyboards/adalyn/keymaps/vial/vial.json create mode 100644 keyboards/adalyn/readme.md create mode 100644 keyboards/adalyn/rules.mk diff --git a/keyboards/adalyn/adalyn.c b/keyboards/adalyn/adalyn.c new file mode 100644 index 0000000000..2adc078c93 --- /dev/null +++ b/keyboards/adalyn/adalyn.c @@ -0,0 +1 @@ +#include "adalyn.h" diff --git a/keyboards/adalyn/adalyn.h b/keyboards/adalyn/adalyn.h new file mode 100644 index 0000000000..5f1fd41ff4 --- /dev/null +++ b/keyboards/adalyn/adalyn.h @@ -0,0 +1,18 @@ +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ + K30, K31, K33, K36, K37, K39 \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ + { K30, K31, XXX, K33, XXX, XXX, K36, K37, XXX, K39 } \ +} diff --git a/keyboards/adalyn/config.h b/keyboards/adalyn/config.h new file mode 100644 index 0000000000..0a6ce2109a --- /dev/null +++ b/keyboards/adalyn/config.h @@ -0,0 +1,39 @@ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x7431 +#define PRODUCT_ID 0x6164 +#define DEVICE_VER 0x0001 +#define MANUFACTURER tominabox1 +#define PRODUCT Adalyn + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 10 + +/* + * 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 { C7, D6, B7, B3 } +#define MATRIX_COL_PINS { D7, B4, B5, B6, C6, F7, F6, F5, F4, F1 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* 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 diff --git a/keyboards/adalyn/info.json b/keyboards/adalyn/info.json new file mode 100644 index 0000000000..b27c017f79 --- /dev/null +++ b/keyboards/adalyn/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "adalyn", + "url": "https://github.com/MarvFPV/Adalyn", + "maintainer": "tominabox1", + "width": 10.25, + "height": 4, + "layouts": { + "LAYOUT": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0, "w":1.25}, {"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":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.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":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2, "w":1.5}, {"x":0, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":10.75, "y":3}] + } +} +} diff --git a/keyboards/adalyn/keymaps/default/config.h b/keyboards/adalyn/keymaps/default/config.h new file mode 100644 index 0000000000..12482ff6fe --- /dev/null +++ b/keyboards/adalyn/keymaps/default/config.h @@ -0,0 +1,6 @@ +#pragma once + +#ifdef COMBO_ENABLE +# define COMBO_COUNT 5 +# define COMBO_TERM 200 +#endif diff --git a/keyboards/adalyn/keymaps/default/keymap.c b/keyboards/adalyn/keymaps/default/keymap.c new file mode 100644 index 0000000000..2d78a20b5a --- /dev/null +++ b/keyboards/adalyn/keymaps/default/keymap.c @@ -0,0 +1,57 @@ +#include QMK_KEYBOARD_H + +enum layers{ + _BASE, + _NUM_SYM, + _NAV +}; +enum combo_events { + COMBO_BSPC, + COMBO_NUMBAK, + COMBO_TAB, + COMBO_ESC, + COMBO_DEL, +}; + +#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC) +#define KC_GA LGUI_T(KC_A) +#define KC_AS LALT_T(KC_S) +#define KC_CD LCTL_T(KC_D) +#define KC_SF LSFT_T(KC_F) +#define KC_SJ RSFT_T(KC_J) +#define KC_CK RCTL_T(KC_K) +#define KC_AL RALT_T(KC_L) +#define KC_GSCLN RGUI_T(KC_SCLN) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_GA, KC_AS, KC_CD, KC_SF, KC_G, KC_H, KC_SJ, KC_CK, KC_AL, KC_ENT, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, + KC_LCTL, KC_LALT, KC_BSPC, LT(_NUM_SYM,KC_SPACE), KC_RGUI, KC_RCTL + ), + + [_NUM_SYM] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, + KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#ifdef COMBO_ENABLE +const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END}; +const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END}; +const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; +const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; +const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; + +combo_t key_combos[COMBO_COUNT] = { + [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), + [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), + [COMBO_TAB] = COMBO(combo_tab,KC_TAB), + [COMBO_ESC] = COMBO(combo_esc,KC_ESC), + [COMBO_DEL] = COMBO(combo_del,KC_DEL), + +}; +#endif diff --git a/keyboards/adalyn/keymaps/default/readme.md b/keyboards/adalyn/keymaps/default/readme.md new file mode 100644 index 0000000000..fb85d36e28 --- /dev/null +++ b/keyboards/adalyn/keymaps/default/readme.md @@ -0,0 +1 @@ +# Default QAZ Layout diff --git a/keyboards/adalyn/keymaps/default/rules.mk b/keyboards/adalyn/keymaps/default/rules.mk new file mode 100644 index 0000000000..ab1e438182 --- /dev/null +++ b/keyboards/adalyn/keymaps/default/rules.mk @@ -0,0 +1 @@ +COMBO_ENABLE = yes diff --git a/keyboards/adalyn/keymaps/vial/config.h b/keyboards/adalyn/keymaps/vial/config.h new file mode 100755 index 0000000000..98204c477e --- /dev/null +++ b/keyboards/adalyn/keymaps/vial/config.h @@ -0,0 +1,6 @@ +#pragma once + +#define VIAL_KEYBOARD_UID {0xAC, 0x05, 0xFF, 0x7A, 0x33, 0x6D, 0xBE, 0xD4} + +#define VIAL_UNLOCK_COMBO_ROWS {0,2} +#define VIAL_UNLOCK_COMBO_COLS {0,9} diff --git a/keyboards/adalyn/keymaps/vial/keymap.c b/keyboards/adalyn/keymaps/vial/keymap.c new file mode 100755 index 0000000000..ea6e19f506 --- /dev/null +++ b/keyboards/adalyn/keymaps/vial/keymap.c @@ -0,0 +1,50 @@ +/* +Copyright 2021 + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, + KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, + KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, + KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC + ), + + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) + +}; diff --git a/keyboards/adalyn/keymaps/vial/rules.mk b/keyboards/adalyn/keymaps/vial/rules.mk new file mode 100755 index 0000000000..355299541c --- /dev/null +++ b/keyboards/adalyn/keymaps/vial/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIAL_ENCODERS_ENABLE = no diff --git a/keyboards/adalyn/keymaps/vial/vial.json b/keyboards/adalyn/keymaps/vial/vial.json new file mode 100755 index 0000000000..ab6269562e --- /dev/null +++ b/keyboards/adalyn/keymaps/vial/vial.json @@ -0,0 +1,15 @@ + +{ + "name": "Adalyn", + "vendorId": "0x7431", + "productId": "0x6164", + "lighting": "none", + "matrix": { + "rows": 4, + "cols": 10 + }, + "layouts": { + "labels": [], + "keymap": [[{"rowIndex":0,"x":0,"y":0,"r":0,"rx":0,"ry":0,"w":1,"h":1,"x2":0,"y2":0,"w2":0,"h2":0},"0,0","0,1","0,2","0,3","0,4",{"x":1.5},"0,5","0,6","0,7","0,8",{"w":1.25},"0,9"],[{"rowIndex":1,"w":1.25},"1,0","1,1","1,2","1,3","1,4",{"x":1.5},"1,5","1,6","1,7","1,8","1,9"],[{"rowIndex":2,"w":1.75},"2,0","2,1","2,2","2,3","2,4",{"x":0.5},"2,5","2,6","2,7","2,8",{"w":1.5},"2,9"],[{"rowIndex":3},"3,0",{"x":1.5},"3,1",{"w":2.25},"3,3",{"w":2,"x":0.5},"3,6","3,7",{"x":1.5},"3,9"]] + } +} diff --git a/keyboards/adalyn/readme.md b/keyboards/adalyn/readme.md new file mode 100644 index 0000000000..ce00e0fcc1 --- /dev/null +++ b/keyboards/adalyn/readme.md @@ -0,0 +1,3 @@ +# Adalyn + +Todo diff --git a/keyboards/adalyn/rules.mk b/keyboards/adalyn/rules.mk new file mode 100644 index 0000000000..35a59af934 --- /dev/null +++ b/keyboards/adalyn/rules.mk @@ -0,0 +1,23 @@ +# MCU name +MCU = atmega32u4 + +# 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 = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output +COMBO_ENABLE = yes