-
-
Notifications
You must be signed in to change notification settings - Fork 39.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into develop
Conflicts: keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
- Loading branch information
Showing
35 changed files
with
3,370 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* Copyright 2021 Salmon Cat Studio | ||
| * | ||
| * 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 0xCA75 | ||
| #define PRODUCT_ID 0x4014 | ||
| #define DEVICE_VER 0x0001 | ||
| #define MANUFACTURER Salmon Cat Studio | ||
| #define PRODUCT Aozora | ||
|
|
||
| /* key matrix size */ | ||
| #define MATRIX_ROWS 5 | ||
| #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 { F6, F5, F4, F1, F0 } | ||
| #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D4, D6, D7, B4, B5, B6, C6, C7, F7 } | ||
|
|
||
| #define DIODE_DIRECTION COL2ROW |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| /* Copyright 2021 Salmon Cat Studio | ||
| * | ||
| * 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 "hotswap.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* Copyright 2021 Salmon Cat Studio | ||
| * | ||
| * 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 LAYOUT( \ | ||
| K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ | ||
| K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ | ||
| K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ | ||
| K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3D, K3E, K3F, \ | ||
| K40, K41, K42, K44, K48, K49, K4A, K4D, K4E, K4F \ | ||
| ) { \ | ||
| { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ | ||
| { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ | ||
| { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, KC_NO }, \ | ||
| { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, KC_NO, K3D, K3E, K3F }, \ | ||
| { K40, K41, K42, KC_NO, K44, KC_NO, KC_NO, KC_NO, K48, K49, K4A, KC_NO, KC_NO, K4D, K4E, K4F }, \ | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| { | ||
| "keyboard_name": "Aozora", | ||
| "url": "https://salmoncat.studio/pages/aozora-%E9%9D%92%E7%A9%BA-6-9-21-7-10-21", | ||
| "maintainer": "Food", | ||
| "width": 17.25, | ||
| "height": 5, | ||
| "layouts": { | ||
| "LAYOUT": { | ||
| "layout": [ | ||
| {"label":"K00 (F6,B0)", "x":0, "y":0}, | ||
| {"label":"K01 (F6,B1)", "x":1, "y":0}, | ||
| {"label":"K02 (F6,B2)", "x":2, "y":0}, | ||
| {"label":"K03 (F6,B3)", "x":3, "y":0}, | ||
| {"label":"K04 (F6,B7)", "x":4, "y":0}, | ||
| {"label":"K05 (F6,D0)", "x":5, "y":0}, | ||
| {"label":"K06 (F6,D1)", "x":6, "y":0}, | ||
| {"label":"K07 (F6,D4)", "x":7, "y":0}, | ||
| {"label":"K08 (F6,D6)", "x":8, "y":0}, | ||
| {"label":"K09 (F6,D7)", "x":9, "y":0}, | ||
| {"label":"K0A (F6,B4)", "x":10, "y":0}, | ||
| {"label":"K0B (F6,B5)", "x":11, "y":0}, | ||
| {"label":"K0C (F6,B6)", "x":12, "y":0}, | ||
| {"label":"K0D (F6,C6)", "x":13, "y":0, "w":2}, | ||
| {"label":"K0E (F6,C7)", "x":15.25, "y":0}, | ||
| {"label":"K0F (F6,F7)", "x":16.25, "y":0}, | ||
| {"label":"K10 (F5,B0)", "x":0, "y":1, "w":1.5}, | ||
| {"label":"K11 (F5,B1)", "x":1.5, "y":1}, | ||
| {"label":"K12 (F5,B2)", "x":2.5, "y":1}, | ||
| {"label":"K13 (F5,B3)", "x":3.5, "y":1}, | ||
| {"label":"K14 (F5,B7)", "x":4.5, "y":1}, | ||
| {"label":"K15 (F5,D0)", "x":5.5, "y":1}, | ||
| {"label":"K16 (F5,D1)", "x":6.5, "y":1}, | ||
| {"label":"K17 (F5,D4)", "x":7.5, "y":1}, | ||
| {"label":"K18 (F5,D6)", "x":8.5, "y":1}, | ||
| {"label":"K19 (F5,D7)", "x":9.5, "y":1}, | ||
| {"label":"K1A (F5,B4)", "x":10.5, "y":1}, | ||
| {"label":"K1B (F5,B5)", "x":11.5, "y":1}, | ||
| {"label":"K1C (F5,B6)", "x":12.5, "y":1}, | ||
| {"label":"K1D (F5,C6)", "x":13.5, "y":1, "w":1.5}, | ||
| {"label":"K1E (F5,C7)", "x":15.25, "y":1}, | ||
| {"label":"K1F (F5,F7)", "x":16.25, "y":1}, | ||
| {"label":"K20 (F4,B0)", "x":0, "y":2, "w":1.75}, | ||
| {"label":"K21 (F4,B1)", "x":1.75, "y":2}, | ||
| {"label":"K22 (F4,B2)", "x":2.75, "y":2}, | ||
| {"label":"K23 (F4,B3)", "x":3.75, "y":2}, | ||
| {"label":"K24 (F4,B7)", "x":4.75, "y":2}, | ||
| {"label":"K25 (F4,D0)", "x":5.75, "y":2}, | ||
| {"label":"K26 (F4,D1)", "x":6.75, "y":2}, | ||
| {"label":"K27 (F4,D4)", "x":7.75, "y":2}, | ||
| {"label":"K28 (F4,D6)", "x":8.75, "y":2}, | ||
| {"label":"K29 (F4,D7)", "x":9.75, "y":2}, | ||
| {"label":"K2A (F4,B4)", "x":10.75, "y":2}, | ||
| {"label":"K2B (F4,B5)", "x":11.75, "y":2}, | ||
| {"label":"K2D (F4,C6)", "x":12.75, "y":2, "w":2.25}, | ||
| {"label":"K30 (F1,B0)", "x":0, "y":3, "w":2.25}, | ||
| {"label":"K31 (F1,B1)", "x":2.25, "y":3}, | ||
| {"label":"K32 (F1,B2)", "x":3.25, "y":3}, | ||
| {"label":"K33 (F1,B3)", "x":4.25, "y":3}, | ||
| {"label":"K34 (F1,B7)", "x":5.25, "y":3}, | ||
| {"label":"K35 (F1,D0)", "x":6.25, "y":3}, | ||
| {"label":"K36 (F1,D1)", "x":7.25, "y":3}, | ||
| {"label":"K37 (F1,D4)", "x":8.25, "y":3}, | ||
| {"label":"K38 (F1,D6)", "x":9.25, "y":3}, | ||
| {"label":"K39 (F1,D7)", "x":10.25, "y":3}, | ||
| {"label":"K3A (F1,B4)", "x":11.25, "y":3}, | ||
| {"label":"K3D (F1,C6)", "x":12.25, "y":3, "w":2.75}, | ||
| {"label":"K3E (F1,C7)", "x":15.25, "y":3}, | ||
| {"label":"K3F (F1,F7)", "x":16.25, "y":3}, | ||
| {"label":"K40 (F0,B0)", "x":0, "y":4, "w":1.25}, | ||
| {"label":"K41 (F0,B1)", "x":1.25, "y":4, "w":1.25}, | ||
| {"label":"K42 (F0,B2)", "x":2.5, "y":4, "w":1.25}, | ||
| {"label":"K44 (F0,B7)", "x":3.75, "y":4, "w":6.25}, | ||
| {"label":"K48 (F0,D6)", "x":10, "y":4, "w":1.25}, | ||
| {"label":"K49 (F0,D7)", "x":11.25, "y":4, "w":1.25}, | ||
| {"label":"K4A (F0,B4)", "x":12.5, "y":4, "w":1.25}, | ||
| {"label":"K4D (F0,C6)", "x":14.25, "y":4}, | ||
| {"label":"K4E (F0,C7)", "x":15.25, "y":4}, | ||
| {"label":"K4F (F0,F7)", "x":16.25, "y":4} | ||
| ] | ||
| } | ||
| } | ||
| ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* Copyright 2021 Salmon Cat Studio | ||
| * | ||
| * 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_PSCR, KC_PGUP, | ||
| 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_DEL, KC_PGDN, | ||
| 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, KC_SLSH, KC_LSFT, KC_UP, MO(1), | ||
| KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, KC_LCTL, 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_F13, KC_F14, KC_F15, | ||
| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| ), | ||
|
|
||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # Aozora | ||
|
|
||
| A 65%-Style 6-Key keyboard featuring a cloud-shaped badge. | ||
|
|
||
|  | ||
|
|
||
| * Keyboard Maintainer: [Food](https://github.com/Phooood) | ||
| * Hardware Supported: [Aozora](https://salmoncat.studio/pages/aozora-%E9%9D%92%E7%A9%BA-6-9-21-7-10-21) | ||
| * Hardware Availability: [salmoncat.studio](https://salmoncat.studio/pages/aozora-%E9%9D%92%E7%A9%BA-6-9-21-7-10-21) | GB is over. | ||
|
|
||
| Make example for this keyboard (after setting up your build environment): | ||
|
|
||
| make aozora/hotswap:default | ||
|
|
||
| To reset, press the button on the back of the PCB. | ||
|
|
||
| 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). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # MCU name | ||
| MCU = atmega32u4 | ||
|
|
||
| # Bootloader selection | ||
| BOOTLOADER = atmel-dfu | ||
|
|
||
| # Build Options | ||
| # change yes to no to disable | ||
| # | ||
| BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | ||
| MOUSEKEY_ENABLE = yes # Mouse keys | ||
| EXTRAKEY_ENABLE = yes # Audio control and System control | ||
| CONSOLE_ENABLE = yes # Console for debug | ||
| COMMAND_ENABLE = yes # 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 = no # USB Nkey Rollover | ||
| BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | ||
| RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | ||
| BLUETOOTH_ENABLE = no # Enable Bluetooth | ||
| AUDIO_ENABLE = no # Audio output | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,19 @@ | ||
| /* Copyright 2021 DZTECH <[email protected]> | ||
| * | ||
| * 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 "mkiirgb.h" | ||
| #ifdef RGB_MATRIX_ENABLE | ||
| const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,26 @@ | ||
| /* Copyright 2021 DZTECH <[email protected]> | ||
| * | ||
| * 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 | ||
| #define XXX KC_NO | ||
|
|
||
| #if defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v1) | ||
| #include "v1.h" | ||
| #elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v2) | ||
| #include "v2.h" | ||
| #elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v3) | ||
| #include "v3.h" | ||
| #endif | ||
| #include "quantum.h" | ||
| #define LAYOUT_65_ansi_blocker( \ | ||
| 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, K2D, K2E, \ | ||
| K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ | ||
| K40, K41, K42, K45, K48, K4A, K4B, 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, XXX, K2D, K2E }, \ | ||
| { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \ | ||
| { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, XXX, K4A, K4B, XXX, K4D, K4E } \ | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Oops, something went wrong.