From fd56a2a1dcdda8cf4504c715ce86e6d2d2d0d26e Mon Sep 17 00:00:00 2001 From: Vertex-kb <102476474+Vertex-kb@users.noreply.github.com> Date: Mon, 3 Apr 2023 01:08:53 +0800 Subject: Add angle65 (#19986) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan --- keyboards/vertex/angle65/chconf.h | 28 +++++++ keyboards/vertex/angle65/config.h | 21 +++++ keyboards/vertex/angle65/halconf.h | 28 +++++++ keyboards/vertex/angle65/info.json | 97 +++++++++++++++++++++++ keyboards/vertex/angle65/keymaps/default/keymap.c | 35 ++++++++ keyboards/vertex/angle65/keymaps/via/keymap.c | 51 ++++++++++++ keyboards/vertex/angle65/keymaps/via/rules.mk | 2 + keyboards/vertex/angle65/mcuconf.h | 27 +++++++ keyboards/vertex/angle65/readme.md | 22 +++++ keyboards/vertex/angle65/rules.mk | 17 ++++ 10 files changed, 328 insertions(+) create mode 100644 keyboards/vertex/angle65/chconf.h create mode 100644 keyboards/vertex/angle65/config.h create mode 100644 keyboards/vertex/angle65/halconf.h create mode 100644 keyboards/vertex/angle65/info.json create mode 100644 keyboards/vertex/angle65/keymaps/default/keymap.c create mode 100644 keyboards/vertex/angle65/keymaps/via/keymap.c create mode 100644 keyboards/vertex/angle65/keymaps/via/rules.mk create mode 100644 keyboards/vertex/angle65/mcuconf.h create mode 100644 keyboards/vertex/angle65/readme.md create mode 100644 keyboards/vertex/angle65/rules.mk diff --git a/keyboards/vertex/angle65/chconf.h b/keyboards/vertex/angle65/chconf.h new file mode 100644 index 0000000000..343afe57a6 --- /dev/null +++ b/keyboards/vertex/angle65/chconf.h @@ -0,0 +1,28 @@ +/* Copyright 2022 vertex + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/bt66tech/bt66tech60/chconf.h -r platforms/chibios/common/configs/chconf.h` + */ + +#pragma once + +#define CH_CFG_ST_TIMEDELTA 0 + +#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE + +#include_next diff --git a/keyboards/vertex/angle65/config.h b/keyboards/vertex/angle65/config.h new file mode 100644 index 0000000000..33235010ac --- /dev/null +++ b/keyboards/vertex/angle65/config.h @@ -0,0 +1,21 @@ +/* Copyright 2022 vertex + +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 SOLENOID_PIN A2 + +#define FORCE_NKRO diff --git a/keyboards/vertex/angle65/halconf.h b/keyboards/vertex/angle65/halconf.h new file mode 100644 index 0000000000..7fb6be528f --- /dev/null +++ b/keyboards/vertex/angle65/halconf.h @@ -0,0 +1,28 @@ +/* Copyright 2022 vertex + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/bt66tech/bt66tech60/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + +#pragma once + +#define HAL_USE_PWM TRUE + +#define HAL_USE_SPI TRUE + +#include_next diff --git a/keyboards/vertex/angle65/info.json b/keyboards/vertex/angle65/info.json new file mode 100644 index 0000000000..cb017b7f81 --- /dev/null +++ b/keyboards/vertex/angle65/info.json @@ -0,0 +1,97 @@ +{ + "keyboard_name": "ANGLE65", + "manufacturer": "vertex", + "url": "", + "maintainer": "EasonQian1, Vertex-kb", + "usb": { + "vid": "0x7374", + "pid": "0x9770", + "device_version": "0.0.1" + }, + "processor": "STM32F103", + "bootloader": "stm32duino", + "matrix_pins": { + "rows": ["B10", "B1", "B0", "A7", "A6"], + "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"] + }, + "diode_direction": "COL2ROW", + "indicators": { + "caps_lock": "C13", + "on_state": 0 + }, + "layouts": { + "LAYOUT": { + "layout":[ + {"label": "K00 (B10,B9)", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01 (B10,B8)", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02 (B10,B7)", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03 (B10,B6)", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K04 (B10,B5)", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "K05 (B10,B4)", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "K06 (B10,B3)", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "K07 (B10,B11)", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "K08 (B10,A15)", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "K09 (B10,A10)", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "K0A (B10,A9)", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "K0B (B10,B14)", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "K0C (B10,B13)", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "K0D (B10,B12)", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "K0E (B10,A5)", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "K10 (B1,B9)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "K11 (B1,B8)", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "K12 (B1,B7)", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "K13 (B1,B6)", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "K14 (B1,B5)", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "K15 (B1,B4)", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "K16 (B1,B3)", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "K17 (B1,B11)", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "K18 (B1,A15)", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "K19 (B1,A10)", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "K1A (B1,A9)", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "K1B (B1,B14)", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "K1C (B1,B13)", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "K1D (B1,B12)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "K1E (B1,A5)", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "K20 (B0,B9)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "K21 (B0,B8)", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "K22 (B0,B7)", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "K23 (B0,B6)", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "K24 (B0,B5)", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "K25 (B0,B4)", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "K26 (B0,B3)", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "K27 (B0,B11)", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K28 (B0,A15)", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "K29 (B0,A10)", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "K2A (B0,A9)", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "K2B (B0,B14)", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "K2C (B0,B13)", "matrix": [2, 12], "x": 12.75, "y": 2}, + {"label": "K2D (B0,B12)", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + {"label": "K2E (B0,A5)", "matrix": [2, 14], "x": 15, "y": 2}, + {"label": "K30 (A7,B9)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "K31 (A7,B8)", "matrix": [3, 1], "x": 1.25, "y": 3}, + {"label": "K32 (A7,B7)", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "K33 (A7,B6)", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "K34 (A7,B5)", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "K35 (A7,B4)", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "K36 (A7,B3)", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "K37 (A7,B11)", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "K38 (A7,A15)", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "K39 (A7,A10)", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": "K3A (A7,A9)", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "K3B (A7,B14)", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "K3C (A7,B13)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "K3D (A7,B12)", "matrix": [3, 13], "x": 14, "y": 3}, + {"label": "K3E (A7,A5)", "matrix": [3, 14], "x": 15, "y": 3}, + {"label": "K40 (A6,B9)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "K41 (A6,B8)", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "K42 (A6,B7)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "K46 (A6,B3)", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "K4A (A6,A9)", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"label": "K4B (A6,B14)", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "K4C (A6,B13)", "matrix": [4, 12], "x": 13, "y": 4}, + {"label": "K4D (A6,B12)", "matrix": [4, 13], "x": 14, "y": 4}, + {"label": "K4E (A6,A5)", "matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/vertex/angle65/keymaps/default/keymap.c b/keyboards/vertex/angle65/keymaps/default/keymap.c new file mode 100644 index 0000000000..5c19a6404b --- /dev/null +++ b/keyboards/vertex/angle65/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +/* Copyright 2022 vertex + * + * 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_ESC, 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_1, KC_BSPC, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, 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_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT ( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,_______, + _______, HF_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,_______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, + _______, _______, _______, _______, _______, _______, _______, _______,_______ + ), +}; diff --git a/keyboards/vertex/angle65/keymaps/via/keymap.c b/keyboards/vertex/angle65/keymaps/via/keymap.c new file mode 100644 index 0000000000..06158dffc4 --- /dev/null +++ b/keyboards/vertex/angle65/keymaps/via/keymap.c @@ -0,0 +1,51 @@ +/* Copyright 2022 vertex + * + * 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_ESC, 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_1, KC_BSPC, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, 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_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT ( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,_______, + _______, HF_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,_______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, + _______, _______, _______, _______, _______, _______, _______, _______,_______ + ), + + [2] = LAYOUT ( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,_______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,_______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, + _______, _______, _______, _______, _______, _______, _______, _______,_______ + ), + + [3] = LAYOUT( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,_______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,_______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, + _______, _______, _______, _______, _______, _______, _______, _______,_______ + ), +}; diff --git a/keyboards/vertex/angle65/keymaps/via/rules.mk b/keyboards/vertex/angle65/keymaps/via/rules.mk new file mode 100644 index 0000000000..36b7ba9cbc --- /dev/null +++ b/keyboards/vertex/angle65/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/vertex/angle65/mcuconf.h b/keyboards/vertex/angle65/mcuconf.h new file mode 100644 index 0000000000..659e21d83b --- /dev/null +++ b/keyboards/vertex/angle65/mcuconf.h @@ -0,0 +1,27 @@ +/* Copyright 2022 vertex + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/bt66tech/bt66tech60/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h` + */ + +#pragma once + +#include_next + +#undef STM32_PWM_USE_TIM1 +#define STM32_PWM_USE_TIM1 TRUE diff --git a/keyboards/vertex/angle65/readme.md b/keyboards/vertex/angle65/readme.md new file mode 100644 index 0000000000..33bd975510 --- /dev/null +++ b/keyboards/vertex/angle65/readme.md @@ -0,0 +1,22 @@ +# angle65 + +* A customizable soldering 60% keyboard. + +* Keyboard Maintainer: [EASON](https://github.com/EasonQian1) +* Hardware Supported: angle65 +* Hardware Availability: [vertex-kb](https://github.com/Vertex-kb) + +Make example for this keyboard (after setting up your build environment): + + make vertex/angle65:default + +Flashing example for this keyboard: + + make vertex/angle65:default:flash + +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). + +## Bootloader Enter the bootloader in 3 ways: +* **Bootmagic reset**: Hold down Enter in the keyboard then replug +* **Physical reset button**: Briefly press the button on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` diff --git a/keyboards/vertex/angle65/rules.mk b/keyboards/vertex/angle65/rules.mk new file mode 100644 index 0000000000..c36e3ade82 --- /dev/null +++ b/keyboards/vertex/angle65/rules.mk @@ -0,0 +1,17 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +HAPTIC_ENABLE = yes +HAPTIC_DRIVER += SOLENOID + +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -- cgit v1.2.3