andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

master
QMK Bot 2021-11-01 03:46:23 +00:00
parent 928d9f90ec 3c08817e44
commit f7e94f6624
7 changed files with 83 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
keyboards/canary/canary60rgb/canary60rgb.c
View File

@ -17,73 +17,73 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, K_14, J_14, L_14 }, { 0, J_14, K_14, L_14 },
{ 0, K_13, J_13, L_13 }, { 0, J_13, K_13, L_13 },
{ 0, K_12, J_12, L_12 }, { 0, J_12, K_12, L_12 },
{ 0, K_11, J_11, L_11 }, { 0, J_11, K_11, L_11 },
{ 0, K_10, J_10, L_10 }, { 0, J_10, K_10, L_10 },
{ 0, K_9, J_9, L_9 }, { 0, J_9, K_9, L_9 },
{ 0, K_8, J_8, L_8 }, { 0, J_8, K_8, L_8 },
{ 0, K_7, J_7, L_7 }, { 0, J_7, K_7, L_7 },
{ 0, K_6, J_6, L_6 }, { 0, J_6, K_6, L_6 },
{ 0, K_5, J_5, L_5 }, { 0, J_5, K_5, L_5 },
{ 0, K_4, J_4, L_4 }, { 0, J_4, K_4, L_4 },
{ 0, K_3, J_3, L_3 }, { 0, J_3, K_3, L_3 },
{ 0, K_2, J_2, L_2 }, { 0, J_2, K_2, L_2 },
{ 0, K_1, J_1, L_1 }, { 0, J_1, K_1, L_1 },
{ 0, H_14, G_14, I_14 }, { 0, G_14, H_14, I_14 },
{ 0, H_13, G_13, I_13 }, { 0, G_13, H_13, I_13 },
{ 0, H_12, G_12, I_12 }, { 0, G_12, H_12, I_12 },
{ 0, H_11, G_11, I_11 }, { 0, G_11, H_11, I_11 },
{ 0, H_10, G_10, I_10 }, { 0, G_10, H_10, I_10 },
{ 0, H_9, G_9, I_9 }, { 0, G_9, H_9, I_9 },
{ 0, H_8, G_8, I_8 }, { 0, G_8, H_8, I_8 },
{ 0, H_7, G_7, I_7 }, { 0, G_7, H_7, I_7 },
{ 0, H_6, G_6, I_6 }, { 0, G_6, H_6, I_6 },
{ 0, H_5, G_5, I_5 }, { 0, G_5, H_5, I_5 },
{ 0, H_4, G_4, I_4 }, { 0, G_4, H_4, I_4 },
{ 0, H_3, G_3, I_3 }, { 0, G_3, H_3, I_3 },
{ 0, H_2, G_2, I_2 }, { 0, G_2, H_2, I_2 },
{ 0, H_1, G_1, I_1 }, { 0, G_1, H_1, I_1 },
{ 0, E_14, D_14, F_14 }, { 0, D_14, E_14, F_14 },
{ 0, E_12, D_12, F_12 }, { 0, D_12, E_12, F_12 },
{ 0, E_11, D_11, F_11 }, { 0, D_11, E_11, F_11 },
{ 0, E_10, D_10, F_10 }, { 0, D_10, E_10, F_10 },
{ 0, E_9, D_9, F_9 }, { 0, D_9, E_9, F_9 },
{ 0, E_8, D_8, F_8 }, { 0, D_8, E_8, F_8 },
{ 0, E_7, D_7, F_7 }, { 0, D_7, E_7, F_7 },
{ 0, E_6, D_6, F_6 }, { 0, D_6, E_6, F_6 },
{ 0, E_5, D_5, F_5 }, { 0, D_5, E_5, F_5 },
{ 0, E_4, D_4, F_4 }, { 0, D_4, E_4, F_4 },
{ 0, E_3, D_3, F_3 }, { 0, D_3, E_3, F_3 },
{ 0, E_2, D_2, F_2 }, { 0, D_2, E_2, F_2 },
{ 0, E_1, D_1, F_1 }, { 0, D_1, E_1, F_1 },
{ 0, B_14, A_14, C_14 }, { 0, A_14, B_14, C_14 },
{ 0, B_13, A_13, C_13 }, { 0, A_13, B_13, C_13 },
{ 0, B_11, A_11, C_11 }, { 0, A_11, B_11, C_11 },
{ 0, B_10, A_10, C_10 }, { 0, A_10, B_10, C_10 },
{ 0, B_9, A_9, C_9 }, { 0, A_9, B_9, C_9 },
{ 0, B_8, A_8, C_8 }, { 0, A_8, B_8, C_8 },
{ 0, B_7, A_7, C_7 }, { 0, A_7, B_7, C_7 },
{ 0, B_6, A_6, C_6 }, { 0, A_6, B_6, C_6 },
{ 0, B_5, A_5, C_5 }, { 0, A_5, B_5, C_5 },
{ 0, B_4, A_4, C_4 }, { 0, A_4, B_4, C_4 },
{ 0, B_3, A_3, C_3 }, { 0, A_3, B_3, C_3 },
{ 0, B_2, A_2, C_2 }, { 0, A_2, B_2, C_2 },
{ 0, B_1, A_1, C_1 }, { 0, A_1, B_1, C_1 },
{ 0, B_15, A_15, C_15 }, { 0, A_15, B_15, C_15 },
{ 0, E_13, D_13, F_13 }, { 0, D_13, E_13, F_13 },
{ 0, B_12, A_12, C_12 }, { 0, A_12, B_12, C_12 },
{ 0, E_15, D_15, F_15 }, { 0, D_15, E_15, F_15 },
{ 0, H_15, G_15, I_15 }, { 0, G_15, H_15, I_15 },
{ 0, B_16, A_16, C_16 }, { 0, A_16, B_16, C_16 },
{ 0, E_16, D_16, F_16 }, { 0, D_16, E_16, F_16 },
{ 0, H_16, G_16, I_16 }, { 0, G_16, H_16, I_16 },
{ 0, K_16, J_16, L_16 } { 0, J_16, K_16, L_16 }
}; };
led_config_t g_led_config = { led_config_t g_led_config = {

2
keyboards/canary/canary60rgb/info.json
View File

@ -1,7 +1,7 @@
{ {
"keyboard_name": "CANARY60RGB", "keyboard_name": "CANARY60RGB",
"url": "", "url": "",
"maintainer": "canary", "maintainer": "tuananhnguyen204",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

11
keyboards/canary/canary60rgb/keymaps/default/keymap.c
View File

@ -21,14 +21,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL), KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),
KC_LCTL, KC_LGUI, LM(1, MOD_LALT), KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
), ),
[1] = LAYOUT( [1] = LAYOUT(
_______, 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_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_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET, _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
_______, _______, TO(3), TO(4), _______, _______, KC_MPRV, KC_VOLD, KC_MNXT _______, _______, TO(3), _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
), ),
[2] = LAYOUT( [2] = LAYOUT(
_______, 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_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,
@ -43,5 +43,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, KC_PENT, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, KC_PENT,
_______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______,
_______, KC_P0, KC_PDOT, KC_PENT, KC_P0, KC_PDOT, _______, _______, _______ _______, KC_P0, KC_PDOT, KC_PENT, KC_P0, KC_PDOT, _______, _______, _______
),
[4] = LAYOUT(
KC_GESC, 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_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,
CTL_T(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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, TO(0), KC_LEFT, KC_DOWN, KC_RGHT
) )
}; };

