Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add vertex user space and angler2 keyboard #16764

Merged
merged 15 commits into from
Aug 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions keyboards/vertex/angler2/angler2.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* Copyright 2022 Vertex <[email protected]>
*
* 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 <https://www.gnu.org/licenses/>.
*/

#include "angler2.h"
36 changes: 36 additions & 0 deletions keyboards/vertex/angler2/angler2.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* Copyright 2022 Vertex <[email protected]>
*
* 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 <https://www.gnu.org/licenses/>.
*/

#pragma once

#include "quantum.h"

#define XXX KC_NO
#define LAYOUT_all( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K4E \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F}, \
{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F}, \
{ K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F}, \
}
65 changes: 65 additions & 0 deletions keyboards/vertex/angler2/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/* Copyright 2022 Vertex <[email protected]>
*
* 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 <https://www.gnu.org/licenses/>.
*/

#pragma once

#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0x480E
#define PRODUCT_ID 0x408F
#define DEVICE_VER 0x0001
#define MANUFACTURER Vertex_eason
#define PRODUCT Angler2

/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16

/*
* 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 { F4, B2, F0, D5, D1, D2 }
#define MATRIX_COL_PINS { F5, F6, F7, E2, C7, C6, B6, F1, B5, B4, D7, D6, D4, D3, D0, B1 }

#define DIODE_DIRECTION COL2ROW

#define LED_CAPS_LOCK_PIN B0
#define LED_SCROLL_LOCK_PIN B7
#define LED_PIN_ON_STATE 0

#define RGB_DI_PIN E6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
101 changes: 101 additions & 0 deletions keyboards/vertex/angler2/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
{
"keyboard_name": "angler2",
"url": "https://github.com/Vertex-kb",
"maintainer": "vertex",
"layouts": {
"LAYOUT_all": {
"layout": [
{ "label": "K00 (F4,F5)", "x": 0, "y": 0 },
{ "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
{ "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
{ "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
{ "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
{ "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
{ "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
{ "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
{ "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
{ "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
{ "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
{ "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
{ "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
{ "label": "K0D (F4,B1)", "x": 14, "y": 0 },
{ "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
{ "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
{ "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
{ "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
{ "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
{ "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
{ "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
{ "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
{ "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
{ "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
{ "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
{ "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
{ "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
{ "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
{ "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
{ "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
{ "label": "K1D (B2,D3)", "x": 13, "y": 1.5,"w":2},
{ "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
{ "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
{ "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
{ "label": "K20 (F0,F5)", "x": 0,"y":2.5,"w":1.5},
{ "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
{ "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
{ "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
{ "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
{ "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
{ "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
{ "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
{ "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
{ "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
{ "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
{ "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
{ "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
{ "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5,"w":1.5},
{ "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
{ "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
{ "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
{ "label": "K30 (D5,F5)", "x": 0, "y": 3.5,"w":1.75},
{ "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
{ "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
{ "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
{ "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
{ "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
{ "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
{ "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
{ "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
{ "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
{ "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
{ "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
{ "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
{ "label": "K3D (D5,D3)", "x": 13.75, "y": 3.5,"w":1.25 },
{ "label": "K40 (D1,F5)", "x": 0, "y": 4.5,"w":1.25},
{ "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
{ "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
{ "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
{ "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
{ "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
{ "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
{ "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
{ "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
{ "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
{ "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
{ "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
{ "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5,"w":2.75 },
{ "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
{ "label": "K50 (D2,F5)", "x": 0, "y": 5.5,"w":1.25 },
{ "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5,"w":1.25 },
{ "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5,"w":1.25 },
{ "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5,"w":6.25 },
{ "label": "K5A (D2,D7)", "x": 10, "y": 5.5,"w":1.25 },
{ "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5,"w":1.25 },
{ "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5,"w":1.25 },
{ "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5,"w":1.25 },
{ "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
{ "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
{ "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
]
}
}
}
40 changes: 40 additions & 0 deletions keyboards/vertex/angler2/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/* Copyright 2022 Vertex <[email protected]>
*
* 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 <https://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[0] = LAYOUT_all(

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_DEL, KC_PSCR, KC_SLCK,KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_NO, 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_BSLS, KC_ENT,
KC_LSFT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN,KC_RGHT
),
[1] = LAYOUT_all(

RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,RGB_TOG,RGB_VAI,RGB_VAD,RGB_HUI,RGB_HUD,RGB_MOD,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,
_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______
),

};
59 changes: 59 additions & 0 deletions keyboards/vertex/angler2/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/* Copyright 2022 Vertex <[email protected]>
*
* 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 <https://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[0] = LAYOUT_all(

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_DEL, KC_PSCR, KC_SLCK,KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_NO, 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_BSLS, KC_ENT,
KC_LSFT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN,KC_RGHT
),
[1] = LAYOUT_all(

RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,RGB_TOG,RGB_VAI,RGB_VAD,RGB_HUI,RGB_HUD,RGB_MOD,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,
_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______
),
[2] = LAYOUT_all(

RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,
_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______
),
[3] = LAYOUT_all(

RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,
_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______
),


};
2 changes: 2 additions & 0 deletions keyboards/vertex/angler2/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
17 changes: 17 additions & 0 deletions keyboards/vertex/angler2/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# angler2
A customizable soldering 80% keyboard.

* Keyboard Maintainer: [Vertex](https://github.com/Vertex-kb)
* Hardware Supported: AngleR2
* Hardware Availability: [Vertex](https://github.com/Vertex-kb)

Make example for this keyboard (after setting up your build environment):

make Vertex/AngleR2:default

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 esc 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 `RESET`
18 changes: 18 additions & 0 deletions keyboards/vertex/angler2/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = atmel-dfu

# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # 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 = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output