diff --git a/keyboards/keychron/k7_max/ansi/rgb/config.h b/keyboards/keychron/k7_max/ansi/rgb/config.h index 0ba2a9266a..2bc3cc711e 100644 --- a/keyboards/keychron/k7_max/ansi/rgb/config.h +++ b/keyboards/keychron/k7_max/ansi/rgb/config.h @@ -18,28 +18,19 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix driver configuration */ -# define DRIVER_COUNT 2 # define RGB_MATRIX_LED_COUNT 68 - -# 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 SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL - /* Set LED driver current */ # define SNLED27351_CURRENT_TUNE \ { 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14 } /* 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 */ @@ -48,10 +39,13 @@ /* Indications */ # define DIM_CAPS_LOCK # define CAPS_LOCK_INDEX 30 +# define BT_HOST_LED_MATRIX_LIST \ + { 16, 17, 18 } +# define P2P4G_HOST_LED_MATRIX_LIST \ + { 19 } # define LOW_BAT_IND_INDEX \ { 61 } # define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_FRAMEBUFFER_EFFECTS - #endif diff --git a/keyboards/keychron/k7_max/ansi/rgb/rgb.c b/keyboards/keychron/k7_max/ansi/rgb/rgb.c index a279422516..b7ffd01138 100644 --- a/keyboards/keychron/k7_max/ansi/rgb/rgb.c +++ b/keyboards/keychron/k7_max/ansi/rgb/rgb.c @@ -19,7 +19,7 @@ // clang-format off #ifdef RGB_MATRIX_ENABLE const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to snled27351manual for these locations +/* Refer to SNLED27351 manual for these locations * driver * | R location * | | G location @@ -112,19 +112,19 @@ led_config_t g_led_config = { }, { // LED Index to Physical Position - {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, { 90, 0}, {105, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {202, 0}, {224, 0}, - {4,16}, {22,16}, {37,16}, {52,16}, {67,16}, {82,16}, { 97,16}, {112,16}, {127,16}, {142,16}, {157,16}, {172,16}, {187,16}, {205,16}, {224,16}, - {6,32}, {26,32}, {41,32}, {56,32}, {71,32}, {86,32}, {101,32}, {116,32}, {131,32}, {146,32}, {161,32}, {175,32}, {200,32}, {224,32}, - {9,48}, {34,48}, {49,48}, {64,48}, {78,48}, { 93,48}, {108,48}, {123,48}, {138,48}, {153,48}, {168,48}, {189,48}, {209,48}, {224,48}, + {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, { 90, 0}, {105, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {202, 0}, {224, 0}, + {4,16}, {22,16}, {37,16}, {52,16}, {67,16}, {82,16}, { 97,16}, {112,16}, {127,16}, {142,16}, {157,16}, {172,16}, {187,16}, {205,16}, {224,16}, + {6,32}, {26,32}, {41,32}, {56,32}, {71,32}, {86,32}, {101,32}, {116,32}, {131,32}, {146,32}, {161,32}, {175,32}, {200,32}, {224,32}, + {9,48}, {34,48}, {49,48}, {64,48}, {78,48}, { 93,48}, {108,48}, {123,48}, {138,48}, {153,48}, {168,48}, {189,48}, {209,48}, {224,48}, {2,64}, {21,64}, {39,64}, { 95,64}, {149,64}, {164,64}, {179,64}, {194,64}, {209,64}, {224,64} }, { // RGB LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } }; #endif diff --git a/keyboards/keychron/k7_max/ansi/white/config.h b/keyboards/keychron/k7_max/ansi/white/config.h index 69d948ca2c..279a93a3bb 100644 --- a/keyboards/keychron/k7_max/ansi/white/config.h +++ b/keyboards/keychron/k7_max/ansi/white/config.h @@ -18,21 +18,13 @@ #ifdef LED_MATRIX_ENABLE /* LED matrix driver configuration */ -# define DRIVER_COUNT 1 # define LED_MATRIX_LED_COUNT 68 - -# define SPI_SCK_PIN A5 -# define SPI_MISO_PIN A6 -# define SPI_MOSI_PIN A7 - +# define DRIVER_COUNT 1 # define DRIVER_CS_PINS \ { B9 } -# define SNLED23751_SPI_DIVISOR 16 -# define SPI_DRIVER SPID1 /* Use first 6 channels of LED driver */ # define SNLED27351_PHASE_CHANNEL MSKPHASE_6CHANNEL - /* Set LED driver current */ # define SNLED27351_CURRENT_TUNE \ { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 } @@ -47,8 +39,13 @@ /* Indications */ # define DIM_CAPS_LOCK # define CAPS_LOCK_INDEX 30 +# define BT_HOST_LED_MATRIX_LIST \ + { 16, 17, 18 } +# define P2P4G_HOST_LED_MATRIX_LIST \ + { 19 } # define LOW_BAT_IND_INDEX \ - { 61 } + { 61 } +# define LED_MATRIX_VAL_STEP 16 # define LED_MATRIX_KEYPRESSES #endif diff --git a/keyboards/keychron/k7_max/ansi/white/white.c b/keyboards/keychron/k7_max/ansi/white/white.c index cab38c5cde..f2e49a7f50 100644 --- a/keyboards/keychron/k7_max/ansi/white/white.c +++ b/keyboards/keychron/k7_max/ansi/white/white.c @@ -110,19 +110,19 @@ led_config_t g_led_config = { }, { // LED Index to Physical Position - {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, { 90, 0}, {105, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {202, 0}, {224, 0}, - {4,16}, {22,16}, {37,16}, {52,16}, {67,16}, {82,16}, { 97,16}, {112,16}, {127,16}, {142,16}, {157,16}, {172,16}, {187,16}, {205,16}, {224,16}, - {6,32}, {26,32}, {41,32}, {56,32}, {71,32}, {86,32}, {101,32}, {116,32}, {131,32}, {146,32}, {161,32}, {175,32}, {200,32}, {224,32}, - {9,48}, {34,48}, {49,48}, {64,48}, {78,48}, { 93,48}, {108,48}, {123,48}, {138,48}, {153,48}, {168,48}, {189,48}, {209,48}, {224,48}, + {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, { 90, 0}, {105, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {202, 0}, {224, 0}, + {4,16}, {22,16}, {37,16}, {52,16}, {67,16}, {82,16}, { 97,16}, {112,16}, {127,16}, {142,16}, {157,16}, {172,16}, {187,16}, {205,16}, {224,16}, + {6,32}, {26,32}, {41,32}, {56,32}, {71,32}, {86,32}, {101,32}, {116,32}, {131,32}, {146,32}, {161,32}, {175,32}, {200,32}, {224,32}, + {9,48}, {34,48}, {49,48}, {64,48}, {78,48}, { 93,48}, {108,48}, {123,48}, {138,48}, {153,48}, {168,48}, {189,48}, {209,48}, {224,48}, {2,64}, {21,64}, {39,64}, { 95,64}, {149,64}, {164,64}, {179,64}, {194,64}, {209,64}, {224,64} }, { // RGB LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } }; #endif diff --git a/keyboards/keychron/k7_max/board.h b/keyboards/keychron/k7_max/board.h index 54fba748bf..2e3a8eb926 100644 --- a/keyboards/keychron/k7_max/board.h +++ b/keyboards/keychron/k7_max/board.h @@ -223,4 +223,3 @@ PIN_PUPDR_PULLUP(GPIOE_PIN13) | \ PIN_PUPDR_PULLUP(GPIOE_PIN14) | \ PIN_PUPDR_PULLUP(GPIOE_PIN15)) - diff --git a/keyboards/keychron/k7_max/config.h b/keyboards/keychron/k7_max/config.h index e137fbd348..fd4545394a 100644 --- a/keyboards/keychron/k7_max/config.h +++ b/keyboards/keychron/k7_max/config.h @@ -16,9 +16,18 @@ #pragma once -/* Caps lock LED */ -#define LED_CAPS_LOCK_PIN A13 -#define LED_PIN_ON_STATE 1 +#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 */ @@ -41,15 +50,6 @@ # define BT_HOST_DEVICES_COUNT 3 # if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) - -# define LED_DRIVER_SHUTDOWN_PIN B7 - -# define BT_HOST_LED_MATRIX_LIST \ - { 16, 17, 18 } - -# define P2P4G_HOST_LED_MATRIX_LIST \ - { 19 } - # define BAT_LEVEL_LED_LIST \ { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 } @@ -61,7 +61,6 @@ /* Reinit LED driver on tranport changed */ # define REINIT_LED_DRIVER 1 - # endif /* Keep USB connection in blueooth mode */ @@ -69,12 +68,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/k7_max/halconf.h b/keyboards/keychron/k7_max/halconf.h index 37bcc7c47b..be6b5564c0 100644 --- a/keyboards/keychron/k7_max/halconf.h +++ b/keyboards/keychron/k7_max/halconf.h @@ -22,9 +22,6 @@ #ifdef LK_WIRELESS_ENABLE # define HAL_USE_RTC TRUE -#endif - -#if defined(LK_WIRELESS_ENABLE) || defined(ENCODER_ENABLE) # define PAL_USE_CALLBACKS TRUE #endif diff --git a/keyboards/keychron/k7_max/info.json b/keyboards/keychron/k7_max/info.json index 4f0dc26bda..fb9fa181ef 100644 --- a/keyboards/keychron/k7_max/info.json +++ b/keyboards/keychron/k7_max/info.json @@ -25,6 +25,10 @@ "dip_switch": { "pins": ["B14"] }, + "indicators": { + "caps_lock": "A13", + "on_state": 1 + }, "eeprom": { "wear_leveling": { "driver": "embedded_flash", @@ -111,6 +115,162 @@ {"matrix": [4, 14], "x": 14, "y": 4}, {"matrix": [4, 15], "x": 15, "y": 4} ] + }, + "LAYOUT_iso_69": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} + ] + }, + "LAYOUT_jis_71": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3}, + {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 5}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} + ] } } diff --git a/keyboards/keychron/k7_max/iso/rgb/config.h b/keyboards/keychron/k7_max/iso/rgb/config.h new file mode 100644 index 0000000000..3a4160083a --- /dev/null +++ b/keyboards/keychron/k7_max/iso/rgb/config.h @@ -0,0 +1,53 @@ +/* Copyright 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 + * 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 . + */ + +#pragma once + +#ifdef RGB_MATRIX_ENABLE +/* RGB Matrix driver configuration */ +# define RGB_MATRIX_LED_COUNT 69 +# define DRIVER_COUNT 2 +# define DRIVER_CS_PINS \ + { B8, B9 } + +/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */ +# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL + +/* Set LED driver current */ +# define SNLED27351_CURRENT_TUNE \ + { 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14 } + +/* 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 */ +# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 + +/* Indications */ +# define DIM_CAPS_LOCK +# define CAPS_LOCK_INDEX 30 +# define BT_HOST_LED_MATRIX_LIST \ + { 16, 17, 18 } +# define P2P4G_HOST_LED_MATRIX_LIST \ + { 19 } +# define LOW_BAT_IND_INDEX \ + { 62 } + +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS + +#endif diff --git a/keyboards/keychron/k7_max/iso/rgb/info.json b/keyboards/keychron/k7_max/iso/rgb/info.json new file mode 100644 index 0000000000..314f6be806 --- /dev/null +++ b/keyboards/keychron/k7_max/iso/rgb/info.json @@ -0,0 +1,37 @@ +{ + "usb": { + "pid": "0x0A71", + "device_version": "1.0.0" + }, + "features": { + "rgb_matrix": true + }, + "rgb_matrix": { + "driver": "snled27351_spi", + "sleep": true, + "animations": { + "band_spiral_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "jellybean_raindrops": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_simple": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + } + } +} + diff --git a/keyboards/keychron/k7_max/iso/rgb/keymaps/default/keymap.c b/keyboards/keychron/k7_max/iso/rgb/keymaps/default/keymap.c new file mode 100644 index 0000000000..4aa29d8d89 --- /dev/null +++ b/keyboards/keychron/k7_max/iso/rgb/keymaps/default/keymap.c @@ -0,0 +1,72 @@ +/* Copyright 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 + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +enum layers{ + MAC_BASE, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2 +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[MAC_BASE] = LAYOUT_iso_69( + 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_DEL, + 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_HOME, + 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_NUHS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, 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_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[WIN_BASE] = LAYOUT_iso_69( + 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_DEL, + 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_HOME, + 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_NUHS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, 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(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[MAC_FN1] = LAYOUT_iso_69( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + 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_FN1] = LAYOUT_iso_69( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[FN2] = LAYOUT_iso_69( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +// clang-format on +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron_common(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/k7_max/iso/rgb/keymaps/via/keymap.c b/keyboards/keychron/k7_max/iso/rgb/keymaps/via/keymap.c new file mode 100644 index 0000000000..4aa29d8d89 --- /dev/null +++ b/keyboards/keychron/k7_max/iso/rgb/keymaps/via/keymap.c @@ -0,0 +1,72 @@ +/* Copyright 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 + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +enum layers{ + MAC_BASE, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2 +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[MAC_BASE] = LAYOUT_iso_69( + 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_DEL, + 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_HOME, + 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_NUHS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, 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_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[WIN_BASE] = LAYOUT_iso_69( + 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_DEL, + 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_HOME, + 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_NUHS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, 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(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[MAC_FN1] = LAYOUT_iso_69( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + 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_FN1] = LAYOUT_iso_69( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[FN2] = LAYOUT_iso_69( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +// clang-format on +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron_common(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/k7_max/iso/rgb/keymaps/via/rules.mk b/keyboards/keychron/k7_max/iso/rgb/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/keychron/k7_max/iso/rgb/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/keychron/k7_max/iso/rgb/rgb.c b/keyboards/keychron/k7_max/iso/rgb/rgb.c new file mode 100644 index 0000000000..385536e90c --- /dev/null +++ b/keyboards/keychron/k7_max/iso/rgb/rgb.c @@ -0,0 +1,131 @@ +/* Copyright 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 + * 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 "quantum.h" + +// clang-format off +#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 + * | | | | */ + {0, F_1, D_1, E_1}, + {0, F_2, D_2, E_2}, + {0, F_3, D_3, E_3}, + {0, F_4, D_4, E_4}, + {0, F_5, D_5, E_5}, + {0, F_6, D_6, E_6}, + {0, F_7, D_7, E_7}, + {0, F_8, D_8, E_8}, + {0, F_9, D_9, E_9}, + {0, F_10, D_10, E_10}, + {0, F_11, D_11, E_11}, + {0, F_12, D_12, E_12}, + {0, F_13, D_13, E_13}, + {0, F_14, D_14, E_14}, + {0, F_16, D_16, E_16}, + + {0, A_1, C_1, B_1}, + {0, A_2, C_2, B_2}, + {0, A_3, C_3, B_3}, + {0, A_4, C_4, B_4}, + {0, A_5, C_5, B_5}, + {0, A_6, C_6, B_6}, + {0, A_7, C_7, B_7}, + {0, A_8, C_8, B_8}, + {0, A_9, C_9, B_9}, + {0, A_10, C_10, B_10}, + {0, A_11, C_11, B_11}, + {0, A_12, C_12, B_12}, + {0, A_13, C_13, B_13}, + {0, A_14, C_14, B_14}, + {0, A_16, C_16, B_16}, + + {1, I_1, G_1, H_1}, + {1, I_2, G_2, H_2}, + {1, I_3, G_3, H_3}, + {1, I_4, G_4, H_4}, + {1, I_5, G_5, H_5}, + {1, I_6, G_6, H_6}, + {1, I_7, G_7, H_7}, + {1, I_8, G_8, H_8}, + {1, I_9, G_9, H_9}, + {1, I_10, G_10, H_10}, + {1, I_11, G_11, H_11}, + {1, I_12, G_12, H_12}, + {1, I_14, G_14, H_14}, + {1, I_16, G_16, H_16}, + + {1, C_1, A_1, B_1}, + {1, C_2, A_2, B_2}, + {1, C_3, A_3, B_3}, + {1, C_4, A_4, B_4}, + {1, C_5, A_5, B_5}, + {1, C_6, A_6, B_6}, + {1, C_7, A_7, B_7}, + {1, C_8, A_8, B_8}, + {1, C_9, A_9, B_9}, + {1, C_10, A_10, B_10}, + {1, C_11, A_11, B_11}, + {1, C_12, A_12, B_12}, + {1, C_14, A_14, B_14}, + {1, C_15, A_15, B_15}, + {1, C_16, A_16, B_16}, + + {1, F_1, D_1, E_1}, + {1, F_2, D_2, E_2}, + {1, F_3, D_3, E_3}, + {1, F_7, D_7, E_7}, + {1, F_11, D_11, E_11}, + {1, F_12, D_12, E_12}, + {1, F_13, D_13, E_13}, + {1, F_14, D_14, E_14}, + {1, F_15, D_15, E_15}, + {1, F_16, D_16, E_16}, +}; + +#define __ NO_LED + +led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, __, 14 }, + { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, __, 29 }, + { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, __, 42, __, 43 }, + { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, __, 56, 57, 58 }, + { 59, 60, 61, __, __, __, 62, __, __, __, 63, 64, 65, 66, 67, 68 }, + }, + { + // LED Index to Physical Position + {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, { 90, 0}, {105, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {202, 0}, {224, 0}, + {4,16}, {22,16}, {37,16}, {52,16}, {67,16}, {82,16}, { 97,16}, {112,16}, {127,16}, {142,16}, {157,16}, {172,16}, {187,16}, {207,24}, {224,16}, + {6,32}, {26,32}, {41,32}, {56,32}, {71,32}, {86,32}, {101,32}, {116,32}, {131,32}, {146,32}, {161,32}, {175,32}, {190,32}, {224,32}, + {2,48}, {19,48}, {34,48}, {49,48}, {64,48}, {78,48}, { 93,48}, {108,48}, {123,48}, {138,48}, {153,48}, {168,48}, {189,48}, {209,48}, {224,48}, + {2,64}, {21,64}, {39,64}, { 95,64}, {149,64}, {164,64}, {179,64}, {194,64}, {209,64}, {224,64} + }, + { + // RGB LED Index to Flag + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + } +}; +#endif diff --git a/keyboards/keychron/k7_max/iso/rgb/rules.mk b/keyboards/keychron/k7_max/iso/rgb/rules.mk new file mode 100644 index 0000000000..6e7633bfe0 --- /dev/null +++ b/keyboards/keychron/k7_max/iso/rgb/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/keychron/k7_max/iso/white/config.h b/keyboards/keychron/k7_max/iso/white/config.h new file mode 100644 index 0000000000..c85b347d5a --- /dev/null +++ b/keyboards/keychron/k7_max/iso/white/config.h @@ -0,0 +1,51 @@ +/* Copyright 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 + * 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 . + */ + +#pragma once + +#ifdef LED_MATRIX_ENABLE +/* LED matrix driver configuration */ +# define LED_MATRIX_LED_COUNT 69 +# define DRIVER_COUNT 1 +# define DRIVER_CS_PINS \ + { B9 } + +/* Use first 6 channels of LED driver */ +# define SNLED27351_PHASE_CHANNEL MSKPHASE_6CHANNEL +/* 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 LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE +/* Allow shutdown of led driver to save power */ +# define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE +/* Turn off backlight on low brightness to save power */ +# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 + +/* Indications */ +# define DIM_CAPS_LOCK +# define CAPS_LOCK_INDEX 30 +# define BT_HOST_LED_MATRIX_LIST \ + { 16, 17, 18 } +# define P2P4G_HOST_LED_MATRIX_LIST \ + { 19 } +# define LOW_BAT_IND_INDEX \ + { 62 } + +# define LED_MATRIX_VAL_STEP 16 +# define LED_MATRIX_KEYPRESSES +#endif diff --git a/keyboards/keychron/k7_max/iso/white/info.json b/keyboards/keychron/k7_max/iso/white/info.json new file mode 100644 index 0000000000..0ce26cd49a --- /dev/null +++ b/keyboards/keychron/k7_max/iso/white/info.json @@ -0,0 +1,30 @@ +{ + "usb": { + "pid": "0x0A74", + "device_version": "1.0.0" + }, + "features": { + "led_matrix": true + }, + "led_matrix": { + "driver": "snled27351_spi", + "sleep": true, + "animations": { + "none": true, + "solid": true, + "breathing": true, + "band_pinwheel": true, + "band_spiral": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "dual_beacon": true, + "solid_reactive_simple": true, + "solid_reactive_multiwide": true, + "solid_reactive_multinexus": true, + "solid_splash": true, + "wave_left_right": true, + "wave_up_down": true + } + } +} diff --git a/keyboards/keychron/k7_max/iso/white/keymaps/default/keymap.c b/keyboards/keychron/k7_max/iso/white/keymaps/default/keymap.c new file mode 100644 index 0000000000..91edb0cae0 --- /dev/null +++ b/keyboards/keychron/k7_max/iso/white/keymaps/default/keymap.c @@ -0,0 +1,72 @@ +/* Copyright 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 + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +enum layers{ + MAC_BASE, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2, +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[MAC_BASE] = LAYOUT_iso_69( + 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_DEL, + 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_HOME, + 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_NUHS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, 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_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[WIN_BASE] = LAYOUT_iso_69( + 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_DEL, + 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_HOME, + 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_NUHS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, 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(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[MAC_FN1] = LAYOUT_iso_69( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[WIN_FN1] = LAYOUT_iso_69( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[FN2] = LAYOUT_iso_69( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +// clang-format on +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron_common(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/k7_max/iso/white/keymaps/via/keymap.c b/keyboards/keychron/k7_max/iso/white/keymaps/via/keymap.c new file mode 100644 index 0000000000..91edb0cae0 --- /dev/null +++ b/keyboards/keychron/k7_max/iso/white/keymaps/via/keymap.c @@ -0,0 +1,72 @@ +/* Copyright 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 + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +enum layers{ + MAC_BASE, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2, +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[MAC_BASE] = LAYOUT_iso_69( + 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_DEL, + 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_HOME, + 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_NUHS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, 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_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[WIN_BASE] = LAYOUT_iso_69( + 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_DEL, + 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_HOME, + 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_NUHS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, 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(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[MAC_FN1] = LAYOUT_iso_69( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[WIN_FN1] = LAYOUT_iso_69( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[FN2] = LAYOUT_iso_69( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +// clang-format on +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron_common(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/k7_max/iso/white/keymaps/via/rules.mk b/keyboards/keychron/k7_max/iso/white/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/keychron/k7_max/iso/white/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/keychron/k7_max/iso/white/rules.mk b/keyboards/keychron/k7_max/iso/white/rules.mk new file mode 100644 index 0000000000..6e7633bfe0 --- /dev/null +++ b/keyboards/keychron/k7_max/iso/white/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/keychron/k7_max/iso/white/white.c b/keyboards/keychron/k7_max/iso/white/white.c new file mode 100644 index 0000000000..997ab374e4 --- /dev/null +++ b/keyboards/keychron/k7_max/iso/white/white.c @@ -0,0 +1,129 @@ +/* Copyright 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 + * 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 "quantum.h" + +// clang-format off +#ifdef LED_MATRIX_ENABLE +const snled27351_led_t g_snled27351_leds[LED_MATRIX_LED_COUNT] = { +/* Refer to SNLED27351 manual for these locations + * driver + * | LED address + * | | */ + {0, E_1}, + {0, E_2}, + {0, E_3}, + {0, E_4}, + {0, E_5}, + {0, E_6}, + {0, E_7}, + {0, E_8}, + {0, E_9}, + {0, E_10}, + {0, E_11}, + {0, E_12}, + {0, E_13}, + {0, E_14}, + {0, E_16}, + + {0, D_1}, + {0, D_2}, + {0, D_3}, + {0, D_4}, + {0, D_5}, + {0, D_6}, + {0, D_7}, + {0, D_8}, + {0, D_9}, + {0, D_10}, + {0, D_11}, + {0, D_12}, + {0, D_13}, + {0, D_14}, + {0, D_16}, + + {0, C_1}, + {0, C_2}, + {0, C_3}, + {0, C_4}, + {0, C_5}, + {0, C_6}, + {0, C_7}, + {0, C_8}, + {0, C_9}, + {0, C_10}, + {0, C_11}, + {0, C_12}, + {0, C_14}, + {0, C_16}, + + {0, B_1}, + {0, B_2}, + {0, B_3}, + {0, B_4}, + {0, B_5}, + {0, B_6}, + {0, B_7}, + {0, B_8}, + {0, B_9}, + {0, B_10}, + {0, B_11}, + {0, B_12}, + {0, B_13}, + {0, B_14}, + {0, B_16}, + + {0, A_1}, + {0, A_2}, + {0, A_3}, + {0, A_7}, + {0, A_11}, + {0, A_12}, + {0, A_13}, + {0, A_14}, + {0, A_15}, + {0, A_16}, +}; + +#define __ NO_LED + +led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, __, 14 }, + { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, __, 29 }, + { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, __, 42, __, 43 }, + { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, __, 56, 57, 58 }, + { 59, 60, 61, __, __, __, 62, __, __, __, 63, 64, 65, 66, 67, 68 }, + }, + { + // LED Index to Physical Position + {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, { 90, 0}, {105, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {202, 0}, {224, 0}, + {4,16}, {22,16}, {37,16}, {52,16}, {67,16}, {82,16}, { 97,16}, {112,16}, {127,16}, {142,16}, {157,16}, {172,16}, {187,16}, {207,24}, {224,16}, + {6,32}, {26,32}, {41,32}, {56,32}, {71,32}, {86,32}, {101,32}, {116,32}, {131,32}, {146,32}, {161,32}, {175,32}, {190,32}, {224,32}, + {2,48}, {19,48}, {34,48}, {49,48}, {64,48}, {78,48}, { 93,48}, {108,48}, {123,48}, {138,48}, {153,48}, {168,48}, {189,48}, {209,48}, {224,48}, + {2,64}, {21,64}, {39,64}, { 95,64}, {149,64}, {164,64}, {179,64}, {194,64}, {209,64}, {224,64} + }, + { + // RGB LED Index to Flag + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + } +}; +#endif diff --git a/keyboards/keychron/k7_max/jis/rgb/config.h b/keyboards/keychron/k7_max/jis/rgb/config.h new file mode 100644 index 0000000000..24a2bae7e9 --- /dev/null +++ b/keyboards/keychron/k7_max/jis/rgb/config.h @@ -0,0 +1,51 @@ +/* Copyright 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 + * 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 . + */ + +#pragma once + +#ifdef RGB_MATRIX_ENABLE +/* RGB Matrix driver configuration */ +# define RGB_MATRIX_LED_COUNT 71 +# define DRIVER_COUNT 2 +# define DRIVER_CS_PINS \ + { B8, B9 } + +/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */ +# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL +/* Set LED driver current */ +# define SNLED27351_CURRENT_TUNE \ + { 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14 } + +/* 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 */ +# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 + +/* Indications */ +# define DIM_CAPS_LOCK +# define CAPS_LOCK_INDEX 31 +# define BT_HOST_LED_MATRIX_LIST \ + { 17, 18, 19 } +# define P2P4G_HOST_LED_MATRIX_LIST \ + { 20 } +# define LOW_BAT_IND_INDEX \ + { 63 } + +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#endif diff --git a/keyboards/keychron/k7_max/jis/rgb/info.json b/keyboards/keychron/k7_max/jis/rgb/info.json new file mode 100644 index 0000000000..6f61123b36 --- /dev/null +++ b/keyboards/keychron/k7_max/jis/rgb/info.json @@ -0,0 +1,36 @@ +{ + "usb": { + "pid": "0x0A72", + "device_version": "1.0.0" + }, + "features": { + "rgb_matrix": true + }, + "rgb_matrix": { + "driver": "snled27351_spi", + "sleep": true, + "animations": { + "band_spiral_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "jellybean_raindrops": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_simple": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + } + } +} diff --git a/keyboards/keychron/k7_max/jis/rgb/keymaps/default/keymap.c b/keyboards/keychron/k7_max/jis/rgb/keymaps/default/keymap.c new file mode 100644 index 0000000000..1ba6312561 --- /dev/null +++ b/keyboards/keychron/k7_max/jis/rgb/keymaps/default/keymap.c @@ -0,0 +1,72 @@ +/* Copyright 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 + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +enum layers{ + MAC_BASE, + WIN_BASE, + MAC_FN, + WIN_FN, + FN2 +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[MAC_BASE] = LAYOUT_jis_71( + 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_INT3, KC_BSPC, KC_DEL, + 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_HOME, + 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_BSLS, 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_INT1, KC_UP, KC_PGDN, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD,MO(MAC_FN),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[WIN_BASE] = LAYOUT_jis_71( + 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_INT3, KC_BSPC, KC_DEL, + 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_HOME, + 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_BSLS, 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_INT1, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_RALT, MO(WIN_FN),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[MAC_FN] = LAYOUT_jis_71( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[WIN_FN] = LAYOUT_jis_71( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[FN2] = LAYOUT_jis_71( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) +}; + +// clang-format on +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron_common(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/k7_max/jis/rgb/keymaps/via/keymap.c b/keyboards/keychron/k7_max/jis/rgb/keymaps/via/keymap.c new file mode 100644 index 0000000000..1ba6312561 --- /dev/null +++ b/keyboards/keychron/k7_max/jis/rgb/keymaps/via/keymap.c @@ -0,0 +1,72 @@ +/* Copyright 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 + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +enum layers{ + MAC_BASE, + WIN_BASE, + MAC_FN, + WIN_FN, + FN2 +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[MAC_BASE] = LAYOUT_jis_71( + 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_INT3, KC_BSPC, KC_DEL, + 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_HOME, + 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_BSLS, 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_INT1, KC_UP, KC_PGDN, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD,MO(MAC_FN),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[WIN_BASE] = LAYOUT_jis_71( + 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_INT3, KC_BSPC, KC_DEL, + 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_HOME, + 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_BSLS, 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_INT1, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_RALT, MO(WIN_FN),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[MAC_FN] = LAYOUT_jis_71( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[WIN_FN] = LAYOUT_jis_71( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[FN2] = LAYOUT_jis_71( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) +}; + +// clang-format on +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron_common(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/k7_max/jis/rgb/keymaps/via/rules.mk b/keyboards/keychron/k7_max/jis/rgb/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/keychron/k7_max/jis/rgb/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/keychron/k7_max/jis/rgb/rgb.c b/keyboards/keychron/k7_max/jis/rgb/rgb.c new file mode 100644 index 0000000000..5cec853896 --- /dev/null +++ b/keyboards/keychron/k7_max/jis/rgb/rgb.c @@ -0,0 +1,134 @@ +/* Copyright 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 + * 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 . + */ + +#include "quantum.h" + +// clang-format off +#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 + * | | | | */ + {0, F_1, D_1, E_1}, + {0, F_2, D_2, E_2}, + {0, F_3, D_3, E_3}, + {0, F_4, D_4, E_4}, + {0, F_5, D_5, E_5}, + {0, F_6, D_6, E_6}, + {0, F_7, D_7, E_7}, + {0, F_8, D_8, E_8}, + {0, F_9, D_9, E_9}, + {0, F_10, D_10, E_10}, + {0, F_11, D_11, E_11}, + {0, F_12, D_12, E_12}, + {0, F_13, D_13, E_13}, + {0, F_14, D_14, E_14}, + {0, F_15, D_15, E_15}, + {0, F_16, D_16, E_16}, + + {0, A_1, C_1, B_1}, + {0, A_2, C_2, B_2}, + {0, A_3, C_3, B_3}, + {0, A_4, C_4, B_4}, + {0, A_5, C_5, B_5}, + {0, A_6, C_6, B_6}, + {0, A_7, C_7, B_7}, + {0, A_8, C_8, B_8}, + {0, A_9, C_9, B_9}, + {0, A_10, C_10, B_10}, + {0, A_11, C_11, B_11}, + {0, A_12, C_12, B_12}, + {0, A_13, C_13, B_13}, + {0, A_14, C_14, B_14}, + {0, A_16, C_16, B_16}, + + {1, I_1, G_1, H_1}, + {1, I_2, G_2, H_2}, + {1, I_3, G_3, H_3}, + {1, I_4, G_4, H_4}, + {1, I_5, G_5, H_5}, + {1, I_6, G_6, H_6}, + {1, I_7, G_7, H_7}, + {1, I_8, G_8, H_8}, + {1, I_9, G_9, H_9}, + {1, I_10, G_10, H_10}, + {1, I_11, G_11, H_11}, + {1, I_12, G_12, H_12}, + {1, I_14, G_14, H_14}, + {1, I_16, G_16, H_16}, + + {1, C_1, A_1, B_1}, + {1, C_3, A_3, B_3}, + {1, C_4, A_4, B_4}, + {1, C_5, A_5, B_5}, + {1, C_6, A_6, B_6}, + {1, C_7, A_7, B_7}, + {1, C_8, A_8, B_8}, + {1, C_9, A_9, B_9}, + {1, C_10, A_10, B_10}, + {1, C_11, A_11, B_11}, + {1, C_12, A_12, B_12}, + {1, C_13, A_13, B_13}, + {1, C_14, A_14, B_14}, + {1, C_16, A_16, B_16}, + + {1, F_1, D_1, E_1}, + {1, F_2, D_2, E_2}, + {1, F_3, D_3, E_3}, + {1, F_4, D_4, E_4}, + {1, F_7, D_7, E_7}, + {1, F_10, D_10, E_10}, + {1, F_11, D_11, E_11}, + {1, F_12, D_12, E_12}, + {1, F_13, D_13, E_13}, + {1, F_14, D_14, E_14}, + {1, F_15, D_15, E_15}, + {1, F_16, D_16, E_16}, +}; + +#define __ NO_LED + +led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, + { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, __, 30 }, + { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, __, 43, __, 44 }, + { 45, __, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, __, 58 }, + { 59, 60, 61, 62, __, __, 63, __, __, 64, 65, 66, 67, 68, 69, 70 }, + }, + { + // LED Index to Physical Position + {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, { 90, 0}, {105, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {194, 0}, {209, 0}, {224, 0}, + {4,16}, {22,16}, {37,16}, {52,16}, {67,16}, {82,16}, { 97,16}, {112,16}, {127,16}, {142,16}, {157,16}, {172,16}, {187,16}, {205,24}, {224,16}, + {7,32}, {26,32}, {41,32}, {56,32}, {71,32}, {86,32}, {101,32}, {116,32}, {131,32}, {146,32}, {161,32}, {175,32}, {200,32}, {224,32}, + {8,48}, {34,48}, {49,48}, {64,48}, {78,48}, { 93,48}, {108,48}, {123,48}, {138,48}, {153,48}, {168,48}, {183,48}, {201,48}, {224,48}, + {0,64}, {15,64}, {30,64}, {45,64}, { 90,64}, {134,64}, {149,64}, {164,64}, {179,64}, {194,64}, {209,64}, {224,64} + + }, + { + // RGB LED Index to Flag + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + } +}; +#endif diff --git a/keyboards/keychron/k7_max/jis/rgb/rules.mk b/keyboards/keychron/k7_max/jis/rgb/rules.mk new file mode 100644 index 0000000000..6e7633bfe0 --- /dev/null +++ b/keyboards/keychron/k7_max/jis/rgb/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/keychron/k7_max/jis/white/config.h b/keyboards/keychron/k7_max/jis/white/config.h new file mode 100644 index 0000000000..7eb53b05db --- /dev/null +++ b/keyboards/keychron/k7_max/jis/white/config.h @@ -0,0 +1,51 @@ +/* Copyright 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 + * 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 . + */ + +#pragma once + +#ifdef LED_MATRIX_ENABLE +/* LED matrix driver configuration */ +# define LED_MATRIX_LED_COUNT 71 +# define DRIVER_COUNT 1 +# define DRIVER_CS_PINS \ + { B9 } + +/* Use first 6 channels of LED driver */ +# define SNLED27351_PHASE_CHANNEL MSKPHASE_6CHANNEL +/* Set LED driver current */ +# define SNLED27351_CURRENT_TUNE \ + { 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A } + +/* Set to infinit, which is use in USB mode by default */ +# define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE +/* Allow shutdown of led driver to save power */ +# define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE +/* Turn off backlight on low brightness to save power */ +# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 + +/* Indications */ +# define DIM_CAPS_LOCK +# define CAPS_LOCK_INDEX 31 +# define BT_HOST_LED_MATRIX_LIST \ + { 17, 18, 19 } +# define P2P4G_HOST_LED_MATRIX_LIST \ + { 20 } +# define LOW_BAT_IND_INDEX \ + { 63 } + +# define LED_MATRIX_VAL_STEP 16 +# define LED_MATRIX_KEYPRESSES +#endif diff --git a/keyboards/keychron/k7_max/jis/white/info.json b/keyboards/keychron/k7_max/jis/white/info.json new file mode 100644 index 0000000000..e8d0f82367 --- /dev/null +++ b/keyboards/keychron/k7_max/jis/white/info.json @@ -0,0 +1,30 @@ +{ + "usb": { + "pid": "0x0A75", + "device_version": "1.0.0" + }, + "features": { + "led_matrix": true + }, + "led_matrix": { + "driver": "snled27351_spi", + "sleep": true, + "animations": { + "none": true, + "solid": true, + "breathing": true, + "band_pinwheel": true, + "band_spiral": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "dual_beacon": true, + "solid_reactive_simple": true, + "solid_reactive_multiwide": true, + "solid_reactive_multinexus": true, + "solid_splash": true, + "wave_left_right": true, + "wave_up_down": true + } + } +} diff --git a/keyboards/keychron/k7_max/jis/white/keymaps/default/keymap.c b/keyboards/keychron/k7_max/jis/white/keymaps/default/keymap.c new file mode 100644 index 0000000000..48c70668cb --- /dev/null +++ b/keyboards/keychron/k7_max/jis/white/keymaps/default/keymap.c @@ -0,0 +1,72 @@ +/* Copyright 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 + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +enum layers{ + MAC_BASE, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2, +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[MAC_BASE] = LAYOUT_jis_71( + 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_INT3, KC_BSPC, KC_DEL, + 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_HOME, + 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_BSLS, 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_INT1, KC_UP, KC_PGDN, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[WIN_BASE] = LAYOUT_jis_71( + 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_INT3, KC_BSPC, KC_DEL, + 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_HOME, + 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_BSLS, 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_INT1, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_RALT, MO(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[MAC_FN1] = LAYOUT_jis_71( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[WIN_FN1] = LAYOUT_jis_71( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[FN2] = LAYOUT_jis_71( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) +}; + +// clang-format on +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron_common(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/k7_max/jis/white/keymaps/via/keymap.c b/keyboards/keychron/k7_max/jis/white/keymaps/via/keymap.c new file mode 100644 index 0000000000..48c70668cb --- /dev/null +++ b/keyboards/keychron/k7_max/jis/white/keymaps/via/keymap.c @@ -0,0 +1,72 @@ +/* Copyright 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 + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +enum layers{ + MAC_BASE, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2, +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[MAC_BASE] = LAYOUT_jis_71( + 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_INT3, KC_BSPC, KC_DEL, + 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_HOME, + 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_BSLS, 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_INT1, KC_UP, KC_PGDN, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[WIN_BASE] = LAYOUT_jis_71( + 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_INT3, KC_BSPC, KC_DEL, + 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_HOME, + 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_BSLS, 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_INT1, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_RALT, MO(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + +[MAC_FN1] = LAYOUT_jis_71( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[WIN_FN1] = LAYOUT_jis_71( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[FN2] = LAYOUT_jis_71( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, KC_RSFT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) +}; + +// clang-format on +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron_common(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/k7_max/jis/white/keymaps/via/rules.mk b/keyboards/keychron/k7_max/jis/white/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/keychron/k7_max/jis/white/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/keychron/k7_max/jis/white/rules.mk b/keyboards/keychron/k7_max/jis/white/rules.mk new file mode 100644 index 0000000000..6e7633bfe0 --- /dev/null +++ b/keyboards/keychron/k7_max/jis/white/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/keychron/k7_max/jis/white/white.c b/keyboards/keychron/k7_max/jis/white/white.c new file mode 100644 index 0000000000..0c7b91bf5a --- /dev/null +++ b/keyboards/keychron/k7_max/jis/white/white.c @@ -0,0 +1,132 @@ +/* Copyright 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 + * 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 . + */ + +#include "quantum.h" + +// clang-format off +#ifdef LED_MATRIX_ENABLE +const snled27351_led_t g_snled27351_leds[LED_MATRIX_LED_COUNT] = { +/* Refer to SNLED27351 manual for these locations + * driver + * | LED address + * | | */ + {0, E_1}, + {0, E_2}, + {0, E_3}, + {0, E_4}, + {0, E_5}, + {0, E_6}, + {0, E_7}, + {0, E_8}, + {0, E_9}, + {0, E_10}, + {0, E_11}, + {0, E_12}, + {0, E_13}, + {0, E_14}, + {0, E_15}, + {0, E_16}, + + {0, D_1}, + {0, D_2}, + {0, D_3}, + {0, D_4}, + {0, D_5}, + {0, D_6}, + {0, D_7}, + {0, D_8}, + {0, D_9}, + {0, D_10}, + {0, D_11}, + {0, D_12}, + {0, D_13}, + {0, D_14}, + {0, D_16}, + + {0, C_1}, + {0, C_2}, + {0, C_3}, + {0, C_4}, + {0, C_5}, + {0, C_6}, + {0, C_7}, + {0, C_8}, + {0, C_9}, + {0, C_10}, + {0, C_11}, + {0, C_12}, + {0, C_14}, + {0, C_16}, + + {0, B_1}, + {0, B_3}, + {0, B_4}, + {0, B_5}, + {0, B_6}, + {0, B_7}, + {0, B_8}, + {0, B_9}, + {0, B_10}, + {0, B_11}, + {0, B_12}, + {0, B_14}, + {0, B_15}, + {0, B_16}, + + {0, A_1}, + {0, A_2}, + {0, A_3}, + {0, A_4}, + {0, A_7}, + {0, A_10}, + {0, A_11}, + {0, A_12}, + {0, A_13}, + {0, A_14}, + {0, A_15}, + {0, A_16}, +}; + +#define __ NO_LED + +led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, + { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, __, 30 }, + { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, __, 43, __, 44 }, + { 45, __, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, __, 56, 57, 58 }, + { 59, 60, 61, 62, __, __, 63, __, __, 64, 65, 66, 67, 68, 69, 70 }, + }, + { + // LED Index to Physical Position + {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, { 90, 0}, {105, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {194, 0}, {209, 0}, {224, 0}, + {4,16}, {22,16}, {37,16}, {52,16}, {67,16}, {82,16}, { 97,16}, {112,16}, {127,16}, {142,16}, {157,16}, {172,16}, {187,16}, {205,24}, {224,16}, + {7,32}, {26,32}, {41,32}, {56,32}, {71,32}, {86,32}, {101,32}, {116,32}, {131,32}, {146,32}, {161,32}, {175,32}, {200,32}, {224,32}, + {8,48}, {34,48}, {49,48}, {64,48}, {78,48}, { 93,48}, {108,48}, {123,48}, {138,48}, {153,48}, {168,48}, {183,48}, {201,48}, {224,48}, + {0,64}, {15,64}, {30,64}, {45,64}, { 90,64}, {134,64}, {149,64}, {164,64}, {179,64}, {194,64}, {209,64}, {224,64} + }, + { + // RGB LED Index to Flag + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + } + +}; +#endif diff --git a/keyboards/keychron/k7_max/k7_max.c b/keyboards/keychron/k7_max/k7_max.c index 51e8c90125..c43c802e27 100644 --- a/keyboards/keychron/k7_max/k7_max.c +++ b/keyboards/keychron/k7_max/k7_max.c @@ -31,7 +31,6 @@ #define POWER_ON_LED_DURATION 3000 static uint32_t power_on_indicator_timer; - bool dip_switch_update_kb(uint8_t index, bool active) { if (index == 0) { default_layer_set(1UL << (active ? 0 : 1)); @@ -51,10 +50,6 @@ void keyboard_post_init_kb(void) { #endif power_on_indicator_timer = timer_read32(); -#ifdef ENCODER_ENABLE - encoder_cb_init(); -#endif - keyboard_post_init_user(); } @@ -62,7 +57,6 @@ bool keychron_task_kb(void) { if (power_on_indicator_timer) { if (timer_elapsed32(power_on_indicator_timer) > POWER_ON_LED_DURATION) { power_on_indicator_timer = 0; - #ifdef LK_WIRELESS_ENABLE writePin(BAT_LOW_LED_PIN, !BAT_LOW_LED_PIN_ON_STATE); #endif diff --git a/keyboards/keychron/k7_max/readme.md b/keyboards/keychron/k7_max/readme.md index e15629f0d9..fbed911474 100644 --- a/keyboards/keychron/k7_max/readme.md +++ b/keyboards/keychron/k7_max/readme.md @@ -12,11 +12,19 @@ Make example for this keyboard (after setting up your build environment): make keychron/k7_max/ansi/rgb:default make keychron/k7_max/ansi/white:default + make keychron/k7_max/iso/rgb:default + make keychron/k7_max/iso/white:default + make keychron/k7_max/jis/rgb:default + make keychron/k7_max/jis/white:default Flashing example for this keyboard: make keychron/k7_max/ansi/rgb:default:flash make keychron/k7_max/ansi/white:default:flash + make keychron/k7_max/iso/rgb:default:flash + make keychron/k7_max/iso/white:default:flash + make keychron/k7_max/jis/rgb:default:flash + make keychron/k7_max/jis/white:default:flash **Reset Key**: Disconnect the USB cable, toggle mode switch to "Cable", hold down the *Esc* key or reset button underneath space bar, then connect the USB cable. diff --git a/keyboards/keychron/k7_max/via_json/k7_max_iso_rgb_v1.0.json b/keyboards/keychron/k7_max/via_json/k7_max_iso_rgb_v1.0.json index 6e1158c6a4..0795a75463 100644 --- a/keyboards/keychron/k7_max/via_json/k7_max_iso_rgb_v1.0.json +++ b/keyboards/keychron/k7_max/via_json/k7_max_iso_rgb_v1.0.json @@ -1,7 +1,7 @@ { - "name": "Keychron K3 Max ISO RGB", + "name": "Keychron K7 Max ISO RGB", "vendorId": "0x3434", - "productId": "0x0A31", + "productId": "0x0A71", "keycodes": ["qmk_lighting"], "menus": [ { @@ -82,49 +82,44 @@ {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} ], - "matrix": {"rows": 6, "cols" : 16}, + "matrix": {"rows": 5, "cols" : 16}, "layouts": { "keymap": [ - [ - { - "c": "#777777" - }, - "0, 0", - { - "c": "#cccccc" - }, - "0, 1", - "0, 2", - "0, 3", - "0, 4", - { - "c": "#aaaaaa" - }, - "0, 5", - "0, 6", - "0, 7", - "0, 8", - "0, 9", - { - "c": "#cccccc" - }, - "0, 10", - "0, 11", - "0, 12", - { - "c": "#aaaaaa" - }, - "0, 13", - "0, 14", - "0, 15" - ], + [ + { + "c": "#777777" + }, + "0, 0", + { + "c": "#cccccc" + }, + "0, 1", + "0, 2", + "0, 3", + "0, 4", + "0, 5", + "0, 6", + "0, 7", + "0, 8", + "0, 9", + "0, 10", + "0, 11", + "0, 12", + { + "w": 2, + "c": "#aaaaaa" + }, + "0, 13", + "0, 15" + ], [ { + "w": 1.5, "c": "#aaaaaa" }, "1, 0", { - "c": "#cccccc" + "c": "#cccccc" }, "1, 1", "1, 2", @@ -139,20 +134,28 @@ "1, 11", "1, 12", { - "w": 2, - "c": "#aaaaaa" + "x": 0.25, + "w": 1.25, + "h": 2, + "x2": -0.25, + "w2": 1.5, + "h2": 1, + "c": "#777777" }, "1, 13", + { + "c": "#aaaaaa" + }, "1, 15" ], [ { - "w": 1.5, + "w": 1.75, "c": "#aaaaaa" }, "2, 0", { - "c": "#cccccc" + "c": "#cccccc" }, "2, 1", "2, 2", @@ -165,32 +168,22 @@ "2, 9", "2, 10", "2, 11", - "2, 12", - { - "x": 0.25, - "w": 1.25, - "h": 2, - "x2": -0.25, - "w2": 1.5, - "h2": 1, - "c": "#777777" - }, "2, 13", { - "c": "#aaaaaa" + "x": 1.25, + "c": "#aaaaaa" }, "2, 15" ], [ { - "w": 1.75, - "c": "#aaaaaa" + "w": 1.25 }, "3, 0", { - "c": "#cccccc" + "c": "#cccccc" }, - "3, 1", + "3, 1", "3, 2", "3, 3", "3, 4", @@ -201,9 +194,16 @@ "3, 9", "3, 10", "3, 11", + { + "w": 1.75, + "c": "#aaaaaa" + }, "3, 13", { - "x": 1.25, + "c": "#cccccc" + }, + "3, 14", + { "c": "#aaaaaa" }, "3, 15" @@ -215,64 +215,30 @@ }, "4, 0", { - "c": "#cccccc" + "w": 1.25 }, "4, 1", + { + "w": 1.25 + }, "4, 2", - "4, 3", - "4, 4", - "4, 5", - "4, 6", - "4, 7", - "4, 8", - "4, 9", - "4, 10", - "4, 11", - { - "w": 1.75, - "c": "#aaaaaa" - }, - "4, 13", - { - "c": "#cccccc" - }, - "4, 14", - { - "c": "#aaaaaa" - }, - "4, 15" - ], - [ - { - "w": 1.25, - "c": "#aaaaaa" - }, - "5, 0", - { - "w": 1.25 - }, - "5, 1", - { - "w": 1.25 - }, - "5, 2", { "w": 6.25, "c": "#cccccc" }, - "5, 6", + "4, 6", { "c": "#aaaaaa" }, - "5, 10", - "5, 11", - "5, 12", + "4, 10", + "4, 11", + "4, 12", { "c": "#cccccc" }, - "5, 13", - "5, 14", - "5, 15" + "4, 13", + "4, 14", + "4, 15" ] ] } diff --git a/keyboards/keychron/k7_max/via_json/k7_max_iso_white_v1.0.json b/keyboards/keychron/k7_max/via_json/k7_max_iso_white_v1.0.json index 5bdfbb24b7..028bba897a 100644 --- a/keyboards/keychron/k7_max/via_json/k7_max_iso_white_v1.0.json +++ b/keyboards/keychron/k7_max/via_json/k7_max_iso_white_v1.0.json @@ -1,7 +1,7 @@ { - "name": "Keychron K3 Max ISO White", + "name": "Keychron K7 Max ISO White", "vendorId": "0x3434", - "productId": "0x0A34", + "productId": "0x0A74", "keycodes": ["qmk_lighting"], "customKeycodes": [ {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, @@ -21,49 +21,44 @@ {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} ], - "matrix": {"rows": 6, "cols" : 16}, + "matrix": {"rows": 5, "cols" : 16}, "layouts": { "keymap": [ - [ - { - "c": "#777777" - }, - "0, 0", - { - "c": "#cccccc" - }, - "0, 1", - "0, 2", - "0, 3", - "0, 4", - { - "c": "#aaaaaa" - }, - "0, 5", - "0, 6", - "0, 7", - "0, 8", - "0, 9", - { - "c": "#cccccc" - }, - "0, 10", - "0, 11", - "0, 12", - { - "c": "#aaaaaa" - }, - "0, 13", - "0, 14", - "0, 15" - ], + [ + { + "c": "#777777" + }, + "0, 0", + { + "c": "#cccccc" + }, + "0, 1", + "0, 2", + "0, 3", + "0, 4", + "0, 5", + "0, 6", + "0, 7", + "0, 8", + "0, 9", + "0, 10", + "0, 11", + "0, 12", + { + "w": 2, + "c": "#aaaaaa" + }, + "0, 13", + "0, 15" + ], [ { + "w": 1.5, "c": "#aaaaaa" }, "1, 0", { - "c": "#cccccc" + "c": "#cccccc" }, "1, 1", "1, 2", @@ -78,20 +73,28 @@ "1, 11", "1, 12", { - "w": 2, - "c": "#aaaaaa" + "x": 0.25, + "w": 1.25, + "h": 2, + "x2": -0.25, + "w2": 1.5, + "h2": 1, + "c": "#777777" }, "1, 13", + { + "c": "#aaaaaa" + }, "1, 15" ], [ { - "w": 1.5, + "w": 1.75, "c": "#aaaaaa" }, "2, 0", { - "c": "#cccccc" + "c": "#cccccc" }, "2, 1", "2, 2", @@ -104,32 +107,22 @@ "2, 9", "2, 10", "2, 11", - "2, 12", - { - "x": 0.25, - "w": 1.25, - "h": 2, - "x2": -0.25, - "w2": 1.5, - "h2": 1, - "c": "#777777" - }, "2, 13", { - "c": "#aaaaaa" + "x": 1.25, + "c": "#aaaaaa" }, "2, 15" ], [ { - "w": 1.75, - "c": "#aaaaaa" + "w": 1.25 }, "3, 0", { - "c": "#cccccc" + "c": "#cccccc" }, - "3, 1", + "3, 1", "3, 2", "3, 3", "3, 4", @@ -140,9 +133,16 @@ "3, 9", "3, 10", "3, 11", + { + "w": 1.75, + "c": "#aaaaaa" + }, "3, 13", { - "x": 1.25, + "c": "#cccccc" + }, + "3, 14", + { "c": "#aaaaaa" }, "3, 15" @@ -154,64 +154,30 @@ }, "4, 0", { - "c": "#cccccc" + "w": 1.25 }, "4, 1", + { + "w": 1.25 + }, "4, 2", - "4, 3", - "4, 4", - "4, 5", - "4, 6", - "4, 7", - "4, 8", - "4, 9", - "4, 10", - "4, 11", - { - "w": 1.75, - "c": "#aaaaaa" - }, - "4, 13", - { - "c": "#cccccc" - }, - "4, 14", - { - "c": "#aaaaaa" - }, - "4, 15" - ], - [ - { - "w": 1.25, - "c": "#aaaaaa" - }, - "5, 0", - { - "w": 1.25 - }, - "5, 1", - { - "w": 1.25 - }, - "5, 2", { "w": 6.25, "c": "#cccccc" }, - "5, 6", + "4, 6", { "c": "#aaaaaa" }, - "5, 10", - "5, 11", - "5, 12", + "4, 10", + "4, 11", + "4, 12", { "c": "#cccccc" }, - "5, 13", - "5, 14", - "5, 15" + "4, 13", + "4, 14", + "4, 15" ] ] } diff --git a/keyboards/keychron/k7_max/via_json/k7_max_jis_rgb_v1.0.json b/keyboards/keychron/k7_max/via_json/k7_max_jis_rgb_v1.0.json index 8598a7447f..31ff8c3965 100644 --- a/keyboards/keychron/k7_max/via_json/k7_max_jis_rgb_v1.0.json +++ b/keyboards/keychron/k7_max/via_json/k7_max_jis_rgb_v1.0.json @@ -1,7 +1,7 @@ { - "name": "Keychron K3 Max JIS RGB", + "name": "Keychron K7 Max JIS RGB", "vendorId": "0x3434", - "productId": "0x0A32", + "productId": "0x0A72", "keycodes": ["qmk_lighting"], "menus": [ { @@ -82,32 +82,26 @@ {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} ], - "matrix": {"rows": 6, "cols" : 16}, + "matrix": {"rows": 5, "cols" : 16}, "layouts": { "keymap": [ - [ + [ { "c": "#777777" }, "0, 0", { - "c": "#cccccc" + "c": "#cccccc" }, "0, 1", "0, 2", "0, 3", "0, 4", - { - "c": "#aaaaaa" - }, "0, 5", "0, 6", "0, 7", "0, 8", "0, 9", - { - "c": "#cccccc" - }, "0, 10", "0, 11", "0, 12", @@ -117,14 +111,15 @@ "0, 13", "0, 14", "0, 15" - ], - [ + ], + [ { + "w": 1.5, "c": "#aaaaaa" }, "1, 0", { - "c": "#cccccc" + "c": "#cccccc" }, "1, 1", "1, 2", @@ -138,21 +133,29 @@ "1, 10", "1, 11", "1, 12", + { + "x": 0.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "x2": -0.25, + "w2": 1.5, + "h2": 1 + }, "1, 13", - "1, 14", { "c": "#aaaaaa" }, "1, 15" - ], - [ + ], + [ { - "w": 1.5, + "w": 1.75, "c": "#aaaaaa" }, "2, 0", { - "c": "#cccccc" + "c": "#cccccc" }, "2, 1", "2, 2", @@ -165,32 +168,22 @@ "2, 9", "2, 10", "2, 11", - "2, 12", - { - "x": 0.25, - "w": 1.25, - "h": 2, - "x2": -0.25, - "w2": 1.5, - "h2": 1, - "c": "#777777" - }, "2, 13", { - "c": "#aaaaaa" + "x":1.25, + "c": "#aaaaaa" }, "2, 15" - ], - [ + ], + [ { - "w": 1.75, + "w": 2.25, "c": "#aaaaaa" }, "3, 0", { - "c": "#cccccc" + "c": "#cccccc" }, - "3, 1", "3, 2", "3, 3", "3, 4", @@ -201,67 +194,44 @@ "3, 9", "3, 10", "3, 11", + "3, 12", + { + "c": "#cccccc", + "w": 1.75 + }, "3, 13", { - "x": 1.25, "c": "#aaaaaa" }, "3, 15" - ], - [ + ], + [ { - "w": 2.25, "c": "#aaaaaa" }, - "4, 0", - { - "c": "#cccccc" - }, + "4, 0", + "4, 1", "4, 2", "4, 3", - "4, 4", - "4, 5", - "4, 6", - "4, 7", - "4, 8", - "4, 9", - "4, 10", - "4, 11", - "4, 13", - { - "w": 1.75, - "c": "#aaaaaa" - }, - "4, 14", - "4, 15" - ], - [ - { - "c": "#aaaaaa" - }, - "5, 0", - "5, 1", - "5, 2", - "5, 3", { "w": 5, "c": "#cccccc" }, - "5, 6", + "4, 6", { "c": "#aaaaaa" }, - "5, 9", - "5, 10", - "5, 11", + "4, 9", + "4, 10", + "4, 11", + "4, 12", { "c": "#cccccc" }, - "5, 12", - "5, 13", - "5, 14", - "5, 15" - ] + "4, 13", + "4, 14", + "4, 15" + ] ] } } diff --git a/keyboards/keychron/k7_max/via_json/k7_max_jis_white_v1.0.json b/keyboards/keychron/k7_max/via_json/k7_max_jis_white_v1.0.json index 47e3a6e7b6..9caf6707fc 100644 --- a/keyboards/keychron/k7_max/via_json/k7_max_jis_white_v1.0.json +++ b/keyboards/keychron/k7_max/via_json/k7_max_jis_white_v1.0.json @@ -1,51 +1,46 @@ { - "name": "Keychron K3 Max White JIS", + "name": "Keychron K7 Max JIS White", "vendorId": "0x3434", - "productId": "0x0A35", - "customKeycodes": [ - {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, - {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"}, - {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"}, - {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, - {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, - {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, - {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, - {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, - {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 6, "cols" : 16}, + "productId": "0x0A75", + "keycodes": ["qmk_lighting"], + "customKeycodes": [ + {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, + {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, + {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, + {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, + {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"}, + {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"}, + {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, + {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, + {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, + {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, + {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, + {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, + {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, + {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, + {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, + {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} + ], + "matrix": {"rows": 5, "cols" : 16}, "layouts": { "keymap": [ - [ + [ { "c": "#777777" }, "0, 0", { - "c": "#cccccc" + "c": "#cccccc" }, "0, 1", "0, 2", "0, 3", "0, 4", - { - "c": "#aaaaaa" - }, "0, 5", "0, 6", "0, 7", "0, 8", "0, 9", - { - "c": "#cccccc" - }, "0, 10", "0, 11", "0, 12", @@ -55,14 +50,15 @@ "0, 13", "0, 14", "0, 15" - ], - [ + ], + [ { + "w": 1.5, "c": "#aaaaaa" }, "1, 0", { - "c": "#cccccc" + "c": "#cccccc" }, "1, 1", "1, 2", @@ -76,21 +72,29 @@ "1, 10", "1, 11", "1, 12", + { + "x": 0.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "x2": -0.25, + "w2": 1.5, + "h2": 1 + }, "1, 13", - "1, 14", { "c": "#aaaaaa" }, "1, 15" - ], - [ + ], + [ { - "w": 1.5, + "w": 1.75, "c": "#aaaaaa" }, "2, 0", { - "c": "#cccccc" + "c": "#cccccc" }, "2, 1", "2, 2", @@ -103,32 +107,22 @@ "2, 9", "2, 10", "2, 11", - "2, 12", - { - "x": 0.25, - "w": 1.25, - "h": 2, - "x2": -0.25, - "w2": 1.5, - "h2": 1, - "c": "#777777" - }, "2, 13", { - "c": "#aaaaaa" + "x":1.25, + "c": "#aaaaaa" }, "2, 15" - ], - [ + ], + [ { - "w": 1.75, + "w": 2.25, "c": "#aaaaaa" }, "3, 0", { - "c": "#cccccc" + "c": "#cccccc" }, - "3, 1", "3, 2", "3, 3", "3, 4", @@ -139,67 +133,44 @@ "3, 9", "3, 10", "3, 11", + "3, 12", + { + "c": "#cccccc", + "w": 1.75 + }, "3, 13", { - "x": 1.25, "c": "#aaaaaa" }, "3, 15" - ], - [ + ], + [ { - "w": 2.25, "c": "#aaaaaa" }, - "4, 0", - { - "c": "#cccccc" - }, + "4, 0", + "4, 1", "4, 2", "4, 3", - "4, 4", - "4, 5", - "4, 6", - "4, 7", - "4, 8", - "4, 9", - "4, 10", - "4, 11", - "4, 13", - { - "w": 1.75, - "c": "#aaaaaa" - }, - "4, 14", - "4, 15" - ], - [ - { - "c": "#aaaaaa" - }, - "5, 0", - "5, 1", - "5, 2", - "5, 3", { "w": 5, "c": "#cccccc" }, - "5, 6", + "4, 6", { "c": "#aaaaaa" }, - "5, 9", - "5, 10", - "5, 11", + "4, 9", + "4, 10", + "4, 11", + "4, 12", { "c": "#cccccc" }, - "5, 12", - "5, 13", - "5, 14", - "5, 15" - ] + "4, 13", + "4, 14", + "4, 15" + ] ] } } diff --git a/keyboards/keychron/k8_max/ansi/rgb/info.json b/keyboards/keychron/k8_max/ansi/rgb/info.json index 7e12aa4396..b90f0fe944 100644 --- a/keyboards/keychron/k8_max/ansi/rgb/info.json +++ b/keyboards/keychron/k8_max/ansi/rgb/info.json @@ -6,10 +6,6 @@ "features": { "rgb_matrix": true }, - "matrix_pins": { - "cols": ["C7", "A13", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, "rgb_matrix": { "driver": "snled27351_spi", "sleep": true, diff --git a/keyboards/keychron/k8_max/ansi/white/info.json b/keyboards/keychron/k8_max/ansi/white/info.json index c444f095ac..868834f4e2 100644 --- a/keyboards/keychron/k8_max/ansi/white/info.json +++ b/keyboards/keychron/k8_max/ansi/white/info.json @@ -6,10 +6,6 @@ "features": { "led_matrix": true }, - "matrix_pins": { - "cols": ["C7", "A13", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, "led_matrix": { "driver": "snled27351_spi", "sleep": true, diff --git a/keyboards/keychron/k8_max/info.json b/keyboards/keychron/k8_max/info.json index eab45bae37..0470760048 100644 --- a/keyboards/keychron/k8_max/info.json +++ b/keyboards/keychron/k8_max/info.json @@ -17,6 +17,10 @@ "raw": true, "sendstring": true }, + "matrix_pins": { + "cols": ["C7", "C8", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3"], + "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] + }, "diode_direction": "ROW2COL", "dip_switch" :{ "pins": ["B12"] diff --git a/keyboards/keychron/k8_max/iso/rgb/info.json b/keyboards/keychron/k8_max/iso/rgb/info.json index a9cd62233f..2750b18ed7 100644 --- a/keyboards/keychron/k8_max/iso/rgb/info.json +++ b/keyboards/keychron/k8_max/iso/rgb/info.json @@ -6,10 +6,6 @@ "features": { "rgb_matrix": true }, - "matrix_pins": { - "cols": ["C7", "C8", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, "rgb_matrix": { "driver": "snled27351_spi", "sleep": true, diff --git a/keyboards/keychron/k8_max/iso/white/info.json b/keyboards/keychron/k8_max/iso/white/info.json index 80783f0902..692469a47b 100644 --- a/keyboards/keychron/k8_max/iso/white/info.json +++ b/keyboards/keychron/k8_max/iso/white/info.json @@ -6,10 +6,6 @@ "features": { "led_matrix": true }, - "matrix_pins": { - "cols": ["C7", "A13", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, "led_matrix": { "driver": "snled27351_spi", "sleep": true, diff --git a/keyboards/keychron/k8_max/jis/rgb/info.json b/keyboards/keychron/k8_max/jis/rgb/info.json index ed64618dff..c9e9f7fdb9 100644 --- a/keyboards/keychron/k8_max/jis/rgb/info.json +++ b/keyboards/keychron/k8_max/jis/rgb/info.json @@ -3,15 +3,12 @@ "pid": "0x0A82", "device_version": "1.0.0" }, - "matrix_pins": { - "cols": ["C7", "C8", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, "features": { "rgb_matrix": true }, "rgb_matrix": { "driver": "snled27351_spi", + "sleep": true, "animations": { "band_spiral_val": true, "breathing": true, diff --git a/keyboards/keychron/k8_max/jis/white/info.json b/keyboards/keychron/k8_max/jis/white/info.json index 77db5b1650..60f2835184 100644 --- a/keyboards/keychron/k8_max/jis/white/info.json +++ b/keyboards/keychron/k8_max/jis/white/info.json @@ -6,12 +6,9 @@ "features": { "led_matrix": true }, - "matrix_pins": { - "cols": ["C7", "A13", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, "led_matrix": { "driver": "snled27351_spi", + "sleep": true, "animations": { "none": true, "solid": true, diff --git a/keyboards/keychron/v8_max/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/v8_max/ansi_encoder/keymaps/default/keymap.c index b889fee7dc..d785ecd29b 100644 --- a/keyboards/keychron/v8_max/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v8_max/ansi_encoder/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), -} +}; // clang-format on #if defined(ENCODER_MAP_ENABLE)