Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-12-14 15:51:31 +00:00
commit 2f15cde2d1
9 changed files with 342 additions and 0 deletions

View File

@ -0,0 +1,67 @@
/* Copyright 2022 water <mfkiiyd@163.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 <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
/*
* 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 { E6, B0, B7, D0, D1 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B5, B4, D7, D6, D4, D5, D3 }
#define DIODE_DIRECTION COL2ROW
#define BACKLIGHT_PIN B6
// #define BACKLIGHT_BREATHING
#define BACKLIGHT_LEVELS 3
#define RGB_DI_PIN E2
#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 240 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
// #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
#endif
#define LED_PIN_ON_STATE 0
#define LED_NUM_LOCK_PIN B1
#define LED_CAPS_LOCK_PIN B3
#define LED_SCROLL_LOCK_PIN B2

View File

@ -0,0 +1,92 @@
{
"keyboard_name": "vn",
"manufacturer": "ubest",
"url": "",
"maintainer": "mfkiiyd",
"usb": {
"vid": "0x6D66",
"pid": "0x0868",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [
{"label":"K00 (E6,F0)", "x":0, "y":0},
{"label":"K01 (E6,F1)", "x":1, "y":0},
{"label":"K02 (E6,F4)", "x":2, "y":0},
{"label":"K03 (E6,F5)", "x":3, "y":0},
{"label":"K04 (E6,F6)", "x":4, "y":0},
{"label":"K05 (E6,F7)", "x":5, "y":0},
{"label":"K06 (E6,C7)", "x":6, "y":0},
{"label":"K07 (E6,C6)", "x":7, "y":0},
{"label":"K08 (E6,B5)", "x":8, "y":0},
{"label":"K09 (E6,B4)", "x":9, "y":0},
{"label":"K0A (E6,D7)", "x":10, "y":0},
{"label":"K0B (E6,D6)", "x":11, "y":0},
{"label":"K0C (E6,D4)", "x":12, "y":0},
{"label":"K0D (E6,D5)", "x":13, "y":0},
{"label":"K2D (B7,D5)", "x":14, "y":0},
{"label":"K0E (E6,D3)", "x":15, "y":0},
{"label":"K10 (B0,F0)", "x":0, "y":1, "w":1.5},
{"label":"K11 (B0,F1)", "x":1.5, "y":1},
{"label":"K12 (B0,F4)", "x":2.5, "y":1},
{"label":"K13 (B0,F5)", "x":3.5, "y":1},
{"label":"K14 (B0,F6)", "x":4.5, "y":1},
{"label":"K15 (B0,F7)", "x":5.5, "y":1},
{"label":"K16 (B0,C7)", "x":6.5, "y":1},
{"label":"K17 (B0,C6)", "x":7.5, "y":1},
{"label":"K18 (B0,B5)", "x":8.5, "y":1},
{"label":"K19 (B0,B4)", "x":9.5, "y":1},
{"label":"K1A (B0,D7)", "x":10.5, "y":1},
{"label":"K1B (B0,D6)", "x":11.5, "y":1},
{"label":"K1C (B0,D4)", "x":12.5, "y":1},
{"label":"K1D (B0,D5)", "x":13.5, "y":1, "w":1.5},
{"label":"K1E (B0,D3)", "x":15, "y":1},
{"label":"K20 (B7,F0)", "x":0, "y":2, "w":1.75},
{"label":"K21 (B7,F1)", "x":1.75, "y":2},
{"label":"K22 (B7,F4)", "x":2.75, "y":2},
{"label":"K23 (B7,F5)", "x":3.75, "y":2},
{"label":"K24 (B7,F6)", "x":4.75, "y":2},
{"label":"K25 (B7,F7)", "x":5.75, "y":2},
{"label":"K26 (B7,C7)", "x":6.75, "y":2},
{"label":"K27 (B7,C6)", "x":7.75, "y":2},
{"label":"K28 (B7,B5)", "x":8.75, "y":2},
{"label":"K29 (B7,B4)", "x":9.75, "y":2},
{"label":"K2A (B7,D7)", "x":10.75, "y":2},
{"label":"K2B (B7,D6)", "x":11.75, "y":2},
{"label":"K2C (B7,D4)", "x":12.75, "y":2, "w":2.25},
{"label":"K2E (B7,D3)", "x":15, "y":2},
{"label":"K30 (D0,F0)", "x":0, "y":3, "w":1.25},
{"label":"K31 (D0,F1)", "x":1.25, "y":3},
{"label":"K32 (D0,F4)", "x":2.25, "y":3},
{"label":"K33 (D0,F5)", "x":3.25, "y":3},
{"label":"K34 (D0,F6)", "x":4.25, "y":3},
{"label":"K35 (D0,F7)", "x":5.25, "y":3},
{"label":"K36 (D0,C7)", "x":6.25, "y":3},
{"label":"K37 (D0,C6)", "x":7.25, "y":3},
{"label":"K38 (D0,B5)", "x":8.25, "y":3},
{"label":"K39 (D0,B4)", "x":9.25, "y":3},
{"label":"K3A (D0,D7)", "x":10.25, "y":3},
{"label":"K3B (D0,D6)", "x":11.25, "y":3},
{"label":"K3C (D0,D4)", "x":12.25, "y":3, "w":1.75},
{"label":"K3D (D0,D5)", "x":14, "y":3},
{"label":"K3E (D0,D3)", "x":15, "y":3},
{"label":"K40 (D1,F0)", "x":0, "y":4, "w":1.25},
{"label":"K41 (D1,F1)", "x":1.25, "y":4, "w":1.25},
{"label":"K43 (D1,F5)", "x":2.5, "y":4, "w":1.25},
{"label":"K47 (D1,C6)", "x":3.75, "y":4, "w":5.25},
{"label":"K48 (D1,B5)", "x":9, "y":4},
{"label":"K49 (D1,B4)", "x":10, "y":4},
{"label":"K4A (D1,D7)", "x":11, "y":4},
{"label":"K4B (D1,D6)", "x":12, "y":4},
{"label":"K4C (D1,D4)", "x":13, "y":4},
{"label":"K4D (D1,D5)", "x":14, "y":4},
{"label":"K4E (D1,D3)", "x":15, "y":4}
]
}
}
}

View File

@ -0,0 +1,41 @@
/* Copyright 2022 water <mfkiiyd@163.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 <http://www.gnu.org/licenses/>.
*/
#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_BSPC, KC_BSPC, KC_HOME,
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_PGUP,
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_PGDN,
KC_LSFT, 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, MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, 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, KC_DEL, KC_DEL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};

