Updated q5 pro
This commit is contained in:
parent
9d185f8c6d
commit
c95fb11c98
13 changed files with 21 additions and 19 deletions
|
|
@ -42,6 +42,7 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
|
||||||
{0, L_5, J_5, K_5},
|
{0, L_5, J_5, K_5},
|
||||||
{0, L_6, J_6, K_6},
|
{0, L_6, J_6, K_6},
|
||||||
{0, L_7, J_7, K_7},
|
{0, L_7, J_7, K_7},
|
||||||
|
// {0, L_8, J_8, K_8}, // Knob
|
||||||
|
|
||||||
{0, C_1, A_1, B_1},
|
{0, C_1, A_1, B_1},
|
||||||
{0, C_2, A_2, B_2},
|
{0, C_2, A_2, B_2},
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,8 @@
|
||||||
# define DRIVER_COUNT 2
|
# define DRIVER_COUNT 2
|
||||||
# define DRIVER_ADDR_1 0b1110111
|
# define DRIVER_ADDR_1 0b1110111
|
||||||
# define DRIVER_ADDR_2 0b1110100
|
# define DRIVER_ADDR_2 0b1110100
|
||||||
|
|
||||||
|
/* RGB Matrix Configuration */
|
||||||
# define DRIVER_1_LED_TOTAL 55
|
# define DRIVER_1_LED_TOTAL 55
|
||||||
# define DRIVER_2_LED_TOTAL 46
|
# define DRIVER_2_LED_TOTAL 46
|
||||||
# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
|
# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
|
||||||
|
|
@ -34,16 +36,18 @@
|
||||||
/* Turn off backllit if brightness value is low */
|
/* Turn off backllit if brightness value is low */
|
||||||
# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48
|
# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48
|
||||||
|
|
||||||
/* Indication led */
|
/* Indication led index */
|
||||||
# define NUM_LOCK_INDEX 32
|
# define NUM_LOCK_INDEX 32
|
||||||
# define CAPS_LOCK_INDEX 55
|
# define CAPS_LOCK_INDEX 55
|
||||||
# define LOW_BAT_IND_INDEX 92
|
# define LOW_BAT_IND_INDEX 92
|
||||||
|
|
||||||
|
// RGB Matrix Animation modes. Explicitly enabled
|
||||||
|
// For full list of effects, see:
|
||||||
|
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
|
||||||
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||||
# define RGB_MATRIX_KEYPRESSES
|
# define RGB_MATRIX_KEYPRESSES
|
||||||
|
|
||||||
/* Set LED driver current */
|
/* Set LED driver current */
|
||||||
# define CKLED2001_CURRENT_TUNE \
|
# define CKLED2001_CURRENT_TUNE \
|
||||||
{ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
|
{ 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30 }
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
#include QMK_KEYBOARD_H
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
// clang-format off
|
|
||||||
enum layers{
|
enum layers{
|
||||||
MAC_BASE,
|
MAC_BASE,
|
||||||
MAC_FN,
|
MAC_FN,
|
||||||
|
|
@ -24,6 +23,7 @@ enum layers{
|
||||||
WIN_FN,
|
WIN_FN,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[MAC_BASE] = LAYOUT_102_ansi(
|
[MAC_BASE] = LAYOUT_102_ansi(
|
||||||
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_F13, KC_F14, KC_F15, KC_MUTE,
|
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_F13, KC_F14, KC_F15, KC_MUTE,
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
#include QMK_KEYBOARD_H
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
// clang-format off
|
|
||||||
enum layers{
|
enum layers{
|
||||||
MAC_BASE,
|
MAC_BASE,
|
||||||
MAC_FN,
|
MAC_FN,
|
||||||
|
|
@ -24,6 +23,7 @@ enum layers{
|
||||||
WIN_FN,
|
WIN_FN,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[MAC_BASE] = LAYOUT_102_ansi(
|
[MAC_BASE] = LAYOUT_102_ansi(
|
||||||
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_F13, KC_F14, KC_F15, KC_MUTE,
|
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_F13, KC_F14, KC_F15, KC_MUTE,
|
||||||
|
|
|
||||||
|
|
@ -80,9 +80,6 @@
|
||||||
#define FEE_DENSITY_BYTES FEE_PAGE_SIZE
|
#define FEE_DENSITY_BYTES FEE_PAGE_SIZE
|
||||||
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
|
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
|
||||||
|
|
||||||
/* Old default behavior of mod-taps */
|
|
||||||
#define HOLD_ON_OTHER_KEY_PRESS
|
|
||||||
|
|
||||||
/* Factory test keys */
|
/* Factory test keys */
|
||||||
#define FN_KEY1 MO(1)
|
#define FN_KEY1 MO(1)
|
||||||
#define FN_KEY2 MO(3)
|
#define FN_KEY2 MO(3)
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,8 @@
|
||||||
# define DRIVER_COUNT 2
|
# define DRIVER_COUNT 2
|
||||||
# define DRIVER_ADDR_1 0b1110111
|
# define DRIVER_ADDR_1 0b1110111
|
||||||
# define DRIVER_ADDR_2 0b1110100
|
# define DRIVER_ADDR_2 0b1110100
|
||||||
|
|
||||||
|
/* RGB Matrix Configuration */
|
||||||
# define DRIVER_1_LED_TOTAL 55
|
# define DRIVER_1_LED_TOTAL 55
|
||||||
# define DRIVER_2_LED_TOTAL 47
|
# define DRIVER_2_LED_TOTAL 47
|
||||||
# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
|
# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
|
||||||
|
|
@ -34,16 +36,18 @@
|
||||||
/* Turn off backllit if brightness value is low */
|
/* Turn off backllit if brightness value is low */
|
||||||
# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48
|
# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48
|
||||||
|
|
||||||
/* Indication led */
|
/* Indication led index */
|
||||||
# define NUM_LOCK_INDEX 32
|
# define NUM_LOCK_INDEX 32
|
||||||
# define CAPS_LOCK_INDEX 54
|
# define CAPS_LOCK_INDEX 54
|
||||||
# define LOW_BAT_IND_INDEX 93
|
# define LOW_BAT_IND_INDEX 93
|
||||||
|
|
||||||
|
// RGB Matrix Animation modes. Explicitly enabled
|
||||||
|
// For full list of effects, see:
|
||||||
|
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
|
||||||
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||||
# define RGB_MATRIX_KEYPRESSES
|
# define RGB_MATRIX_KEYPRESSES
|
||||||
|
|
||||||
/* Set LED driver current */
|
/* Set LED driver current */
|
||||||
# define CKLED2001_CURRENT_TUNE \
|
# define CKLED2001_CURRENT_TUNE \
|
||||||
{ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
|
{ 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30 }
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
|
||||||
{0, L_5, J_5, K_5},
|
{0, L_5, J_5, K_5},
|
||||||
{0, L_6, J_6, K_6},
|
{0, L_6, J_6, K_6},
|
||||||
{0, L_7, J_7, K_7},
|
{0, L_7, J_7, K_7},
|
||||||
|
// {0, L_8, J_8, K_8}, // Knob
|
||||||
|
|
||||||
{0, C_1, A_1, B_1},
|
{0, C_1, A_1, B_1},
|
||||||
{0, C_2, A_2, B_2},
|
{0, C_2, A_2, B_2},
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
#include QMK_KEYBOARD_H
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
// clang-format off
|
|
||||||
enum layers{
|
enum layers{
|
||||||
MAC_BASE,
|
MAC_BASE,
|
||||||
MAC_FN,
|
MAC_FN,
|
||||||
|
|
@ -24,6 +23,7 @@ enum layers{
|
||||||
WIN_FN,
|
WIN_FN,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[MAC_BASE] = LAYOUT_103_iso(
|
[MAC_BASE] = LAYOUT_103_iso(
|
||||||
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_F13, KC_F14, KC_F15, KC_MUTE,
|
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_F13, KC_F14, KC_F15, KC_MUTE,
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
#include QMK_KEYBOARD_H
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
// clang-format off
|
|
||||||
enum layers{
|
enum layers{
|
||||||
MAC_BASE,
|
MAC_BASE,
|
||||||
MAC_FN,
|
MAC_FN,
|
||||||
|
|
@ -24,6 +23,7 @@ enum layers{
|
||||||
WIN_FN,
|
WIN_FN,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[MAC_BASE] = LAYOUT_103_iso(
|
[MAC_BASE] = LAYOUT_103_iso(
|
||||||
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_F13, KC_F14, KC_F15, KC_MUTE,
|
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_F13, KC_F14, KC_F15, KC_MUTE,
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,6 @@
|
||||||
#undef STM32_I2C_USE_I2C1
|
#undef STM32_I2C_USE_I2C1
|
||||||
#define STM32_I2C_USE_I2C1 TRUE
|
#define STM32_I2C_USE_I2C1 TRUE
|
||||||
|
|
||||||
|
|
||||||
#ifdef KC_BLUETOOTH_ENABLE
|
#ifdef KC_BLUETOOTH_ENABLE
|
||||||
# undef STM32_SERIAL_USE_USART2
|
# undef STM32_SERIAL_USE_USART2
|
||||||
# define STM32_SERIAL_USE_USART2 TRUE
|
# define STM32_SERIAL_USE_USART2 TRUE
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,6 @@ void keyboard_post_init_kb(void) {
|
||||||
|
|
||||||
#ifdef KC_BLUETOOTH_ENABLE
|
#ifdef KC_BLUETOOTH_ENABLE
|
||||||
/* Currently we don't use this reset pin */
|
/* Currently we don't use this reset pin */
|
||||||
// palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_UNCONNECTED);
|
|
||||||
palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL);
|
palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL);
|
||||||
palWriteLine(CKBT51_RESET_PIN, PAL_HIGH);
|
palWriteLine(CKBT51_RESET_PIN, PAL_HIGH);
|
||||||
|
|
||||||
|
|
@ -198,7 +197,6 @@ void matrix_scan_kb(void) {
|
||||||
#ifdef KC_BLUETOOTH_ENABLE
|
#ifdef KC_BLUETOOTH_ENABLE
|
||||||
static void ckbt51_param_init(void) {
|
static void ckbt51_param_init(void) {
|
||||||
/* Set bluetooth device name */
|
/* Set bluetooth device name */
|
||||||
// ckbt51_set_local_name(STR(PRODUCT));
|
|
||||||
ckbt51_set_local_name(PRODUCT);
|
ckbt51_set_local_name(PRODUCT);
|
||||||
wait_ms(10);
|
wait_ms(10);
|
||||||
/* Set bluetooth parameters */
|
/* Set bluetooth parameters */
|
||||||
|
|
|
||||||
|
|
@ -51,5 +51,5 @@ enum {
|
||||||
BT_HST3 = KC_TRNS,
|
BT_HST3 = KC_TRNS,
|
||||||
BAT_LVL = KC_TRNS,
|
BAT_LVL = KC_TRNS,
|
||||||
#endif
|
#endif
|
||||||
NEW_SAFE_RANGE
|
NEW_SAFE_RANGE
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
|
||||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
|
||||||
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
|
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
|
||||||
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
|
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue