From a3b06fd87cddcac17d9a376f4cfee4d01c0b5dcf Mon Sep 17 00:00:00 2001 From: QMK Bot Date: Mon, 8 Aug 2022 09:33:25 -0700 Subject: [PATCH] Format code according to conventions (#17951) --- keyboards/vertex/angler2/config.h | 130 +++++------ keyboards/vertex/angler2/info.json | 202 +++++++++--------- keyboards/vertex/angler2/keymaps/via/rules.mk | 4 +- 3 files changed, 168 insertions(+), 168 deletions(-) diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h index cc31d6b0dc..89e6fc4a14 100644 --- a/keyboards/vertex/angler2/config.h +++ b/keyboards/vertex/angler2/config.h @@ -1,65 +1,65 @@ -/* 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 - -#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 +/* 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 + +#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 diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json index a9e4c373ab..332cd27f7c 100644 --- a/keyboards/vertex/angler2/info.json +++ b/keyboards/vertex/angler2/info.json @@ -1,101 +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 } - ] - } - } -} +{ + "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 } + ] + } + } +} diff --git a/keyboards/vertex/angler2/keymaps/via/rules.mk b/keyboards/vertex/angler2/keymaps/via/rules.mk index a2d6d0a96e..36b7ba9cbc 100644 --- a/keyboards/vertex/angler2/keymaps/via/rules.mk +++ b/keyboards/vertex/angler2/keymaps/via/rules.mk @@ -1,2 +1,2 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes +VIA_ENABLE = yes +LTO_ENABLE = yes