4
keyboards/canary/canary60rgb/keymaps/via/keymap.c
View File

@ -21,14 +21,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL), KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),
KC_LCTL, KC_LGUI, LM(1, MOD_LALT), KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
), ),
[1] = LAYOUT( [1] = LAYOUT(
_______, 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_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_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET, _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
_______, _______, TO(3), TO(4), _______, _______, KC_MPRV, KC_VOLD, KC_MNXT _______, _______, TO(3), _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
), ),
[2] = LAYOUT( [2] = LAYOUT(
_______, 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_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,

8
keyboards/canary/canary60rgb/readme.md
View File

@ -1,13 +1,13 @@
# CANARY60RGB # Canary60RGB
![canary60rgb1](https://github.com/AnthonyNguyen168/keyboards/blob/main/2.jpg) ![canary60rgb1](https://github.com/AnthonyNguyen168/keyboards/blob/main/2.jpg)
![canary60rgb2](https://github.com/AnthonyNguyen168/keyboards/blob/main/3.jpg) ![canary60rgb2](https://github.com/AnthonyNguyen168/keyboards/blob/main/3.jpg)
A hotswap 60% RGB keyboard. A hotswap 60% RGB keyboard.
* Keyboard Maintainer: [AnthonyNguyen168](https://github.com/AnthonyNguyen168) * Keyboard Maintainer: [tuananhnguyen204](https://github.com/AnthonyNguyen168) (tuananhnguyen204@gmail.com)
* Hardware Supported: CanaryTeam CANARY60RGB V1 * Hardware Supported: CanaryTeam Canary60RGB V1
* Hardware Availability: [CanaryTeam](https://www.facebook.com/CanaryTeam/) (https://shopee.vn/M%E1%BA%A1ch-b%C3%A0n-ph%C3%ADm-Canary60RGB-PCB-Layout-60--i.196623820.5093520199) * Hardware Availability: [CanaryTeam](https://www.facebook.com/CanaryTeam/), [Shopee](https://shopee.vn/search?keyword=canary60rgb)
* To reset the board into bootloader mode: press Reset hardware button or hold FN + Backslash (layer 1 RESET key) * To reset the board into bootloader mode: press Reset hardware button or hold FN + Backslash (layer 1 RESET key)

3
keyboards/canary/canary60rgb/v1/config.h
View File

@ -55,7 +55,7 @@
# define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE # define RGBLIGHT_EFFECT_TWINKLE
# define RGBLED_NUM 12 # define RGBLED_NUM 20
# define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_VAL_STEP 8
@ -88,7 +88,6 @@
# define DISABLE_RGB_MATRIX_MULTISPLASH # define DISABLE_RGB_MATRIX_MULTISPLASH
# define DISABLE_RGB_MATRIX_SOLID_SPLASH # define DISABLE_RGB_MATRIX_SOLID_SPLASH
# define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH # define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define DISABLE_RGB_MATRIX_DIGITAL_RAIN
# define DRIVER_ADDR_1 0b1010000 # define DRIVER_ADDR_1 0b1010000
# define DRIVER_COUNT 1 # define DRIVER_COUNT 1
# define DRIVER_LED_TOTAL 63 # define DRIVER_LED_TOTAL 63

4
keyboards/canary/canary60rgb/v1/rules.mk
View File

@ -8,7 +8,7 @@ BOOTLOADER = atmel-dfu
# change yes to no to disable # change yes to no to disable
# #
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration COMMAND_ENABLE = no # Commands for debug and configuration
@ -17,7 +17,7 @@ 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 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = yes # USB Nkey Rollover NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes # Use RGB matrix RGB_MATRIX_ENABLE = yes # Use RGB matrix
RGB_MATRIX_DRIVER = IS31FL3733 RGB_MATRIX_DRIVER = IS31FL3733