Skip to content

Commit

Permalink
Merge pull request #3 from puterjam/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@puterjam
puterjam authored Dec 30, 2022
2 parents 553e96b + 0469882 commit 343e31a
Show file tree
Hide file tree
Showing 63 changed files with 1,334 additions and 600 deletions.
15 changes: 7 additions & 8 deletions builddefs/common_features.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -613,23 +613,22 @@ ifeq ($(strip $(LED_TABLES)), yes)
endif

ifeq ($(strip $(SIGNALRGB_SUPPORT_ENABLE)), yes)
HIDRGB_ENABLE := yes
GEEKRGB_ENABLE := yes
SRC += $(QUANTUM_DIR)/signalrgb.c
OPT_DEFS += -DSIGNALRGB_SUPPORT_ENABLE
endif

ifeq ($(strip $(OPENRGB_ENABLE)), yes)
HIDRGB_ENABLE := yes
GEEKRGB_ENABLE := yes
SRC += $(QUANTUM_DIR)/openrgb.c
OPT_DEFS += -DOPENRGB_ENABLE
endif

ifeq ($(strip $(HIDRGB_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/hidrgb.c
OPT_DEFS += -DHIDRGB_ENABLE
ifeq ($(strip $(GEEKRGB_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/geekrgb.c
OPT_DEFS += -DGEEKRGB_ENABLE
endif


ifeq ($(strip $(VIA_ENABLE)), yes)
DYNAMIC_KEYMAP_ENABLE := yes
RAW_ENABLE := yes
Expand Down Expand Up @@ -800,8 +799,8 @@ ifeq ($(strip $(UNICODE_COMMON)), yes)
OPT_DEFS += -DUNICODE_COMMON_ENABLE
COMMON_VPATH += $(QUANTUM_DIR)/unicode
SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c \
$(QUANTUM_DIR)/unicode/unicode.c \
$(QUANTUM_DIR)/utf8.c
$(QUANTUM_DIR)/unicode/unicode.c \
$(QUANTUM_DIR)/unicode/utf8.c
endif

MAGIC_ENABLE ?= yes
Expand Down
3 changes: 2 additions & 1 deletion builddefs/show_options.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ BUILD_OPTION_NAMES = \
DYNAMIC_KEYMAP_ENABLE \
USB_HID_ENABLE \
VIA_ENABLE \
OPENRGB_ENABLE
OPENRGB_ENABLE \
SIGNALRGB_SUPPORT_ENABLE

HARDWARE_OPTION_NAMES = \
SLEEP_LED_ENABLE \
Expand Down
12 changes: 8 additions & 4 deletions keyboards/keychron/q1/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
/* Disable DIP switch in matrix data */
#define MATRIX_MASKED

/* Disable RGB lighting when PC is in suspend */
#define RGB_DISABLE_WHEN_USB_SUSPENDED

// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
Expand Down Expand Up @@ -80,8 +77,15 @@
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES

#define HIDRGB_USE_UNIVERSAL_BRIGHTNESS
#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // Disable RGB lighting when PC is in suspend
# undef RGB_DISABLE_TIMEOUT
# define RGB_DISABLE_TIMEOUT 900000 // 15 minutes (15 * 60 * 1000ms)
#endif

/* GEEKRGB config */
#define GEEKRGB_USE_UNIVERSAL_BRIGHTNESS
#define GEEKRGB_WELCOME_ANIM_SPD 170
#define OPENRGB_DEFAULT_KEYMAP_ID 2 //read windows keymap for openrgb

/* Enable receive custom command from host */
Expand Down
108 changes: 108 additions & 0 deletions keyboards/keychron/q1/q1_ansi_stm32l432/keymaps/geekrgb/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
/* Copyright 2021 @ Keychron (https://www.keychron.com)
*
* 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

// clang-format off
enum custom_keycodes {
#ifdef VIA_ENABLE
KC_GEEKRGB_MODE = USER00,
#else
KC_GEEKRGB_MODE = SAFE_RANGE,
#endif
KC_MISSION_CONTROL,
KC_LAUNCHPAD
};

#define KC_GR_MO KC_GEEKRGB_MODE
#define KC_MCTL KC_MISSION_CONTROL
#define KC_LPAD KC_LAUNCHPAD

#define KC_TASK LGUI(KC_TAB)
#define KC_FLXP LGUI(KC_E)

enum layers{
MAC_BASE,
MAC_FN,
WIN_BASE,
WIN_FN
};

#define KC_TASK LGUI(KC_TAB)
#define KC_FLXP LGUI(KC_E)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_ansi_82(
KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_INS,
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_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_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_HOME,
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_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[MAC_FN] = LAYOUT_ansi_82(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),

[WIN_BASE] = LAYOUT_ansi_82(
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_DEL, KC_INS,
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_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_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_HOME,
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_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[WIN_FN] = LAYOUT_ansi_82(
_______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case KC_GEEKRGB_MODE:
if (record->event.pressed) {
rgb_matrix_mode(RGB_MATRIX_GEEKRGB);
geekrgb_reload_openrgb_anim();
}
return false;

case KC_MISSION_CONTROL:
if (record->event.pressed) {
host_consumer_send(0x29F);
} else {
host_consumer_send(0);
}
return false;
case KC_LAUNCHPAD:
if (record->event.pressed) {
host_consumer_send(0x2A0);
} else {
host_consumer_send(0);
}
return false;

default:
return true;
}
}
3 changes: 3 additions & 0 deletions keyboards/keychron/q1/q1_ansi_stm32l432/keymaps/geekrgb/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
OPENRGB_ENABLE = yes
SIGNALRGB_SUPPORT_ENABLE = yes
VIA_ENABLE = yes
1 change: 0 additions & 1 deletion keyboards/keychron/q1/q1_ansi_stm32l432/keymaps/keychron/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
OPENRGB_ENABLE = yes
VIA_ENABLE = yes

VPATH += keyboards/keychron/common
Expand Down
1 change: 0 additions & 1 deletion keyboards/keychron/q1/q1_ansi_stm32l432/keymaps/via/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
OPENRGB_ENABLE = yes
VIA_ENABLE = yes
2 changes: 1 addition & 1 deletion keyboards/keychron/q1/q1_ansi_stm32l432_ec11/info.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"keyboard_name": "Keychron Q1",
"keyboard_name": "Keychron Q1 Knob",
"manufacturer": "Keychron",
"url": "https://github.com/Keychron",
"maintainer": "lalalademaxiya1",
Expand Down
120 changes: 120 additions & 0 deletions keyboards/keychron/q1/q1_ansi_stm32l432_ec11/keymaps/geekrgb/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
/* Copyright 2021 @ Keychron (https://www.keychron.com)
*
* 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

// clang-format off
enum custom_keycodes {
#ifdef VIA_ENABLE
KC_GEEKRGB_MODE = USER00,
#else
KC_GEEKRGB_MODE = SAFE_RANGE,
#endif
KC_MISSION_CONTROL,
KC_LAUNCHPAD
};

#define KC_GR_MO KC_GEEKRGB_MODE
#define KC_MCTL KC_MISSION_CONTROL
#define KC_LPAD KC_LAUNCHPAD

#define KC_TASK LGUI(KC_TAB)
#define KC_FLXP LGUI(KC_E)

enum layers{
MAC_BASE,
MAC_FN,
WIN_BASE,
WIN_FN
};

#define KC_TASK LGUI(KC_TAB)
#define KC_FLXP LGUI(KC_E)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_ansi_82(
KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_MUTE,
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_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_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_HOME,
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_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[MAC_FN] = LAYOUT_ansi_82(
_______, 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_GR_MO,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),

[WIN_BASE] = LAYOUT_ansi_82(
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_DEL, KC_MUTE,
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_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_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_HOME,
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_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[WIN_FN] = LAYOUT_ansi_82(
_______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_GR_MO,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};

// clang-format on

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
[WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
};
#endif // ENCODER_MAP_ENABLE


bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case KC_GEEKRGB_MODE:
if (record->event.pressed) {
rgb_matrix_mode(RGB_MATRIX_GEEKRGB);
geekrgb_reload_openrgb_anim();
}
return false;

case KC_MISSION_CONTROL:
if (record->event.pressed) {
host_consumer_send(0x29F);
} else {
host_consumer_send(0);
}
return false;
case KC_LAUNCHPAD:
if (record->event.pressed) {
host_consumer_send(0x2A0);
} else {
host_consumer_send(0);
}
return false;

default:
return true;
}
}
4 changes: 4 additions & 0 deletions keyboards/keychron/q1/q1_ansi_stm32l432_ec11/keymaps/geekrgb/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
OPENRGB_ENABLE = yes
SIGNALRGB_SUPPORT_ENABLE = yes
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
1 change: 0 additions & 1 deletion keyboards/keychron/q1/q1_ansi_stm32l432_ec11/keymaps/keychron/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
OPENRGB_ENABLE = yes
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes

Expand Down
1 change: 0 additions & 1 deletion keyboards/keychron/q1/q1_ansi_stm32l432_ec11/keymaps/via/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
OPENRGB_ENABLE = yes
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
Loading

0 comments on commit 343e31a

Please sign in to comment.