View File

@ -0,0 +1,48 @@
/* Copyright 2022 water <mfkiiyd@163.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 <http://www.gnu.org/licenses/>.
*/
#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_BSPC, KC_BSPC, KC_HOME,
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_PGUP,
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_PGDN,
KC_LSFT, 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, MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, 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, KC_DEL, KC_DEL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};

View File

@ -0,0 +1 @@
VIA_ENABLE = yes

View File

@ -0,0 +1,21 @@
# vn
An in-switch RGB LED keyboard with RGB underglow.
* Keyboard Maintainer: [water](https://github.com/mfkiiyd)
* Hardware Supported: vn
* Hardware Availability: ZA08A0U0-68KEY V1.0
Make example for this keyboard (after setting up your build environment):
make ubest/vn:default
Flashing example for this keyboard:
make ubest/vn: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).
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

View File

@ -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 = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output

19
keyboards/ubest/vn/vn.c Normal file
View File

@ -0,0 +1,19 @@
/* Copyright 2022 water <mfkiiyd@163.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 <http://www.gnu.org/licenses/>.
*/
#include "vn.h"

35
keyboards/ubest/vn/vn.h Normal file
View File

@ -0,0 +1,35 @@
/* Copyright 2022 water <mfkiiyd@163.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 <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
#define XXX KC_NO
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
K40, K41, K43, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
{ K40, K41, KC_NO, K43, KC_NO, KC_NO, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
}