diff --git a/keyboards/keychron/v1_max/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v1_max/ansi_encoder/ansi_encoder.c index 6f62a01dba..128b784e04 100644 --- a/keyboards/keychron/v1_max/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/v1_max/ansi_encoder/ansi_encoder.c @@ -21,11 +21,11 @@ #ifdef RGB_MATRIX_ENABLE const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to SNLED27351 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ {0, G_1, I_1, H_1}, {0, G_2, I_2, H_2}, {0, G_3, I_3, H_3}, diff --git a/keyboards/keychron/v1_max/ansi_encoder/config.h b/keyboards/keychron/v1_max/ansi_encoder/config.h index 869c74a719..38c3b2ffba 100644 --- a/keyboards/keychron/v1_max/ansi_encoder/config.h +++ b/keyboards/keychron/v1_max/ansi_encoder/config.h @@ -18,28 +18,19 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix driver configuration */ -# define DRIVER_COUNT 2 # define RGB_MATRIX_LED_COUNT 81 - -# define SPI_SCK_PIN A5 -# define SPI_MISO_PIN A6 -# define SPI_MOSI_PIN A7 - +# define DRIVER_COUNT 2 # define DRIVER_CS_PINS \ { B8, B9 } -# define SNLED23751_SPI_DIVISOR 16 -# define SPI_DRIVER SPID1 /* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */ -# define PHASE_CHANNEL MSKPHASE_9CHANNEL - +# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL /* Set LED driver current */ # define SNLED27351_CURRENT_TUNE \ { 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C } /* Set to infinit, which is use in USB mode by default */ # define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE - /* Allow shutdown of led driver to save power */ # define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE /* Turn off backlight on low brightness to save power */ diff --git a/keyboards/keychron/v1_max/config.h b/keyboards/keychron/v1_max/config.h index 6c55a40889..d50eddd85a 100644 --- a/keyboards/keychron/v1_max/config.h +++ b/keyboards/keychron/v1_max/config.h @@ -1,4 +1,4 @@ -/* Copyright 2023 @ Keychron (https://www.keychron.com) +/* Copyright 2023 ~ 2024 @ 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 @@ -20,6 +20,19 @@ #define ENCODER_DEFAULT_POS 0x3 #define ENCODER_MAP_KEY_DELAY 2 +#if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) || defined(LK_WIRELESS_ENABLE) +/* SPI configuration */ +# define SPI_DRIVER SPID1 +# define SPI_SCK_PIN A5 +# define SPI_MISO_PIN A6 +# define SPI_MOSI_PIN A7 +#endif + +#if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) +# define LED_DRIVER_SHUTDOWN_PIN B7 +# define SNLED23751_SPI_DIVISOR 16 +#endif + #ifdef LK_WIRELESS_ENABLE /* Hardware configuration */ # define P2P4_MODE_SELECT_PIN A10 @@ -42,8 +55,6 @@ # if defined(RGB_MATRIX_ENABLE) -# define LED_DRIVER_SHUTDOWN_PIN B7 - /* Backlit disable timeout when keyboard is disconnected(unit: second) */ # define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40 @@ -60,12 +71,6 @@ /* Enable bluetooth NKRO */ # define WIRELESS_NKRO_ENABLE - -/* Raw hid command for factory test and bluetooth DFU */ -# define RAW_HID_CMD 0xAA ... 0xAB -#else -/* Raw hid command for factory test */ -# define RAW_HID_CMD 0xAB #endif /* Factory test keys */ diff --git a/keyboards/keychron/v1_max/iso_encoder/config.h b/keyboards/keychron/v1_max/iso_encoder/config.h index 30d79fbe3b..acc95cb24b 100644 --- a/keyboards/keychron/v1_max/iso_encoder/config.h +++ b/keyboards/keychron/v1_max/iso_encoder/config.h @@ -18,28 +18,19 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix driver configuration */ -# define DRIVER_COUNT 2 # define RGB_MATRIX_LED_COUNT 82 - -# define SPI_SCK_PIN A5 -# define SPI_MISO_PIN A6 -# define SPI_MOSI_PIN A7 - +# define DRIVER_COUNT 2 # define DRIVER_CS_PINS \ { B8, B9 } -# define SNLED23751_SPI_DIVISOR 16 -# define SPI_DRIVER SPID1 /* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */ -# define PHASE_CHANNEL MSKPHASE_9CHANNEL - +# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL /* Set LED driver current */ # define SNLED27351_CURRENT_TUNE \ { 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C } /* Set to infinit, which is use in USB mode by default */ # define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE - /* Allow shutdown of led driver to save power */ # define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE /* Turn off backlight on low brightness to save power */ diff --git a/keyboards/keychron/v1_max/iso_encoder/info.json b/keyboards/keychron/v1_max/iso_encoder/info.json index 9f865c65d1..575c491bd2 100644 --- a/keyboards/keychron/v1_max/iso_encoder/info.json +++ b/keyboards/keychron/v1_max/iso_encoder/info.json @@ -1,7 +1,7 @@ { "usb": { "pid": "0x0914", - "device_version": "1.0.0" + "device_version": "1.0.2" }, "features": { "encoder": true, diff --git a/keyboards/keychron/v1_max/iso_encoder/iso_encoder.c b/keyboards/keychron/v1_max/iso_encoder/iso_encoder.c index d3de9c4fb2..9e48b1424b 100644 --- a/keyboards/keychron/v1_max/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/v1_max/iso_encoder/iso_encoder.c @@ -21,11 +21,11 @@ #ifdef RGB_MATRIX_ENABLE const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to SNLED27351 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ {0, G_1, I_1, H_1}, {0, G_2, I_2, H_2}, {0, G_3, I_3, H_3}, @@ -130,7 +130,7 @@ led_config_t g_led_config = { { // LED Index to Physical Position {0, 0}, {18, 0}, {33, 0}, {48, 0}, {62, 0}, {81, 0}, {95, 0}, {110, 0}, {125, 0}, {143, 0}, {157, 0}, {172, 0}, {187, 0}, {205, 0}, - {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {117,15}, {132,15}, {146,15}, {161,15}, {176,15}, {198,15}, {224,15}, + {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {117,15}, {132,15}, {146,15}, {161,15}, {176,15}, {203,15}, {224,15}, {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {139,26}, {154,26}, {168,26}, {183,26}, {224,26}, {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {128,38}, {143,38}, {158,38}, {172,38}, {187,38}, {203,32}, {224,38}, {2,49}, {18,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {150,49}, {165,49}, {185,49}, {209,52}, diff --git a/keyboards/keychron/v1_max/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/v1_max/iso_encoder/keymaps/via/keymap.c index ad492f872a..3453026166 100644 --- a/keyboards/keychron/v1_max/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v1_max/iso_encoder/keymaps/via/keymap.c @@ -56,7 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) - }; // clang-format on