Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add funtions of Encoder and VIA for redragon/k667 #21917

Merged
merged 27 commits into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b3a1c0a
Initial commit to add redragon/k667
Jun 30, 2023
1a075e2
Update keyboards/redragon/k667/config.h
temp4gh Jun 30, 2023
b17c46b
Update keyboards/redragon/k667/info.json
temp4gh Jun 30, 2023
2df63e9
Modify the information of the keyboard.
Jun 30, 2023
0a0ab3d
Update keyboards/redragon/k667/info.json
temp4gh Jul 1, 2023
5e5644c
Update keyboards/redragon/k667/k667.c
temp4gh Jul 1, 2023
04a90e5
Update keyboards/redragon/k667/k667.c
temp4gh Jul 1, 2023
1f0f372
Update keyboards/redragon/k667/readme.md
temp4gh Jul 1, 2023
cdb517e
Update keyboards/redragon/k667/readme.md
temp4gh Jul 1, 2023
38897f4
Modify 'LAYOUT_75_ansi' to 'LAYOUT' and remove community layout support.
temp4gh Jul 1, 2023
03f69f4
Reformat the json file and trailing whitespace removed.
temp4gh Jul 1, 2023
6161170
Reformat the json file according to format-json results.
temp4gh Jul 1, 2023
45815aa
Merge branch 'qmk:master' into redragon_dev
temp4gh Jul 13, 2023
e1a9cb4
Merge branch 'qmk:master' into redragon_dev
temp4gh Aug 28, 2023
84848cd
Sync the QMK version and update the VID and PID to authorized content.
temp4gh Aug 28, 2023
3de6f6c
Merge branch 'qmk:master' into redragon_dev
temp4gh Aug 30, 2023
54a17a7
Modify rgb_matrix driver contents to low case.
temp4gh Aug 30, 2023
77639f1
1.Add function for Encoder
temp4gh Sep 5, 2023
db71312
Merge branch 'master' into redragon_dev
temp4gh Sep 5, 2023
00f31df
Update keyboards/redragon/k667/info.json
temp4gh Sep 6, 2023
1f99554
Update keyboards/redragon/k667/info.json
temp4gh Sep 6, 2023
28915e9
Remove via in keyboards/redragon/k667/info.json
temp4gh Sep 6, 2023
d437ae8
Remove encoder_map in keyboards/redragon/k667/info.json
temp4gh Sep 6, 2023
b30075f
Use NUM_DIRECTIONS keyboards/redragon/k667/keymaps/default/keymap.c
temp4gh Sep 6, 2023
e8fb2f0
Use NUM_DIRECTIONS in keyboards/redragon/k667/keymaps/via/keymap.c
temp4gh Sep 6, 2023
5e1a8ba
Add rules.mk for via
temp4gh Sep 6, 2023
280865b
Add rules.mk for default
temp4gh Sep 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions keyboards/redragon/k667/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@
"processor": "STM32F103",
"rgb_matrix": {
"animations": {
"alphas_mods": true,
"solid_color": true,
"band_sat": true,
"band_spiral_val": true,
"band_spiral_sat": true,
"band_val": true,
"breathing": true,
"cycle_all": true,
Expand All @@ -42,7 +43,7 @@
"gradient_left_right": true,
"gradient_up_down": true,
"hue_wave": true,
"pixel_flow": true
"pixel_fractal": true
},
"driver": "is31fl3733",
"layout": [
Expand Down
7 changes: 7 additions & 0 deletions keyboards/redragon/k667/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ enum layer_names
_FnLay,
};

#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_FnLay] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
};
#endif

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT(
KC_ESC, 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_END,
Expand Down
1 change: 1 addition & 0 deletions keyboards/redragon/k667/keymaps/default/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes
49 changes: 49 additions & 0 deletions keyboards/redragon/k667/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/* Copyright 2023 temp4gh
*
* 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 layer_names
{
_BASE,
_FnLay,
};

#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_FnLay] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
};
#endif

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT(
KC_ESC, 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_END,
KC_GRV, 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_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_DEL,
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_PGUP,
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, KC_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FnLay), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
),
[_FnLay] = LAYOUT(
QK_BOOT, KC_MY_COMPUTER, KC_WWW_HOME, KC_CALCULATOR, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, _______, XXXXXXX, RGB_SPD, RGB_VAD, RGB_SPI
)
};
2 changes: 2 additions & 0 deletions keyboards/redragon/k667/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes