mirror of
https://github.com/Keychron/qmk_firmware.git
synced 2024-11-28 03:26:51 +06:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
ccd1839443
16
keyboards/adalyn/adalyn.c
Normal file
16
keyboards/adalyn/adalyn.c
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
/* Copyright TJ Campie
|
||||
*
|
||||
* 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 "adalyn.h"
|
||||
33
keyboards/adalyn/adalyn.h
Normal file
33
keyboards/adalyn/adalyn.h
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
/* Copyright TJ Campie
|
||||
*
|
||||
* 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, \
|
||||
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 } \
|
||||
}
|
||||
54
keyboards/adalyn/config.h
Normal file
54
keyboards/adalyn/config.h
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
/* Copyright TJ Campie
|
||||
*
|
||||
* 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"
|
||||
|
||||
/* 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
|
||||
10
keyboards/adalyn/info.json
Normal file
10
keyboards/adalyn/info.json
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"keyboard_name": "adalyn",
|
||||
"url": "https://github.com/MarvFPV/Adalyn",
|
||||
"maintainer": "tominabox1",
|
||||
"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}]
|
||||
}
|
||||
}
|
||||
}
|
||||
21
keyboards/adalyn/keymaps/default/config.h
Normal file
21
keyboards/adalyn/keymaps/default/config.h
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
/* Copyright TJ Campie
|
||||
*
|
||||
* 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
|
||||
|
||||
#ifdef COMBO_ENABLE
|
||||
# define COMBO_COUNT 5
|
||||
# define COMBO_TERM 200
|
||||
#endif
|
||||
72
keyboards/adalyn/keymaps/default/keymap.c
Normal file
72
keyboards/adalyn/keymaps/default/keymap.c
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
/* Copyright TJ Campie
|
||||
*
|
||||
* 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
|
||||
|
||||
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
|
||||
1
keyboards/adalyn/keymaps/default/readme.md
Normal file
1
keyboards/adalyn/keymaps/default/readme.md
Normal file
|
|
@ -0,0 +1 @@
|
|||
# Default QAZ Layout
|
||||
1
keyboards/adalyn/keymaps/default/rules.mk
Normal file
1
keyboards/adalyn/keymaps/default/rules.mk
Normal file
|
|
@ -0,0 +1 @@
|
|||
COMBO_ENABLE = yes
|
||||
19
keyboards/adalyn/readme.md
Normal file
19
keyboards/adalyn/readme.md
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# Adalyn
|
||||
|
||||
|
||||
|
||||
*A cool QAZ-Alice hybrid designed by [Marv](https://github.com/MarvFPV/Adalyn) with a PCB by [tominabox1](https://github.com/tominabox1)*
|
||||
* Keyboard Maintainer: [tominabox1](https://github.com/tominabox1)
|
||||
* Hardware Supported: Adalyn PCB, atmega32u4
|
||||
* Hardware Availability: Open source on @tominabox1 GitHub
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
make adalyn:default
|
||||
Flashing example for this keyboard:
|
||||
make adalyn: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 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 `RESET` if it is available
|
||||
22
keyboards/adalyn/rules.mk
Normal file
22
keyboards/adalyn/rules.mk
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
# 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 = 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
|
||||
AUDIO_ENABLE = no # Audio output
|
||||
COMBO_ENABLE = no
|
||||
Loading…
Reference in New Issue
Block a user