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

This commit is contained in:
QMK Bot 2023-02-09 03:29:51 +00:00
commit b0604aca47
8 changed files with 417 additions and 0 deletions

View File

@ -0,0 +1,22 @@
// Copyright 2023 QMK Contributors (@qmk)
// SPDX-License-Identifier: GPL-2.0-or-later
#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) {
return false;
}
switch (index) {
case 0:
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
break;
}
return true;
}
#endif

View File

@ -0,0 +1,247 @@
{
"manufacturer": "Reed's Keebs",
"keyboard_name": "Alish40",
"maintainer": "NamesReed",
"development_board": "promicro",
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{
"pin_a": "B4",
"pin_b": "B5",
"resolution": 4
}
]
},
"features": {
"bootmagic": true,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"rgblight": true
},
"matrix_pins": {
"cols": ["D2", "D1", "D0", "B2", "B3", "B1"],
"rows": ["F4", "D3", "D4", "C6", "D7", "E6", "F6", "F7"]
},
"rgblight": {
"animations": {
"alternating": true,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
},
"brightness_steps": 17,
"hue_steps": 10,
"led_count": 10,
"pin": "F5",
"saturation_steps": 17
},
"url": "https://mechwild.com/product/alish/",
"usb": {
"device_version": "1.3.0",
"pid": "0x0001",
"vid": "0x722E"
},
"layouts": {
"LAYOUT_all": {
"layout": [
{ "matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0 },
{ "matrix": [1, 0], "x": 1.7, "y": 0 },
{ "matrix": [0, 1], "x": 2.7, "y": 0 },
{ "matrix": [1, 1], "x": 3.7, "y": 0 },
{ "matrix": [0, 2], "x": 4.7, "y": 0 },
{ "matrix": [1, 2], "x": 5.7, "y": 0 },
{ "matrix": [0, 3], "x": 8.25, "y": 0 },
{ "matrix": [1, 3], "x": 9.25, "y": 0 },
{ "matrix": [0, 4], "x": 10.25, "y": 0 },
{ "matrix": [1, 4], "x": 11.25, "y": 0 },
{ "matrix": [0, 5], "x": 12.25, "y": 0 },
{ "matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0 },
{ "matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1 },
{ "matrix": [3, 0], "x": 1.85, "y": 1 },
{ "matrix": [2, 1], "x": 2.85, "y": 1 },
{ "matrix": [3, 1], "x": 3.85, "y": 1 },
{ "matrix": [2, 2], "x": 4.85, "y": 1 },
{ "matrix": [3, 2], "x": 5.85, "y": 1 },
{ "matrix": [2, 3], "x": 8.65, "y": 1 },
{ "matrix": [3, 3], "x": 9.65, "y": 1 },
{ "matrix": [2, 4], "x": 10.65, "y": 1 },
{ "matrix": [3, 4], "x": 11.65, "y": 1 },
{ "matrix": [2, 5], "x": 12.65, "y": 1 },
{ "matrix": [3, 5], "w": 1.25, "x": 13.65, "y": 1 },
{ "matrix": [5, 0], "w": 1.25, "x": 0, "y": 2 },
{ "matrix": [7, 1], "x": 1.25, "y": 2 },
{ "matrix": [4, 0], "x": 2.25, "y": 2 },
{ "matrix": [5, 1], "x": 3.25, "y": 2 },
{ "matrix": [4, 1], "x": 4.25, "y": 2 },
{ "matrix": [5, 2], "x": 5.25, "y": 2 },
{ "matrix": [4, 2], "x": 6.25, "y": 2 },
{ "matrix": [5, 3], "x": 8.25, "y": 2 },
{ "matrix": [4, 3], "x": 9.25, "y": 2 },
{ "matrix": [5, 4], "x": 10.25, "y": 2 },
{ "matrix": [4, 4], "x": 11.25, "y": 2 },
{ "matrix": [5, 5], "x": 12.25, "y": 2 },
{ "matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2 },
{ "matrix": [6, 0], "w": 1.25, "x": 0, "y": 3 },
{ "matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3 },
{ "matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3 },
{ "matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3 },
{ "matrix": [7, 3], "w": 2.75, "x": 8, "y": 3 },
{ "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3 },
{ "matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3 },
{ "matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3 }
]
},
"LAYOUT_full_enter": {
"layout": [
{ "matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0 },
{ "matrix": [1, 0], "x": 1.7, "y": 0 },
{ "matrix": [0, 1], "x": 2.7, "y": 0 },
{ "matrix": [1, 1], "x": 3.7, "y": 0 },
{ "matrix": [0, 2], "x": 4.7, "y": 0 },
{ "matrix": [1, 2], "x": 5.7, "y": 0 },
{ "matrix": [0, 3], "x": 8.25, "y": 0 },
{ "matrix": [1, 3], "x": 9.25, "y": 0 },
{ "matrix": [0, 4], "x": 10.25, "y": 0 },
{ "matrix": [1, 4], "x": 11.25, "y": 0 },
{ "matrix": [0, 5], "x": 12.25, "y": 0 },
{ "matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0 },
{ "matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1 },
{ "matrix": [3, 0], "x": 1.85, "y": 1 },
{ "matrix": [2, 1], "x": 2.85, "y": 1 },
{ "matrix": [3, 1], "x": 3.85, "y": 1 },
{ "matrix": [2, 2], "x": 4.85, "y": 1 },
{ "matrix": [3, 2], "x": 5.85, "y": 1 },
{ "matrix": [2, 3], "x": 8.65, "y": 1 },
{ "matrix": [3, 3], "x": 9.65, "y": 1 },
{ "matrix": [2, 4], "x": 10.65, "y": 1 },
{ "matrix": [3, 4], "x": 11.65, "y": 1 },
{ "matrix": [3, 5], "w": 2.25, "x": 12.65, "y": 1 },
{ "matrix": [5, 0], "w": 1.25, "x": 0, "y": 2 },
{ "matrix": [7, 1], "x": 1.25, "y": 2 },
{ "matrix": [4, 0], "x": 2.25, "y": 2 },
{ "matrix": [5, 1], "x": 3.25, "y": 2 },
{ "matrix": [4, 1], "x": 4.25, "y": 2 },
{ "matrix": [5, 2], "x": 5.25, "y": 2 },
{ "matrix": [4, 2], "x": 6.25, "y": 2 },
{ "matrix": [5, 3], "x": 8.25, "y": 2 },
{ "matrix": [4, 3], "x": 9.25, "y": 2 },
{ "matrix": [5, 4], "x": 10.25, "y": 2 },
{ "matrix": [4, 4], "x": 11.25, "y": 2 },
{ "matrix": [5, 5], "x": 12.25, "y": 2 },
{ "matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2 },
{ "matrix": [6, 0], "w": 1.25, "x": 0, "y": 3 },
{ "matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3 },
{ "matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3 },
{ "matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3 },
{ "matrix": [7, 3], "w": 2.75, "x": 8, "y": 3 },
{ "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3 },
{ "matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3 },
{ "matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3 }
]
},
"LAYOUT_full_enter_lshift": {
"layout": [
{ "matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0 },
{ "matrix": [1, 0], "x": 1.7, "y": 0 },
{ "matrix": [0, 1], "x": 2.7, "y": 0 },
{ "matrix": [1, 1], "x": 3.7, "y": 0 },
{ "matrix": [0, 2], "x": 4.7, "y": 0 },
{ "matrix": [1, 2], "x": 5.7, "y": 0 },
{ "matrix": [0, 3], "x": 8.25, "y": 0 },
{ "matrix": [1, 3], "x": 9.25, "y": 0 },
{ "matrix": [0, 4], "x": 10.25, "y": 0 },
{ "matrix": [1, 4], "x": 11.25, "y": 0 },
{ "matrix": [0, 5], "x": 12.25, "y": 0 },
{ "matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0 },
{ "matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1 },
{ "matrix": [3, 0], "x": 1.85, "y": 1 },
{ "matrix": [2, 1], "x": 2.85, "y": 1 },
{ "matrix": [3, 1], "x": 3.85, "y": 1 },
{ "matrix": [2, 2], "x": 4.85, "y": 1 },
{ "matrix": [3, 2], "x": 5.85, "y": 1 },
{ "matrix": [2, 3], "x": 8.65, "y": 1 },
{ "matrix": [3, 3], "x": 9.65, "y": 1 },
{ "matrix": [2, 4], "x": 10.65, "y": 1 },
{ "matrix": [3, 4], "x": 11.65, "y": 1 },
{ "matrix": [3, 5], "w": 2.25, "x": 12.65, "y": 1 },
{ "matrix": [5, 0], "w": 2.25, "x": 0, "y": 2 },
{ "matrix": [4, 0], "x": 2.25, "y": 2 },
{ "matrix": [5, 1], "x": 3.25, "y": 2 },
{ "matrix": [4, 1], "x": 4.25, "y": 2 },
{ "matrix": [5, 2], "x": 5.25, "y": 2 },
{ "matrix": [4, 2], "x": 6.25, "y": 2 },
{ "matrix": [5, 3], "x": 8.25, "y": 2 },
{ "matrix": [4, 3], "x": 9.25, "y": 2 },
{ "matrix": [5, 4], "x": 10.25, "y": 2 },
{ "matrix": [4, 4], "x": 11.25, "y": 2 },
{ "matrix": [5, 5], "x": 12.25, "y": 2 },
{ "matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2 },
{ "matrix": [6, 0], "w": 1.25, "x": 0, "y": 3 },
{ "matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3 },
{ "matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3 },
{ "matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3 },
{ "matrix": [7, 3], "w": 2.75, "x": 8, "y": 3 },
{ "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3 },
{ "matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3 },
{ "matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3 }
]
},
"LAYOUT_full_lshift": {
"layout": [
{ "matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0 },
{ "matrix": [1, 0], "x": 1.7, "y": 0 },
{ "matrix": [0, 1], "x": 2.7, "y": 0 },
{ "matrix": [1, 1], "x": 3.7, "y": 0 },
{ "matrix": [0, 2], "x": 4.7, "y": 0 },
{ "matrix": [1, 2], "x": 5.7, "y": 0 },
{ "matrix": [0, 3], "x": 8.25, "y": 0 },
{ "matrix": [1, 3], "x": 9.25, "y": 0 },
{ "matrix": [0, 4], "x": 10.25, "y": 0 },
{ "matrix": [1, 4], "x": 11.25, "y": 0 },
{ "matrix": [0, 5], "x": 12.25, "y": 0 },
{ "matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0 },
{ "matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1 },
{ "matrix": [3, 0], "x": 1.85, "y": 1 },
{ "matrix": [2, 1], "x": 2.85, "y": 1 },
{ "matrix": [3, 1], "x": 3.85, "y": 1 },
{ "matrix": [2, 2], "x": 4.85, "y": 1 },
{ "matrix": [3, 2], "x": 5.85, "y": 1 },
{ "matrix": [2, 3], "x": 8.65, "y": 1 },
{ "matrix": [3, 3], "x": 9.65, "y": 1 },
{ "matrix": [2, 4], "x": 10.65, "y": 1 },
{ "matrix": [3, 4], "x": 11.65, "y": 1 },
{ "matrix": [2, 5], "x": 12.65, "y": 1 },
{ "matrix": [3, 5], "w": 1.25, "x": 13.65, "y": 1 },
{ "matrix": [5, 0], "w": 2.25, "x": 0, "y": 2 },
{ "matrix": [4, 0], "x": 2.25, "y": 2 },
{ "matrix": [5, 1], "x": 3.25, "y": 2 },
{ "matrix": [4, 1], "x": 4.25, "y": 2 },
{ "matrix": [5, 2], "x": 5.25, "y": 2 },
{ "matrix": [4, 2], "x": 6.25, "y": 2 },
{ "matrix": [5, 3], "x": 8.25, "y": 2 },
{ "matrix": [4, 3], "x": 9.25, "y": 2 },
{ "matrix": [5, 4], "x": 10.25, "y": 2 },
{ "matrix": [4, 4], "x": 11.25, "y": 2 },
{ "matrix": [5, 5], "x": 12.25, "y": 2 },
{ "matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2 },
{ "matrix": [6, 0], "w": 1.25, "x": 0, "y": 3 },
{ "matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3 },
{ "matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3 },
{ "matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3 },
{ "matrix": [7, 3], "w": 2.75, "x": 8, "y": 3 },
{ "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3 },
{ "matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3 },
{ "matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3 }
]
}
}
}

View File

@ -0,0 +1,42 @@
// Copyright 2022 Kyle McCreery (@kylemccreery)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[0] = LAYOUT_all(
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT,
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_LCTL, KC_LGUI, KC_MUTE, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),
[1] = LAYOUT_all(
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
[2] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
[3] = { ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) }
};
#endif

View File

@ -0,0 +1,24 @@
# If you are using a custom AVR Pro Micro-compatible dev board (Elite-C, Sea-Micro, etc)
# you may need to uncomment and modify this BOOTLOADER setting to use the correct
# bootloader. (e.g. Elite-Cs use "atmel-dfu", not "caterina".)
#
# See the QMK docs for more information:
# https://docs.qmk.fm/#/flashing
# https://docs.qmk.fm/#/driver_installation_zadig?id=list-of-known-bootloaders
# BOOTLOADER = caterina
# Conversion to some non-AVR Pro Micro-compatible dev boards can be performed automatically.
# Uncomment and modify this CONVERT_TO setting for your dev board.
#
# See the QMK docs for more information:
# https://docs.qmk.fm/#/feature_converters
# CONVERT_TO=promicro_rp2040
# If you are not using an encoder, set these options to no.
ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes
# If you did not add RGB LEDs, set this option to no.
RGBLIGHT_ENABLE = yes

View File

@ -0,0 +1,42 @@
// Copyright 2022 Kyle McCreery (@kylemccreery)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[0] = LAYOUT_all(
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT,
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_LCTL, KC_LGUI, KC_MUTE, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),
[1] = LAYOUT_all(
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
[2] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
[3] = { ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) }
};
#endif

View File

@ -0,0 +1,6 @@
ENCODER_MAP_ENABLE = yes
VIA_ENABLE = yes
ifeq ($(strip $(MCU)), atmega32u4)
LTO_ENABLE = yes
endif

View File

@ -0,0 +1,33 @@
# Alish40
![Alish40 in black](https://i.imgur.com/h9lklc9l.jpg)
A budget-friendly 40% Alice*ish* keyboard with base kit support and styl*ish* silkscreen art.
* Keyboard Maintainer: [Reed](https://github.com/NamesReed), [Kyle McCreery](https://github.com/kylemccreery)
* Hardware Supported: Alish40 v1.3
* Hardware Availability: [Alish40, fulfilled by MechWild](https://mechwild.com/product/alish/)
Make example for this keyboard (after setting up your build environment):
make reedskeebs/alish40:default
Flashing example for this keyboard:
make reedskeebs/alish40: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 top left key and plug in the keyboard. This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving.
* **Physical reset**: Press the 6x6mm button below the "Alish 40" label, on the underside of the PCB. You may also use your Pro Micro's built-in reset mechanism if that is easier.
* **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymaps, but you may assign this key in any keymaps you create.
As a Pro Micro-compatible board, the Alish40 uses `caterina` as its bootloader by default. Many popular Pro Micro alternatives like the Elite-C, Bit-C, Sea-Micro, Puchi-C etc should be flashed with a different bootloader such as `atmel-dfu`.
**If the incorrect bootloader is specified, bootmagic reset and the `QK_BOOT` keycode will not work**.
To avoid this problem, set the correct bootloader in your custom keymap's `rules.mk` file before compiling, or flash using an appropriate target (e.g. `make reedskeebs/alish40:default:dfu`). See [flashing instructions and bootloader information](https://docs.qmk.fm/#/flashing) for more details.

View File

@ -0,0 +1 @@
# This file intentionally left blank