From 7ec650c589350243e635fc5bd6b0f4d01bc556b8 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Mon, 18 Sep 2023 12:36:40 +0800 Subject: [PATCH 01/45] [keyboard]add dark_project/cm81 keyboard. --- keyboards/dark_project/cm81/cm81.c | 132 +++++++++ keyboards/dark_project/cm81/config.h | 41 +++ keyboards/dark_project/cm81/halconf.h | 11 + keyboards/dark_project/cm81/info.json | 250 ++++++++++++++++++ .../cm81/keymaps/default/keymap.c | 47 ++++ .../dark_project/cm81/keymaps/via/keymap.c | 47 ++++ .../dark_project/cm81/keymaps/via/rules.mk | 1 + keyboards/dark_project/cm81/mcuconf.h | 12 + keyboards/dark_project/cm81/readme.md | 19 ++ keyboards/dark_project/cm81/rules.mk | 7 + 10 files changed, 567 insertions(+) create mode 100644 keyboards/dark_project/cm81/cm81.c create mode 100644 keyboards/dark_project/cm81/config.h create mode 100644 keyboards/dark_project/cm81/halconf.h create mode 100644 keyboards/dark_project/cm81/info.json create mode 100644 keyboards/dark_project/cm81/keymaps/default/keymap.c create mode 100644 keyboards/dark_project/cm81/keymaps/via/keymap.c create mode 100644 keyboards/dark_project/cm81/keymaps/via/rules.mk create mode 100644 keyboards/dark_project/cm81/mcuconf.h create mode 100644 keyboards/dark_project/cm81/readme.md create mode 100644 keyboards/dark_project/cm81/rules.mk diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c new file mode 100644 index 00000000000..0f4e4a70cfe --- /dev/null +++ b/keyboards/dark_project/cm81/cm81.c @@ -0,0 +1,132 @@ +// Copyright 2023 jonylee@hfd (@jonylee1897) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" +// clang-format off +#ifdef RGB_MATRIX_ENABLE +const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {1, A_1, B_1, C_1}, + {1, A_2, B_2, C_2}, + {1, A_3, B_3, C_3}, + {1, A_4, B_4, C_4}, + {1, A_5, B_5, C_5}, + {1, A_6, B_6, C_6}, + {1, A_7, B_7, C_7}, + {1, A_8, B_8, C_8}, + {1, A_9, B_9, C_9}, + {1, A_10, B_10, C_10}, + {1, A_11, B_11, C_11}, + {1, A_12, B_12, C_12}, + {1, A_13, B_13, C_13}, + {1, A_14, B_14, C_14}, + + {0, A_1, B_1, C_1}, + {0, A_2, B_2, C_2}, + {0, A_3, B_3, C_3}, + {0, A_4, B_4, C_4}, + {0, A_5, B_5, C_5}, + {0, A_6, B_6, C_6}, + {0, A_7, B_7, C_7}, + {0, A_8, B_8, C_8}, + {0, A_9, B_9, C_9}, + {0, A_10, B_10, C_10}, + {0, A_11, B_11, C_11}, + {0, A_12, B_12, C_12}, + {0, A_13, B_13, C_13}, + {0, A_14, B_14, C_14}, + {1, D_1, E_1, F_1}, + + {0, D_1, E_1, F_1}, + {0, D_2, E_2, F_2}, + {0, D_3, E_3, F_3}, + {0, D_4, E_4, F_4}, + {0, D_5, E_5, F_5}, + {0, D_6, E_6, F_6}, + {0, D_7, E_7, F_7}, + {0, D_8, E_8, F_8}, + {0, D_9, E_9, F_9}, + {0, D_10, E_10, F_10}, + {0, D_11, E_11, F_11}, + {0, D_12, E_12, F_12}, + {0, D_13, E_13, F_13}, + {0, D_14, E_14, F_14}, + {1, D_2, E_2, F_2}, + + {0, G_1, H_1, I_1}, + {0, G_2, H_2, I_2}, + {0, G_3, H_3, I_3}, + {0, G_4, H_4, I_4}, + {0, G_5, H_5, I_5}, + {0, G_6, H_6, I_6}, + {0, G_7, H_7, I_7}, + {0, G_8, H_8, I_8}, + {0, G_9, H_9, I_9}, + {0, G_10, H_10, I_10}, + {0, G_11, H_11, I_11}, + {0, G_12, H_12, I_12}, + {0, G_13, H_13, I_13}, + {1, D_3, E_3, F_3}, + + {0, J_1, K_1, L_1}, + {0, J_2, K_2, L_2}, + {0, J_3, K_3, L_3}, + {0, J_4, K_4, L_4}, + {0, J_5, K_5, L_5}, + {0, J_6, K_6, L_6}, + {0, J_7, K_7, L_7}, + {0, J_8, K_8, L_8}, + {0, J_9, K_9, L_9}, + {0, J_10, K_10, L_10}, + {0, J_11, K_11, L_11}, + {0, J_12, K_12, L_12}, + {1, D_7, E_7, F_7}, + + {0, J_13, K_13, L_13}, + {0, J_14, K_14, L_14}, + {0, J_15, K_15, L_15}, + {0, J_16, K_16, L_16}, + + {0, G_14, H_14, I_14}, + {0, G_15, H_15, I_15}, + {0, G_16, H_16, I_16}, + + {0, D_15, E_15, F_15}, + {1, D_6, E_6, F_6}, + {1, D_5, E_5, F_5}, + + {1, G_1, H_1, I_1}, + {1, G_2, H_2, I_2}, + {1, G_3, H_3, I_3}, + {1, G_4, H_4, I_4}, + {1, G_5, H_5, I_5}, + + {1, J_1, K_1, L_1}, + {1, J_2, K_2, L_2}, + {1, J_3, K_3, L_3}, + {1, J_4, K_4, L_4}, + {1, J_5, K_5, L_5}, +}; +#endif +// clang-format on +#define LED_MAC_OS_PIN B13 +#define LED_WIN_LOCK_PIN B14 + +void matrix_init_kb(void){ + // set our LED pings as output + // setPinOutput(LED_CAPS_LOCK_PIN); // LED1 Num Lock + // writePinLow(LED_CAPS_LOCK_PIN); + setPinOutput(LED_MAC_OS_PIN); // LDE2 MAC\WIN + writePinLow(LED_MAC_OS_PIN); + setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock + writePinLow(LED_WIN_LOCK_PIN); +} +void matrix_scan_kb(void) { + writePin(LED_MAC_OS_PIN, ((get_highest_layer(default_layer_state | layer_state) == 2) || (get_highest_layer(default_layer_state | layer_state) == 3))); + writePin(LED_WIN_LOCK_PIN, keymap_config.no_gui); +} diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h new file mode 100644 index 00000000000..411c38b0df7 --- /dev/null +++ b/keyboards/dark_project/cm81/config.h @@ -0,0 +1,41 @@ +// Copyright 2023 jonylee@hfd (@jonylee1897) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define RGB_TRIGGER_ON_KEYDOWN +/* Force NKRO on boot up regardless of the setting saved in the EEPROM (uncomment to enable it) */ + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* SPI Config for spi flash*/ +#define SPI_DRIVER SPIDQ +#define SPI_SCK_PIN B3 +#define SPI_MOSI_PIN B5 +#define SPI_MISO_PIN B4 +#define SPI_MOSI_PAL_MODE 5 + +#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 +#define WEAR_LEVELING_BACKING_SIZE (8 * 1024) + +/* I2C Config for LED Driver */ +#define DRIVER_COUNT 2 +#define DRIVER_ADDR_1 0b1110100 +#define DRIVER_ADDR_2 0b1110111 +#define I2C1_SDA_PIN B7 +#define I2C1_SCL_PIN B6 +#define I2C1_SCL_PAL_MODE 4 +#define I2C1_OPMODE OPMODE_I2C +#define I2C1_CLOCK_SPEED 400000 /* 400000 */ + +#define DRIVER_1_LED_TOTAL 60 +#define DRIVER_2_LED_TOTAL 21 +#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + 10) + +#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended + +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dark_project/cm81/halconf.h b/keyboards/dark_project/cm81/halconf.h new file mode 100644 index 00000000000..7db96a3b57b --- /dev/null +++ b/keyboards/dark_project/cm81/halconf.h @@ -0,0 +1,11 @@ +// Copyright 2023 jonylee@hfd (@jonylee1897) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_I2C TRUE +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/dark_project/cm81/info.json b/keyboards/dark_project/cm81/info.json new file mode 100644 index 00000000000..0c996a11b0d --- /dev/null +++ b/keyboards/dark_project/cm81/info.json @@ -0,0 +1,250 @@ +{ + "manufacturer": "Dark Project", + "keyboard_name": "CM81 Landau", + "maintainer": "jonylee@hfd", + "usb": { + "vid": "0xFFFE", + "pid": "0x001F", + "device_version": "1.0.0", + "force_nkro": true, + "suspend_wakeup_delay": 1000 + }, + "processor": "WB32FQ95", + "bootloader": "wb32-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "haptic": false, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2"], + "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] + }, + "diode_direction": "ROW2COL", + "indicators": { + "caps_lock": "B12" + }, + "rgb_matrix": { + "driver": "ckled2001", + "max_brightness": 180, + "val_steps": 40, + "speed_steps": 51, + "hue_steps": 37, + "animations": { + "solid_color": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "rainbow_moving_chevron": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "raindrops": true, + "typing_heatmap": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "multisplash": true + }, + "layout": [ + { "flags": 4, "matrix": [0,0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0,1], "x": 14, "y": 0 }, + { "flags": 4, "matrix": [0,2], "x": 29, "y": 0 }, + { "flags": 4, "matrix": [0,3], "x": 44, "y": 0 }, + { "flags": 4, "matrix": [0,4], "x": 59, "y": 0 }, + { "flags": 4, "matrix": [0,5], "x": 74, "y": 0 }, + { "flags": 4, "matrix": [0,6], "x": 89, "y": 0 }, + { "flags": 4, "matrix": [0,7], "x": 104, "y": 0 }, + { "flags": 4, "matrix": [0,8], "x": 119, "y": 0 }, + { "flags": 4, "matrix": [0,9], "x": 134, "y": 0 }, + { "flags": 4, "matrix": [0,10], "x": 149, "y": 0 }, + { "flags": 4, "matrix": [0,11], "x": 164, "y": 0 }, + { "flags": 4, "matrix": [0,12], "x": 179, "y": 0 }, + { "flags": 4, "matrix": [0,13], "x": 224, "y": 0 }, + + { "flags": 4, "matrix": [1,0], "x": 0, "y": 13}, + { "flags": 4, "matrix": [1,1], "x": 14, "y": 13}, + { "flags": 4, "matrix": [1,2], "x": 28, "y": 13}, + { "flags": 4, "matrix": [1,3], "x": 42, "y": 13}, + { "flags": 4, "matrix": [1,4], "x": 56, "y": 13}, + { "flags": 4, "matrix": [1,5], "x": 70, "y": 13}, + { "flags": 4, "matrix": [1,6], "x": 84, "y": 13}, + { "flags": 4, "matrix": [1,7], "x": 98, "y": 13}, + { "flags": 4, "matrix": [1,8], "x": 112, "y": 13}, + { "flags": 4, "matrix": [1,9], "x": 126, "y": 13}, + { "flags": 4, "matrix": [1,10], "x": 140, "y": 13}, + { "flags": 4, "matrix": [1,11], "x": 154, "y": 13}, + { "flags": 4, "matrix": [1,12], "x": 168, "y": 13}, + { "flags": 4, "matrix": [1,13], "x": 182, "y": 13}, + { "flags": 4, "matrix": [1,15], "x": 224, "y": 13}, + + { "flags": 4, "matrix": [2,0], "x": 0, "y": 26}, + { "flags": 4, "matrix": [2,1], "x": 14, "y": 26}, + { "flags": 4, "matrix": [2,2], "x": 28, "y": 26}, + { "flags": 4, "matrix": [2,3], "x": 42, "y": 26}, + { "flags": 4, "matrix": [2,4], "x": 56, "y": 26}, + { "flags": 4, "matrix": [2,5], "x": 70, "y": 26}, + { "flags": 4, "matrix": [2,6], "x": 84, "y": 26}, + { "flags": 4, "matrix": [2,7], "x": 98, "y": 26}, + { "flags": 4, "matrix": [2,8], "x": 112, "y": 26}, + { "flags": 4, "matrix": [2,9], "x": 126, "y": 26}, + { "flags": 4, "matrix": [2,10], "x": 140, "y": 26}, + { "flags": 4, "matrix": [2,11], "x": 154, "y": 26}, + { "flags": 4, "matrix": [2,12], "x": 168, "y": 26}, + { "flags": 4, "matrix": [2,13], "x": 182, "y": 26}, + { "flags": 4, "matrix": [2,15], "x": 224, "y": 26}, + + { "flags": 1, "matrix": [3,0], "x": 0, "y": 38}, + { "flags": 4, "matrix": [3,1], "x": 28, "y": 38}, + { "flags": 4, "matrix": [3,2], "x": 42, "y": 38}, + { "flags": 4, "matrix": [3,3], "x": 56, "y": 38}, + { "flags": 4, "matrix": [3,4], "x": 70, "y": 38}, + { "flags": 4, "matrix": [3,5], "x": 84, "y": 38}, + { "flags": 4, "matrix": [3,6], "x": 98, "y": 38}, + { "flags": 4, "matrix": [3,7], "x": 112, "y": 38}, + { "flags": 4, "matrix": [3,8], "x": 126, "y": 38}, + { "flags": 4, "matrix": [3,9], "x": 140, "y": 38}, + { "flags": 4, "matrix": [3,10], "x": 154, "y": 38}, + { "flags": 4, "matrix": [3,11], "x": 168, "y": 38}, + { "flags": 1, "matrix": [3,13], "x": 182, "y": 38}, + { "flags": 4, "matrix": [3,15], "x": 224, "y": 38}, + + { "flags": 1, "matrix": [4,0], "x": 0, "y": 51}, + { "flags": 4, "matrix": [4,1], "x": 18, "y": 51}, + { "flags": 4, "matrix": [4,2], "x": 37, "y": 51}, + { "flags": 4, "matrix": [4,3], "x": 56, "y": 51}, + { "flags": 4, "matrix": [4,4], "x": 74, "y": 51}, + { "flags": 4, "matrix": [4,5], "x": 93, "y": 51}, + { "flags": 4, "matrix": [4,6], "x": 112, "y": 51}, + { "flags": 4, "matrix": [4,7], "x": 130, "y": 51}, + { "flags": 4, "matrix": [4,8], "x": 149, "y": 51}, + { "flags": 4, "matrix": [4,9], "x": 168, "y": 51}, + { "flags": 4, "matrix": [4,10], "x": 186, "y": 51}, + { "flags": 1, "matrix": [4,13], "x": 200, "y": 51}, + { "flags": 1, "matrix": [4,14], "x": 214, "y": 51}, + + { "flags": 1, "matrix": [5,0], "x": 0, "y": 64}, + { "flags": 1, "matrix": [5,1], "x": 18, "y": 64}, + { "flags": 1, "matrix": [5,2], "x": 37, "y": 64}, + { "flags": 4, "matrix": [5,5], "x": 92, "y": 64}, + { "flags": 1, "matrix": [5,9], "x": 140, "y": 64}, + { "flags": 1, "matrix": [5,10], "x": 154, "y": 64}, + { "flags": 1, "matrix": [5,11], "x": 168, "y": 64}, + { "flags": 1, "matrix": [5,13], "x": 196, "y": 64}, + { "flags": 1, "matrix": [5,14], "x": 210, "y": 64}, + { "flags": 1, "matrix": [5,15], "x": 224, "y": 64}, + + { "flags": 2, "x": 0, "y": 0 }, + { "flags": 2, "x": 0, "y": 16}, + { "flags": 2, "x": 0, "y": 32}, + { "flags": 2, "x": 0, "y": 48}, + { "flags": 2, "x": 0, "y": 64}, + + { "flags": 2, "x": 224, "y": 0 }, + { "flags": 2, "x": 224, "y": 16}, + { "flags": 2, "x": 224, "y": 32}, + { "flags": 2, "x": 224, "y": 48}, + { "flags": 2, "x": 224, "y": 64} + ] + }, + "layouts": { + "LAYOUT_ansi": { + "layout": [ + { "matrix": [0,0], "x": 0, "y": 0 }, + { "matrix": [0,1], "x": 2, "y": 0 }, + { "matrix": [0,2], "x": 3, "y": 0 }, + { "matrix": [0,3], "x": 4, "y": 0 }, + { "matrix": [0,4], "x": 5, "y": 0 }, + { "matrix": [0,5], "x": 6.5, "y": 0 }, + { "matrix": [0,6], "x": 7.5, "y": 0 }, + { "matrix": [0,7], "x": 8.5, "y": 0 }, + { "matrix": [0,8], "x": 9.5, "y": 0 }, + { "matrix": [0,9], "x": 11, "y": 0 }, + { "matrix": [0,10], "x": 12, "y": 0 }, + { "matrix": [0,11], "x": 13, "y": 0 }, + { "matrix": [0,12], "x": 14, "y": 0 }, + { "matrix": [0,13], "x": 15.25, "y": 0 }, + + { "matrix": [1,0], "x": 0, "y": 1.25 }, + { "matrix": [1,1], "x": 1, "y": 1.25 }, + { "matrix": [1,2], "x": 2, "y": 1.25 }, + { "matrix": [1,3], "x": 3, "y": 1.25 }, + { "matrix": [1,4], "x": 4, "y": 1.25 }, + { "matrix": [1,5], "x": 5, "y": 1.25 }, + { "matrix": [1,6], "x": 6, "y": 1.25 }, + { "matrix": [1,7], "x": 7, "y": 1.25 }, + { "matrix": [1,8], "x": 8, "y": 1.25 }, + { "matrix": [1,9], "x": 9, "y": 1.25 }, + { "matrix": [1,10], "x": 10, "y": 1.25 }, + { "matrix": [1,11], "x": 11, "y": 1.25 }, + { "matrix": [1,12], "x": 12, "y": 1.25 }, + { "matrix": [1,13], "w": 2, "x": 13, "y": 1.25 }, + { "matrix": [1,15], "x": 15.25, "y": 1.25 }, + + { "matrix": [2,0], "w": 1.5, "x": 0, "y": 2.25 }, + { "matrix": [2,1], "x": 1.5, "y": 2.25 }, + { "matrix": [2,2], "x": 2.5, "y": 2.25 }, + { "matrix": [2,3], "x": 3.5, "y": 2.25 }, + { "matrix": [2,4], "x": 4.5, "y": 2.25 }, + { "matrix": [2,5], "x": 5.5, "y": 2.25 }, + { "matrix": [2,6], "x": 6.5, "y": 2.25 }, + { "matrix": [2,7], "x": 7.5, "y": 2.25 }, + { "matrix": [2,8], "x": 8.5, "y": 2.25 }, + { "matrix": [2,9], "x": 9.5, "y": 2.25 }, + { "matrix": [2,10], "x": 10.5, "y": 2.25 }, + { "matrix": [2,11], "x": 11.5, "y": 2.25 }, + { "matrix": [2,12], "x": 12.5, "y": 2.25 }, + { "matrix": [2,13], "w": 1.5, "x": 13.5, "y": 2.25 }, + { "matrix": [2,15], "x": 15.25, "y": 2.25 }, + + { "matrix": [3,0], "w": 1.75, "x": 0, "y": 3.25 }, + { "matrix": [3,1], "x": 1.75, "y": 3.25 }, + { "matrix": [3,2], "x": 2.75, "y": 3.25 }, + { "matrix": [3,3], "x": 3.75, "y": 3.25 }, + { "matrix": [3,4], "x": 4.75, "y": 3.25 }, + { "matrix": [3,5], "x": 5.75, "y": 3.25 }, + { "matrix": [3,6], "x": 6.75, "y": 3.25 }, + { "matrix": [3,7], "x": 7.75, "y": 3.25 }, + { "matrix": [3,8], "x": 8.75, "y": 3.25 }, + { "matrix": [3,9], "x": 9.75, "y": 3.25 }, + { "matrix": [3,10], "x": 10.75, "y": 3.25 }, + { "matrix": [3,11], "x": 11.75, "y": 3.25 }, + { "matrix": [3,13], "w": 2.25, "x": 12.75, "y": 3.25 }, + { "matrix": [3,15], "x": 15.25, "y": 3.25 }, + + { "matrix": [4,0], "w": 2.25, "x": 0, "y": 4.25 }, + { "matrix": [4,1], "x": 2.25, "y": 4.25 }, + { "matrix": [4,2], "x": 3.25, "y": 4.25 }, + { "matrix": [4,3], "x": 4.25, "y": 4.25 }, + { "matrix": [4,4], "x": 5.25, "y": 4.25 }, + { "matrix": [4,5], "x": 6.25, "y": 4.25 }, + { "matrix": [4,6], "x": 7.25, "y": 4.25 }, + { "matrix": [4,7], "x": 8.25, "y": 4.25 }, + { "matrix": [4,8], "x": 9.25, "y": 4.25 }, + { "matrix": [4,9], "x": 10.25, "y": 4.25 }, + { "matrix": [4,10], "x": 11.25, "y": 4.25 }, + { "matrix": [4,13], "w": 1.75, "x": 12.25, "y": 4.25 }, + { "matrix": [4,14], "x": 14.25, "y": 4.5 }, + + { "matrix": [5,0], "w": 1.25, "x": 0, "y": 5.25 }, + { "matrix": [5,1], "w": 1.25, "x": 1.25, "y": 5.25 }, + { "matrix": [5,2], "w": 1.25, "x": 2.5, "y": 5.25 }, + { "matrix": [5,5], "w": 6.25, "x": 3.75, "y": 5.25 }, + { "matrix": [5,9], "x": 10, "y": 5.25 }, + { "matrix": [5,10], "x": 11, "y": 5.25 }, + { "matrix": [5,11], "x": 12, "y": 5.25 }, + { "matrix": [5,13], "x": 13.25, "y": 5.5 }, + { "matrix": [5,14], "x": 14.25, "y": 5.5 }, + { "matrix": [5,15], "x": 15.25, "y": 5.5 } + ] + } + } +} diff --git a/keyboards/dark_project/cm81/keymaps/default/keymap.c b/keyboards/dark_project/cm81/keymaps/default/keymap.c new file mode 100644 index 00000000000..6f70d1847a3 --- /dev/null +++ b/keyboards/dark_project/cm81/keymaps/default/keymap.c @@ -0,0 +1,47 @@ +// Copyright 2023 jonylee@hfd (@jonylee1897) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +// clang-format off +enum __layers { + WIN_B, + WIN_FN, + MAC_B, + MAC_FN +}; +#define KC_SIRI LGUI(KC_SPC) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [WIN_B] = LAYOUT_ansi( /* Base */ + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [WIN_FN] = LAYOUT_ansi( /* FN */ + _______, KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, + _______, _______, DF(MAC_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), + + [MAC_B] = LAYOUT_ansi( /* Base */ + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_SIRI, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [MAC_FN] = LAYOUT_ansi( /* FN */ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, + _______, DF(WIN_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI) +}; diff --git a/keyboards/dark_project/cm81/keymaps/via/keymap.c b/keyboards/dark_project/cm81/keymaps/via/keymap.c new file mode 100644 index 00000000000..6f70d1847a3 --- /dev/null +++ b/keyboards/dark_project/cm81/keymaps/via/keymap.c @@ -0,0 +1,47 @@ +// Copyright 2023 jonylee@hfd (@jonylee1897) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +// clang-format off +enum __layers { + WIN_B, + WIN_FN, + MAC_B, + MAC_FN +}; +#define KC_SIRI LGUI(KC_SPC) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [WIN_B] = LAYOUT_ansi( /* Base */ + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [WIN_FN] = LAYOUT_ansi( /* FN */ + _______, KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, + _______, _______, DF(MAC_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), + + [MAC_B] = LAYOUT_ansi( /* Base */ + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_SIRI, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [MAC_FN] = LAYOUT_ansi( /* FN */ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, + _______, DF(WIN_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI) +}; diff --git a/keyboards/dark_project/cm81/keymaps/via/rules.mk b/keyboards/dark_project/cm81/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/dark_project/cm81/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/dark_project/cm81/mcuconf.h b/keyboards/dark_project/cm81/mcuconf.h new file mode 100644 index 00000000000..9a96f2d8f9a --- /dev/null +++ b/keyboards/dark_project/cm81/mcuconf.h @@ -0,0 +1,12 @@ +// Copyright 2023 jonylee@hfd (@jonylee1897) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef WB32_SPI_USE_QSPI +#define WB32_SPI_USE_QSPI TRUE + +#undef WB32_I2C_USE_I2C1 +#define WB32_I2C_USE_I2C1 TRUE diff --git a/keyboards/dark_project/cm81/readme.md b/keyboards/dark_project/cm81/readme.md new file mode 100644 index 00000000000..cf281d9f674 --- /dev/null +++ b/keyboards/dark_project/cm81/readme.md @@ -0,0 +1,19 @@ +# CM81 Landau keyboard + +A customizable 75% keyboard. + +* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986) +* Hardware Supported: CM81 Landau +* Hardware Availability: [Dark Project](https://darkproject.eu/) + +Make example for this keyboard (after setting up your build environment): + + make dark_project/cm81:default + +Flashing example for this keyboard: + + make dark_project/cm81:default:flash + +**Reset Key**: Hold down the key located at *K00*, which programmed as *Esc* while plugging in the keyboard. + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/dark_project/cm81/rules.mk b/keyboards/dark_project/cm81/rules.mk new file mode 100644 index 00000000000..428218bc2de --- /dev/null +++ b/keyboards/dark_project/cm81/rules.mk @@ -0,0 +1,7 @@ +# Build Options +# change yes to no to disable +# +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = spi_flash +#RGB_MATRIX_CUSTOM_KB = yes #Add turnoff LED + From 01e11fa84d19d6346f0a6105d3f8ed0ee9fb5761 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:56:29 +0800 Subject: [PATCH 02/45] Update keyboards/dark_project/cm81/info.json Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/info.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/dark_project/cm81/info.json b/keyboards/dark_project/cm81/info.json index 0c996a11b0d..4cd7675fc23 100644 --- a/keyboards/dark_project/cm81/info.json +++ b/keyboards/dark_project/cm81/info.json @@ -32,9 +32,6 @@ "rgb_matrix": { "driver": "ckled2001", "max_brightness": 180, - "val_steps": 40, - "speed_steps": 51, - "hue_steps": 37, "animations": { "solid_color": true, "breathing": true, From 4e237bb0f18c337040d2fd76588a48e309715dd8 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:56:41 +0800 Subject: [PATCH 03/45] Update keyboards/dark_project/cm81/info.json Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dark_project/cm81/info.json b/keyboards/dark_project/cm81/info.json index 4cd7675fc23..723f53b7aeb 100644 --- a/keyboards/dark_project/cm81/info.json +++ b/keyboards/dark_project/cm81/info.json @@ -18,7 +18,6 @@ "extrakey": true, "mousekey": true, "nkro": true, - "haptic": false, "rgb_matrix": true }, "matrix_pins": { From cc242f64adf7000f218f691ce1b26e6b7288cb07 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:56:48 +0800 Subject: [PATCH 04/45] Update keyboards/dark_project/cm81/config.h Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h index 411c38b0df7..7303e1e3f1d 100644 --- a/keyboards/dark_project/cm81/config.h +++ b/keyboards/dark_project/cm81/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_TRIGGER_ON_KEYDOWN -/* Force NKRO on boot up regardless of the setting saved in the EEPROM (uncomment to enable it) */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE From 23a2df52921045601448e66776fba56a98e56752 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:56:59 +0800 Subject: [PATCH 05/45] Update keyboards/dark_project/cm81/cm81.c Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/cm81.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index 0f4e4a70cfe..5a7ed3de25e 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -125,6 +125,7 @@ void matrix_init_kb(void){ writePinLow(LED_MAC_OS_PIN); setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock writePinLow(LED_WIN_LOCK_PIN); + matrix_init_user(); } void matrix_scan_kb(void) { writePin(LED_MAC_OS_PIN, ((get_highest_layer(default_layer_state | layer_state) == 2) || (get_highest_layer(default_layer_state | layer_state) == 3))); From 81bb3d0e859ce226cad6d111bef088be6e685043 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:57:15 +0800 Subject: [PATCH 06/45] Update keyboards/dark_project/cm81/rules.mk Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/rules.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/dark_project/cm81/rules.mk b/keyboards/dark_project/cm81/rules.mk index 428218bc2de..24d5f6f52ec 100644 --- a/keyboards/dark_project/cm81/rules.mk +++ b/keyboards/dark_project/cm81/rules.mk @@ -1,7 +1,2 @@ -# Build Options -# change yes to no to disable -# EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = spi_flash -#RGB_MATRIX_CUSTOM_KB = yes #Add turnoff LED - From 2cbf91cfba6552d99b37614ac0d8e688194efdff Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:57:24 +0800 Subject: [PATCH 07/45] Update keyboards/dark_project/cm81/readme.md Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/readme.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/keyboards/dark_project/cm81/readme.md b/keyboards/dark_project/cm81/readme.md index cf281d9f674..3bc5abaf258 100644 --- a/keyboards/dark_project/cm81/readme.md +++ b/keyboards/dark_project/cm81/readme.md @@ -14,6 +14,11 @@ Flashing example for this keyboard: make dark_project/cm81:default:flash -**Reset Key**: Hold down the key located at *K00*, which programmed as *Esc* while plugging in the keyboard. - See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 70473b9e0e0cd54f029e6f17acd416ed137172ab Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:57:37 +0800 Subject: [PATCH 08/45] Update keyboards/dark_project/cm81/cm81.c Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/cm81.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index 5a7ed3de25e..11a6c3a308e 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -130,4 +130,5 @@ void matrix_init_kb(void){ void matrix_scan_kb(void) { writePin(LED_MAC_OS_PIN, ((get_highest_layer(default_layer_state | layer_state) == 2) || (get_highest_layer(default_layer_state | layer_state) == 3))); writePin(LED_WIN_LOCK_PIN, keymap_config.no_gui); + matrix_scan_user(); } From 078ca10dcb435061ef981a705a1ea8014e111b6a Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:58:29 +0800 Subject: [PATCH 09/45] Update config.h --- keyboards/dark_project/cm81/config.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h index 7303e1e3f1d..ad81856b5f7 100644 --- a/keyboards/dark_project/cm81/config.h +++ b/keyboards/dark_project/cm81/config.h @@ -30,9 +30,7 @@ #define I2C1_OPMODE OPMODE_I2C #define I2C1_CLOCK_SPEED 400000 /* 400000 */ -#define DRIVER_1_LED_TOTAL 60 -#define DRIVER_2_LED_TOTAL 21 -#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + 10) +#define RGB_MATRIX_LED_COUNT 91 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended From bee396d4c7ab1c6f36c050405ecf7ab0bc229100 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 27 Sep 2023 10:29:54 +0800 Subject: [PATCH 10/45] Update keyboards/dark_project/cm81/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- .../cm81/keymaps/default/keymap.c | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/keyboards/dark_project/cm81/keymaps/default/keymap.c b/keyboards/dark_project/cm81/keymaps/default/keymap.c index 6f70d1847a3..ca58b4ab3ed 100644 --- a/keyboards/dark_project/cm81/keymaps/default/keymap.c +++ b/keyboards/dark_project/cm81/keymaps/default/keymap.c @@ -14,34 +14,34 @@ enum __layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_B] = LAYOUT_ansi( /* Base */ - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_ansi( /* FN */ - _______, KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, - _______, _______, DF(MAC_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, - _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), + _______, KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, + _______, _______, DF(MAC_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), [MAC_B] = LAYOUT_ansi( /* Base */ - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_SIRI, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_SIRI, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_ansi( /* FN */ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, - _______, DF(WIN_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI) + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, + _______, DF(WIN_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI) }; From 29675521191402b3806e0ffcf6bc9e7182323312 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 27 Sep 2023 10:30:03 +0800 Subject: [PATCH 11/45] Update keyboards/dark_project/cm81/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- .../dark_project/cm81/keymaps/via/keymap.c | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/keyboards/dark_project/cm81/keymaps/via/keymap.c b/keyboards/dark_project/cm81/keymaps/via/keymap.c index 6f70d1847a3..ca58b4ab3ed 100644 --- a/keyboards/dark_project/cm81/keymaps/via/keymap.c +++ b/keyboards/dark_project/cm81/keymaps/via/keymap.c @@ -14,34 +14,34 @@ enum __layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_B] = LAYOUT_ansi( /* Base */ - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_ansi( /* FN */ - _______, KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, - _______, _______, DF(MAC_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, - _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), + _______, KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, + _______, _______, DF(MAC_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), [MAC_B] = LAYOUT_ansi( /* Base */ - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_SIRI, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_SIRI, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_ansi( /* FN */ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, - _______, DF(WIN_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI) + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, + _______, DF(WIN_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI) }; From d55a2b9f50294e9307db681c21d7854dcccb3f36 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Sat, 18 Nov 2023 10:31:30 +0800 Subject: [PATCH 12/45] Update cm81.c --- keyboards/dark_project/cm81/cm81.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index 11a6c3a308e..6ca17251d5d 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -1,4 +1,4 @@ -// Copyright 2023 jonylee@hfd (@jonylee1897) +// Copyright 2023 jonylee@hfd (@jonylee1987) // SPDX-License-Identifier: GPL-2.0-or-later #include "quantum.h" @@ -114,8 +114,6 @@ const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { }; #endif // clang-format on -#define LED_MAC_OS_PIN B13 -#define LED_WIN_LOCK_PIN B14 void matrix_init_kb(void){ // set our LED pings as output From ec267fe4b48e7523c08d3bcba68fcdf920c63683 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Sat, 18 Nov 2023 10:32:05 +0800 Subject: [PATCH 13/45] Update config.h --- keyboards/dark_project/cm81/config.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h index ad81856b5f7..4a5040e29c5 100644 --- a/keyboards/dark_project/cm81/config.h +++ b/keyboards/dark_project/cm81/config.h @@ -36,3 +36,6 @@ #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES + +#define LED_MAC_OS_PIN B13 +#define LED_WIN_LOCK_PIN B14 From 98171938885be6e26d99dede944aaf99fd146b3d Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Sat, 18 Nov 2023 10:32:35 +0800 Subject: [PATCH 14/45] Update config.h --- keyboards/dark_project/cm81/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h index 4a5040e29c5..dcb13489069 100644 --- a/keyboards/dark_project/cm81/config.h +++ b/keyboards/dark_project/cm81/config.h @@ -1,4 +1,4 @@ -// Copyright 2023 jonylee@hfd (@jonylee1897) +// Copyright 2023 jonylee@hfd (@jonylee1987) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once From 92e6a58842d30a6e12bc9ba2cc78f1cc42da5abf Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Sat, 18 Nov 2023 10:33:08 +0800 Subject: [PATCH 15/45] Update halconf.h --- keyboards/dark_project/cm81/halconf.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/dark_project/cm81/halconf.h b/keyboards/dark_project/cm81/halconf.h index 7db96a3b57b..9f895ca1ebf 100644 --- a/keyboards/dark_project/cm81/halconf.h +++ b/keyboards/dark_project/cm81/halconf.h @@ -1,6 +1,5 @@ -// Copyright 2023 jonylee@hfd (@jonylee1897) +// Copyright 2023 jonylee@hfd (@jonylee1986) // SPDX-License-Identifier: GPL-2.0-or-later - #pragma once #define HAL_USE_I2C TRUE From 214ebcf1101a5fe5016cd4407468d25a8f8cfc78 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Sat, 18 Nov 2023 10:33:35 +0800 Subject: [PATCH 16/45] Update cm81.c --- keyboards/dark_project/cm81/cm81.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index 6ca17251d5d..2855d761e2a 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -1,4 +1,4 @@ -// Copyright 2023 jonylee@hfd (@jonylee1987) +// Copyright 2023 jonylee@hfd (@jonylee1986) // SPDX-License-Identifier: GPL-2.0-or-later #include "quantum.h" From 69117b45d5abbd2c94a14ec38affe99c968ecc2b Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Sat, 18 Nov 2023 10:34:06 +0800 Subject: [PATCH 17/45] Update config.h --- keyboards/dark_project/cm81/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h index dcb13489069..4c5b8f75738 100644 --- a/keyboards/dark_project/cm81/config.h +++ b/keyboards/dark_project/cm81/config.h @@ -1,4 +1,4 @@ -// Copyright 2023 jonylee@hfd (@jonylee1987) +// Copyright 2023 jonylee@hfd (@jonylee1986) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once From 801f2672712a17dcffbffe31fa3f470ab09cc82d Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Sat, 18 Nov 2023 10:34:42 +0800 Subject: [PATCH 18/45] Update keymap.c --- keyboards/dark_project/cm81/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dark_project/cm81/keymaps/default/keymap.c b/keyboards/dark_project/cm81/keymaps/default/keymap.c index ca58b4ab3ed..8af53acd063 100644 --- a/keyboards/dark_project/cm81/keymaps/default/keymap.c +++ b/keyboards/dark_project/cm81/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2023 jonylee@hfd (@jonylee1897) +// Copyright 2023 jonylee@hfd (@jonylee1986) // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H From 08eed95b44c798523f14e86d11af20c7444c3c7a Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Sat, 18 Nov 2023 10:35:16 +0800 Subject: [PATCH 19/45] Update keymap.c --- keyboards/dark_project/cm81/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dark_project/cm81/keymaps/via/keymap.c b/keyboards/dark_project/cm81/keymaps/via/keymap.c index ca58b4ab3ed..8af53acd063 100644 --- a/keyboards/dark_project/cm81/keymaps/via/keymap.c +++ b/keyboards/dark_project/cm81/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2023 jonylee@hfd (@jonylee1897) +// Copyright 2023 jonylee@hfd (@jonylee1986) // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H From d61b53eee4608c5a86f74cbc36c7bf8f1487e701 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Sat, 18 Nov 2023 10:36:03 +0800 Subject: [PATCH 20/45] Update mcuconf.h --- keyboards/dark_project/cm81/mcuconf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dark_project/cm81/mcuconf.h b/keyboards/dark_project/cm81/mcuconf.h index 9a96f2d8f9a..aa272655630 100644 --- a/keyboards/dark_project/cm81/mcuconf.h +++ b/keyboards/dark_project/cm81/mcuconf.h @@ -1,4 +1,4 @@ -// Copyright 2023 jonylee@hfd (@jonylee1897) +// Copyright 2023 jonylee@hfd (@jonylee1986) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once From 4d83c705a4de118d074d0c91a1b813d66c24fea8 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:00:39 +0800 Subject: [PATCH 21/45] Update cm81.c --- keyboards/dark_project/cm81/cm81.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index 2855d761e2a..8b2094fa3a3 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -4,7 +4,7 @@ #include "quantum.h" // clang-format off #ifdef RGB_MATRIX_ENABLE -const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { +const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location From a7e5f49fe40a35ddc99710e1e7444790bd031946 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:02:13 +0800 Subject: [PATCH 22/45] Update info.json --- keyboards/dark_project/cm81/info.json | 400 +++++++++++++------------- 1 file changed, 194 insertions(+), 206 deletions(-) diff --git a/keyboards/dark_project/cm81/info.json b/keyboards/dark_project/cm81/info.json index 723f53b7aeb..a76e060cea4 100644 --- a/keyboards/dark_project/cm81/info.json +++ b/keyboards/dark_project/cm81/info.json @@ -2,15 +2,8 @@ "manufacturer": "Dark Project", "keyboard_name": "CM81 Landau", "maintainer": "jonylee@hfd", - "usb": { - "vid": "0xFFFE", - "pid": "0x001F", - "device_version": "1.0.0", - "force_nkro": true, - "suspend_wakeup_delay": 1000 - }, - "processor": "WB32FQ95", "bootloader": "wb32-dfu", + "diode_direction": "ROW2COL", "features": { "bootmagic": true, "command": false, @@ -20,226 +13,221 @@ "nkro": true, "rgb_matrix": true }, - "matrix_pins": { - "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2"], - "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] - }, - "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B12" }, + "matrix_pins": { + "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], + "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] + }, + "processor": "WB32FQ95", "rgb_matrix": { - "driver": "ckled2001", - "max_brightness": 180, "animations": { - "solid_color": true, "breathing": true, "cycle_all": true, "cycle_left_right": true, - "cycle_up_down": true, "cycle_out_in": true, "cycle_out_in_dual": true, - "rainbow_moving_chevron": true, "cycle_pinwheel": true, "cycle_spiral": true, + "cycle_up_down": true, "dual_beacon": true, + "multisplash": true, "rainbow_beacon": true, + "rainbow_moving_chevron": true, "raindrops": true, - "typing_heatmap": true, - "solid_reactive_simple": true, + "solid_color": true, "solid_reactive": true, - "multisplash": true + "solid_reactive_simple": true, + "typing_heatmap": true }, + "driver": "snled27351", "layout": [ - { "flags": 4, "matrix": [0,0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0,1], "x": 14, "y": 0 }, - { "flags": 4, "matrix": [0,2], "x": 29, "y": 0 }, - { "flags": 4, "matrix": [0,3], "x": 44, "y": 0 }, - { "flags": 4, "matrix": [0,4], "x": 59, "y": 0 }, - { "flags": 4, "matrix": [0,5], "x": 74, "y": 0 }, - { "flags": 4, "matrix": [0,6], "x": 89, "y": 0 }, - { "flags": 4, "matrix": [0,7], "x": 104, "y": 0 }, - { "flags": 4, "matrix": [0,8], "x": 119, "y": 0 }, - { "flags": 4, "matrix": [0,9], "x": 134, "y": 0 }, - { "flags": 4, "matrix": [0,10], "x": 149, "y": 0 }, - { "flags": 4, "matrix": [0,11], "x": 164, "y": 0 }, - { "flags": 4, "matrix": [0,12], "x": 179, "y": 0 }, - { "flags": 4, "matrix": [0,13], "x": 224, "y": 0 }, - - { "flags": 4, "matrix": [1,0], "x": 0, "y": 13}, - { "flags": 4, "matrix": [1,1], "x": 14, "y": 13}, - { "flags": 4, "matrix": [1,2], "x": 28, "y": 13}, - { "flags": 4, "matrix": [1,3], "x": 42, "y": 13}, - { "flags": 4, "matrix": [1,4], "x": 56, "y": 13}, - { "flags": 4, "matrix": [1,5], "x": 70, "y": 13}, - { "flags": 4, "matrix": [1,6], "x": 84, "y": 13}, - { "flags": 4, "matrix": [1,7], "x": 98, "y": 13}, - { "flags": 4, "matrix": [1,8], "x": 112, "y": 13}, - { "flags": 4, "matrix": [1,9], "x": 126, "y": 13}, - { "flags": 4, "matrix": [1,10], "x": 140, "y": 13}, - { "flags": 4, "matrix": [1,11], "x": 154, "y": 13}, - { "flags": 4, "matrix": [1,12], "x": 168, "y": 13}, - { "flags": 4, "matrix": [1,13], "x": 182, "y": 13}, - { "flags": 4, "matrix": [1,15], "x": 224, "y": 13}, - - { "flags": 4, "matrix": [2,0], "x": 0, "y": 26}, - { "flags": 4, "matrix": [2,1], "x": 14, "y": 26}, - { "flags": 4, "matrix": [2,2], "x": 28, "y": 26}, - { "flags": 4, "matrix": [2,3], "x": 42, "y": 26}, - { "flags": 4, "matrix": [2,4], "x": 56, "y": 26}, - { "flags": 4, "matrix": [2,5], "x": 70, "y": 26}, - { "flags": 4, "matrix": [2,6], "x": 84, "y": 26}, - { "flags": 4, "matrix": [2,7], "x": 98, "y": 26}, - { "flags": 4, "matrix": [2,8], "x": 112, "y": 26}, - { "flags": 4, "matrix": [2,9], "x": 126, "y": 26}, - { "flags": 4, "matrix": [2,10], "x": 140, "y": 26}, - { "flags": 4, "matrix": [2,11], "x": 154, "y": 26}, - { "flags": 4, "matrix": [2,12], "x": 168, "y": 26}, - { "flags": 4, "matrix": [2,13], "x": 182, "y": 26}, - { "flags": 4, "matrix": [2,15], "x": 224, "y": 26}, - - { "flags": 1, "matrix": [3,0], "x": 0, "y": 38}, - { "flags": 4, "matrix": [3,1], "x": 28, "y": 38}, - { "flags": 4, "matrix": [3,2], "x": 42, "y": 38}, - { "flags": 4, "matrix": [3,3], "x": 56, "y": 38}, - { "flags": 4, "matrix": [3,4], "x": 70, "y": 38}, - { "flags": 4, "matrix": [3,5], "x": 84, "y": 38}, - { "flags": 4, "matrix": [3,6], "x": 98, "y": 38}, - { "flags": 4, "matrix": [3,7], "x": 112, "y": 38}, - { "flags": 4, "matrix": [3,8], "x": 126, "y": 38}, - { "flags": 4, "matrix": [3,9], "x": 140, "y": 38}, - { "flags": 4, "matrix": [3,10], "x": 154, "y": 38}, - { "flags": 4, "matrix": [3,11], "x": 168, "y": 38}, - { "flags": 1, "matrix": [3,13], "x": 182, "y": 38}, - { "flags": 4, "matrix": [3,15], "x": 224, "y": 38}, - - { "flags": 1, "matrix": [4,0], "x": 0, "y": 51}, - { "flags": 4, "matrix": [4,1], "x": 18, "y": 51}, - { "flags": 4, "matrix": [4,2], "x": 37, "y": 51}, - { "flags": 4, "matrix": [4,3], "x": 56, "y": 51}, - { "flags": 4, "matrix": [4,4], "x": 74, "y": 51}, - { "flags": 4, "matrix": [4,5], "x": 93, "y": 51}, - { "flags": 4, "matrix": [4,6], "x": 112, "y": 51}, - { "flags": 4, "matrix": [4,7], "x": 130, "y": 51}, - { "flags": 4, "matrix": [4,8], "x": 149, "y": 51}, - { "flags": 4, "matrix": [4,9], "x": 168, "y": 51}, - { "flags": 4, "matrix": [4,10], "x": 186, "y": 51}, - { "flags": 1, "matrix": [4,13], "x": 200, "y": 51}, - { "flags": 1, "matrix": [4,14], "x": 214, "y": 51}, - - { "flags": 1, "matrix": [5,0], "x": 0, "y": 64}, - { "flags": 1, "matrix": [5,1], "x": 18, "y": 64}, - { "flags": 1, "matrix": [5,2], "x": 37, "y": 64}, - { "flags": 4, "matrix": [5,5], "x": 92, "y": 64}, - { "flags": 1, "matrix": [5,9], "x": 140, "y": 64}, - { "flags": 1, "matrix": [5,10], "x": 154, "y": 64}, - { "flags": 1, "matrix": [5,11], "x": 168, "y": 64}, - { "flags": 1, "matrix": [5,13], "x": 196, "y": 64}, - { "flags": 1, "matrix": [5,14], "x": 210, "y": 64}, - { "flags": 1, "matrix": [5,15], "x": 224, "y": 64}, - - { "flags": 2, "x": 0, "y": 0 }, - { "flags": 2, "x": 0, "y": 16}, - { "flags": 2, "x": 0, "y": 32}, - { "flags": 2, "x": 0, "y": 48}, - { "flags": 2, "x": 0, "y": 64}, - - { "flags": 2, "x": 224, "y": 0 }, - { "flags": 2, "x": 224, "y": 16}, - { "flags": 2, "x": 224, "y": 32}, - { "flags": 2, "x": 224, "y": 48}, - { "flags": 2, "x": 224, "y": 64} - ] + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 14, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 29, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 44, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 59, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 74, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 89, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 104, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 224, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4}, + {"matrix": [1, 1], "x": 14, "y": 13, "flags": 4}, + {"matrix": [1, 2], "x": 28, "y": 13, "flags": 4}, + {"matrix": [1, 3], "x": 42, "y": 13, "flags": 4}, + {"matrix": [1, 4], "x": 56, "y": 13, "flags": 4}, + {"matrix": [1, 5], "x": 70, "y": 13, "flags": 4}, + {"matrix": [1, 6], "x": 84, "y": 13, "flags": 4}, + {"matrix": [1, 7], "x": 98, "y": 13, "flags": 4}, + {"matrix": [1, 8], "x": 112, "y": 13, "flags": 4}, + {"matrix": [1, 9], "x": 126, "y": 13, "flags": 4}, + {"matrix": [1, 10], "x": 140, "y": 13, "flags": 4}, + {"matrix": [1, 11], "x": 154, "y": 13, "flags": 4}, + {"matrix": [1, 12], "x": 168, "y": 13, "flags": 4}, + {"matrix": [1, 13], "x": 182, "y": 13, "flags": 4}, + {"matrix": [1, 15], "x": 224, "y": 13, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 26, "flags": 4}, + {"matrix": [2, 1], "x": 14, "y": 26, "flags": 4}, + {"matrix": [2, 2], "x": 28, "y": 26, "flags": 4}, + {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4}, + {"matrix": [2, 4], "x": 56, "y": 26, "flags": 4}, + {"matrix": [2, 5], "x": 70, "y": 26, "flags": 4}, + {"matrix": [2, 6], "x": 84, "y": 26, "flags": 4}, + {"matrix": [2, 7], "x": 98, "y": 26, "flags": 4}, + {"matrix": [2, 8], "x": 112, "y": 26, "flags": 4}, + {"matrix": [2, 9], "x": 126, "y": 26, "flags": 4}, + {"matrix": [2, 10], "x": 140, "y": 26, "flags": 4}, + {"matrix": [2, 11], "x": 154, "y": 26, "flags": 4}, + {"matrix": [2, 12], "x": 168, "y": 26, "flags": 4}, + {"matrix": [2, 13], "x": 182, "y": 26, "flags": 4}, + {"matrix": [2, 15], "x": 224, "y": 26, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 38, "flags": 1}, + {"matrix": [3, 1], "x": 28, "y": 38, "flags": 4}, + {"matrix": [3, 2], "x": 42, "y": 38, "flags": 4}, + {"matrix": [3, 3], "x": 56, "y": 38, "flags": 4}, + {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4}, + {"matrix": [3, 5], "x": 84, "y": 38, "flags": 4}, + {"matrix": [3, 6], "x": 98, "y": 38, "flags": 4}, + {"matrix": [3, 7], "x": 112, "y": 38, "flags": 4}, + {"matrix": [3, 8], "x": 126, "y": 38, "flags": 4}, + {"matrix": [3, 9], "x": 140, "y": 38, "flags": 4}, + {"matrix": [3, 10], "x": 154, "y": 38, "flags": 4}, + {"matrix": [3, 11], "x": 168, "y": 38, "flags": 4}, + {"matrix": [3, 13], "x": 182, "y": 38, "flags": 1}, + {"matrix": [3, 15], "x": 224, "y": 38, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 51, "flags": 1}, + {"matrix": [4, 1], "x": 18, "y": 51, "flags": 4}, + {"matrix": [4, 2], "x": 37, "y": 51, "flags": 4}, + {"matrix": [4, 3], "x": 56, "y": 51, "flags": 4}, + {"matrix": [4, 4], "x": 74, "y": 51, "flags": 4}, + {"matrix": [4, 5], "x": 93, "y": 51, "flags": 4}, + {"matrix": [4, 6], "x": 112, "y": 51, "flags": 4}, + {"matrix": [4, 7], "x": 130, "y": 51, "flags": 4}, + {"matrix": [4, 8], "x": 149, "y": 51, "flags": 4}, + {"matrix": [4, 9], "x": 168, "y": 51, "flags": 4}, + {"matrix": [4, 10], "x": 186, "y": 51, "flags": 4}, + {"matrix": [4, 13], "x": 200, "y": 51, "flags": 1}, + {"matrix": [4, 14], "x": 214, "y": 51, "flags": 1}, + {"matrix": [5, 0], "x": 0, "y": 64, "flags": 1}, + {"matrix": [5, 1], "x": 18, "y": 64, "flags": 1}, + {"matrix": [5, 2], "x": 37, "y": 64, "flags": 1}, + {"matrix": [5, 5], "x": 92, "y": 64, "flags": 4}, + {"matrix": [5, 9], "x": 140, "y": 64, "flags": 1}, + {"matrix": [5, 10], "x": 154, "y": 64, "flags": 1}, + {"matrix": [5, 11], "x": 168, "y": 64, "flags": 1}, + {"matrix": [5, 13], "x": 196, "y": 64, "flags": 1}, + {"matrix": [5, 14], "x": 210, "y": 64, "flags": 1}, + {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1}, + {"x": 0, "y": 0, "flags": 2}, + {"x": 0, "y": 16, "flags": 2}, + {"x": 0, "y": 32, "flags": 2}, + {"x": 0, "y": 48, "flags": 2}, + {"x": 0, "y": 64, "flags": 2}, + {"x": 224, "y": 0, "flags": 2}, + {"x": 224, "y": 16, "flags": 2}, + {"x": 224, "y": 32, "flags": 2}, + {"x": 224, "y": 48, "flags": 2}, + {"x": 224, "y": 64, "flags": 2} + ], + "max_brightness": 180 + }, + "usb": { + "device_version": "1.0.0", + "force_nkro": true, + "pid": "0x001F", + "suspend_wakeup_delay": 1000, + "vid": "0xFFFE" }, "layouts": { "LAYOUT_ansi": { "layout": [ - { "matrix": [0,0], "x": 0, "y": 0 }, - { "matrix": [0,1], "x": 2, "y": 0 }, - { "matrix": [0,2], "x": 3, "y": 0 }, - { "matrix": [0,3], "x": 4, "y": 0 }, - { "matrix": [0,4], "x": 5, "y": 0 }, - { "matrix": [0,5], "x": 6.5, "y": 0 }, - { "matrix": [0,6], "x": 7.5, "y": 0 }, - { "matrix": [0,7], "x": 8.5, "y": 0 }, - { "matrix": [0,8], "x": 9.5, "y": 0 }, - { "matrix": [0,9], "x": 11, "y": 0 }, - { "matrix": [0,10], "x": 12, "y": 0 }, - { "matrix": [0,11], "x": 13, "y": 0 }, - { "matrix": [0,12], "x": 14, "y": 0 }, - { "matrix": [0,13], "x": 15.25, "y": 0 }, - - { "matrix": [1,0], "x": 0, "y": 1.25 }, - { "matrix": [1,1], "x": 1, "y": 1.25 }, - { "matrix": [1,2], "x": 2, "y": 1.25 }, - { "matrix": [1,3], "x": 3, "y": 1.25 }, - { "matrix": [1,4], "x": 4, "y": 1.25 }, - { "matrix": [1,5], "x": 5, "y": 1.25 }, - { "matrix": [1,6], "x": 6, "y": 1.25 }, - { "matrix": [1,7], "x": 7, "y": 1.25 }, - { "matrix": [1,8], "x": 8, "y": 1.25 }, - { "matrix": [1,9], "x": 9, "y": 1.25 }, - { "matrix": [1,10], "x": 10, "y": 1.25 }, - { "matrix": [1,11], "x": 11, "y": 1.25 }, - { "matrix": [1,12], "x": 12, "y": 1.25 }, - { "matrix": [1,13], "w": 2, "x": 13, "y": 1.25 }, - { "matrix": [1,15], "x": 15.25, "y": 1.25 }, - - { "matrix": [2,0], "w": 1.5, "x": 0, "y": 2.25 }, - { "matrix": [2,1], "x": 1.5, "y": 2.25 }, - { "matrix": [2,2], "x": 2.5, "y": 2.25 }, - { "matrix": [2,3], "x": 3.5, "y": 2.25 }, - { "matrix": [2,4], "x": 4.5, "y": 2.25 }, - { "matrix": [2,5], "x": 5.5, "y": 2.25 }, - { "matrix": [2,6], "x": 6.5, "y": 2.25 }, - { "matrix": [2,7], "x": 7.5, "y": 2.25 }, - { "matrix": [2,8], "x": 8.5, "y": 2.25 }, - { "matrix": [2,9], "x": 9.5, "y": 2.25 }, - { "matrix": [2,10], "x": 10.5, "y": 2.25 }, - { "matrix": [2,11], "x": 11.5, "y": 2.25 }, - { "matrix": [2,12], "x": 12.5, "y": 2.25 }, - { "matrix": [2,13], "w": 1.5, "x": 13.5, "y": 2.25 }, - { "matrix": [2,15], "x": 15.25, "y": 2.25 }, - - { "matrix": [3,0], "w": 1.75, "x": 0, "y": 3.25 }, - { "matrix": [3,1], "x": 1.75, "y": 3.25 }, - { "matrix": [3,2], "x": 2.75, "y": 3.25 }, - { "matrix": [3,3], "x": 3.75, "y": 3.25 }, - { "matrix": [3,4], "x": 4.75, "y": 3.25 }, - { "matrix": [3,5], "x": 5.75, "y": 3.25 }, - { "matrix": [3,6], "x": 6.75, "y": 3.25 }, - { "matrix": [3,7], "x": 7.75, "y": 3.25 }, - { "matrix": [3,8], "x": 8.75, "y": 3.25 }, - { "matrix": [3,9], "x": 9.75, "y": 3.25 }, - { "matrix": [3,10], "x": 10.75, "y": 3.25 }, - { "matrix": [3,11], "x": 11.75, "y": 3.25 }, - { "matrix": [3,13], "w": 2.25, "x": 12.75, "y": 3.25 }, - { "matrix": [3,15], "x": 15.25, "y": 3.25 }, - - { "matrix": [4,0], "w": 2.25, "x": 0, "y": 4.25 }, - { "matrix": [4,1], "x": 2.25, "y": 4.25 }, - { "matrix": [4,2], "x": 3.25, "y": 4.25 }, - { "matrix": [4,3], "x": 4.25, "y": 4.25 }, - { "matrix": [4,4], "x": 5.25, "y": 4.25 }, - { "matrix": [4,5], "x": 6.25, "y": 4.25 }, - { "matrix": [4,6], "x": 7.25, "y": 4.25 }, - { "matrix": [4,7], "x": 8.25, "y": 4.25 }, - { "matrix": [4,8], "x": 9.25, "y": 4.25 }, - { "matrix": [4,9], "x": 10.25, "y": 4.25 }, - { "matrix": [4,10], "x": 11.25, "y": 4.25 }, - { "matrix": [4,13], "w": 1.75, "x": 12.25, "y": 4.25 }, - { "matrix": [4,14], "x": 14.25, "y": 4.5 }, - - { "matrix": [5,0], "w": 1.25, "x": 0, "y": 5.25 }, - { "matrix": [5,1], "w": 1.25, "x": 1.25, "y": 5.25 }, - { "matrix": [5,2], "w": 1.25, "x": 2.5, "y": 5.25 }, - { "matrix": [5,5], "w": 6.25, "x": 3.75, "y": 5.25 }, - { "matrix": [5,9], "x": 10, "y": 5.25 }, - { "matrix": [5,10], "x": 11, "y": 5.25 }, - { "matrix": [5,11], "x": 12, "y": 5.25 }, - { "matrix": [5,13], "x": 13.25, "y": 5.5 }, - { "matrix": [5,14], "x": 14.25, "y": 5.5 }, - { "matrix": [5,15], "x": 15.25, "y": 5.5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [3, 15], "x": 15.25, "y": 3.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 14], "x": 14.25, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25}, + {"matrix": [5, 10], "x": 11, "y": 5.25}, + {"matrix": [5, 11], "x": 12, "y": 5.25}, + {"matrix": [5, 13], "x": 13.25, "y": 5.5}, + {"matrix": [5, 14], "x": 14.25, "y": 5.5}, + {"matrix": [5, 15], "x": 15.25, "y": 5.5} ] } } From 644bed5c1cc15d64443d695a301716b8b2bf899f Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:03:26 +0800 Subject: [PATCH 23/45] Update config.h --- keyboards/dark_project/cm81/config.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h index 4c5b8f75738..ea83ba73c0d 100644 --- a/keyboards/dark_project/cm81/config.h +++ b/keyboards/dark_project/cm81/config.h @@ -21,9 +21,8 @@ #define WEAR_LEVELING_BACKING_SIZE (8 * 1024) /* I2C Config for LED Driver */ -#define DRIVER_COUNT 2 -#define DRIVER_ADDR_1 0b1110100 -#define DRIVER_ADDR_2 0b1110111 +#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND +#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO #define I2C1_SDA_PIN B7 #define I2C1_SCL_PIN B6 #define I2C1_SCL_PAL_MODE 4 From 617bb6849addf8118c8aaebedb5da85d3e27e3b1 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:44:56 +0800 Subject: [PATCH 24/45] Update keyboards/dark_project/cm81/config.h Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h index ea83ba73c0d..cd38d5631ad 100644 --- a/keyboards/dark_project/cm81/config.h +++ b/keyboards/dark_project/cm81/config.h @@ -18,7 +18,6 @@ #define SPI_MOSI_PAL_MODE 5 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 -#define WEAR_LEVELING_BACKING_SIZE (8 * 1024) /* I2C Config for LED Driver */ #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND From 3ff2c72ab9acc7031491f2365bdcb55eeefc54db Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:45:06 +0800 Subject: [PATCH 25/45] Update keyboards/dark_project/cm81/config.h Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/config.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h index cd38d5631ad..bfdcbaf1aac 100644 --- a/keyboards/dark_project/cm81/config.h +++ b/keyboards/dark_project/cm81/config.h @@ -28,12 +28,5 @@ #define I2C1_OPMODE OPMODE_I2C #define I2C1_CLOCK_SPEED 400000 /* 400000 */ -#define RGB_MATRIX_LED_COUNT 91 - -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended - -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define RGB_MATRIX_KEYPRESSES - #define LED_MAC_OS_PIN B13 #define LED_WIN_LOCK_PIN B14 From 1303fe16a2bcdb6f2a250ae23f02616a84e5d501 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:45:12 +0800 Subject: [PATCH 26/45] Update keyboards/dark_project/cm81/rules.mk Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/dark_project/cm81/rules.mk b/keyboards/dark_project/cm81/rules.mk index 24d5f6f52ec..6e7633bfe01 100644 --- a/keyboards/dark_project/cm81/rules.mk +++ b/keyboards/dark_project/cm81/rules.mk @@ -1,2 +1 @@ -EEPROM_DRIVER = wear_leveling -WEAR_LEVELING_DRIVER = spi_flash +# This file intentionally left blank From cfb5ddc775ca20fcf839442231f5bc0301b09b22 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:45:24 +0800 Subject: [PATCH 27/45] Update keyboards/dark_project/cm81/info.json Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/info.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/dark_project/cm81/info.json b/keyboards/dark_project/cm81/info.json index a76e060cea4..cd9ffbdb1c7 100644 --- a/keyboards/dark_project/cm81/info.json +++ b/keyboards/dark_project/cm81/info.json @@ -135,7 +135,8 @@ {"x": 224, "y": 48, "flags": 2}, {"x": 224, "y": 64, "flags": 2} ], - "max_brightness": 180 + "max_brightness": 180, + "sleep": true }, "usb": { "device_version": "1.0.0", From 840d9af01d11a2ea6701a4c35e77a5c17523ce44 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:45:33 +0800 Subject: [PATCH 28/45] Update keyboards/dark_project/cm81/info.json Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dark_project/cm81/info.json b/keyboards/dark_project/cm81/info.json index cd9ffbdb1c7..164a936634e 100644 --- a/keyboards/dark_project/cm81/info.json +++ b/keyboards/dark_project/cm81/info.json @@ -36,7 +36,6 @@ "rainbow_beacon": true, "rainbow_moving_chevron": true, "raindrops": true, - "solid_color": true, "solid_reactive": true, "solid_reactive_simple": true, "typing_heatmap": true From b373859eeed72f97faa3c86a2d412446774ea2d4 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:45:42 +0800 Subject: [PATCH 29/45] Update keyboards/dark_project/cm81/info.json Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/info.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/keyboards/dark_project/cm81/info.json b/keyboards/dark_project/cm81/info.json index 164a936634e..83fbed808b6 100644 --- a/keyboards/dark_project/cm81/info.json +++ b/keyboards/dark_project/cm81/info.json @@ -4,6 +4,13 @@ "maintainer": "jonylee@hfd", "bootloader": "wb32-dfu", "diode_direction": "ROW2COL", + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "driver": "spi_flash", + "backing_size": 8192 + } + }, "features": { "bootmagic": true, "command": false, From 7c67e42d4d3638627bab4eb4fd46052debefb0d1 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 May 2024 09:04:59 +0800 Subject: [PATCH 30/45] Update keyboards/dark_project/cm81/cm81.c Co-authored-by: Ryan --- keyboards/dark_project/cm81/cm81.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index 8b2094fa3a3..20d3a2094b4 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -117,12 +117,12 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { void matrix_init_kb(void){ // set our LED pings as output - // setPinOutput(LED_CAPS_LOCK_PIN); // LED1 Num Lock - // writePinLow(LED_CAPS_LOCK_PIN); - setPinOutput(LED_MAC_OS_PIN); // LDE2 MAC\WIN - writePinLow(LED_MAC_OS_PIN); - setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock - writePinLow(LED_WIN_LOCK_PIN); + // gpio_set_pin_output(LED_CAPS_LOCK_PIN); // LED1 Num Lock + // gpio_write_pin_low(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_MAC_OS_PIN); // LDE2 MAC\WIN + gpio_write_pin_low(LED_MAC_OS_PIN); + gpio_set_pin_output(LED_WIN_LOCK_PIN); // LED3 Win Lock + gpio_write_pin_low(LED_WIN_LOCK_PIN); matrix_init_user(); } void matrix_scan_kb(void) { From 38aecedaa441986266f5e38e3eb76fb4a4329b9f Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 May 2024 09:05:10 +0800 Subject: [PATCH 31/45] Update keyboards/dark_project/cm81/cm81.c Co-authored-by: Ryan --- keyboards/dark_project/cm81/cm81.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index 20d3a2094b4..7b753a0b0b3 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -126,7 +126,7 @@ void matrix_init_kb(void){ matrix_init_user(); } void matrix_scan_kb(void) { - writePin(LED_MAC_OS_PIN, ((get_highest_layer(default_layer_state | layer_state) == 2) || (get_highest_layer(default_layer_state | layer_state) == 3))); - writePin(LED_WIN_LOCK_PIN, keymap_config.no_gui); + gpio_write_pin(LED_MAC_OS_PIN, ((get_highest_layer(default_layer_state | layer_state) == 2) || (get_highest_layer(default_layer_state | layer_state) == 3))); + gpio_write_pin(LED_WIN_LOCK_PIN, keymap_config.no_gui); matrix_scan_user(); } From cbb4f7128aa6ec2227a518a597fc79b29f2ed95d Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 May 2024 09:42:20 +0800 Subject: [PATCH 32/45] Update cm81.c --- keyboards/dark_project/cm81/cm81.c | 184 ++++++++++++++--------------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index 7b753a0b0b3..cf83ff52fb6 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -3,7 +3,7 @@ #include "quantum.h" // clang-format off -#ifdef RGB_MATRIX_ENABLE +#ifdef RGSW2_MATRIX_ENABLE const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver @@ -11,106 +11,106 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { * | | G location * | | | B location * | | | | */ - {1, A_1, B_1, C_1}, - {1, A_2, B_2, C_2}, - {1, A_3, B_3, C_3}, - {1, A_4, B_4, C_4}, - {1, A_5, B_5, C_5}, - {1, A_6, B_6, C_6}, - {1, A_7, B_7, C_7}, - {1, A_8, B_8, C_8}, - {1, A_9, B_9, C_9}, - {1, A_10, B_10, C_10}, - {1, A_11, B_11, C_11}, - {1, A_12, B_12, C_12}, - {1, A_13, B_13, C_13}, - {1, A_14, B_14, C_14}, + {1, SW1_CS1, SW2_CS1, SW3_CS1}, + {1, SW1_CS2, SW2_CS2, SW3_CS2}, + {1, SW1_CS3, SW2_CS3, SW3_CS3}, + {1, SW1_CS4, SW2_CS4, SW3_CS4}, + {1, SW1_CS5, SW2_CS5, SW3_CS5}, + {1, SW1_CS6, SW2_CS6, SW3_CS6}, + {1, SW1_CS7, SW2_CS7, SW3_CS7}, + {1, SW1_CS8, SW2_CS8, SW3_CS8}, + {1, SW1_CS9, SW2_CS9, SW3_CS9}, + {1, SW1_CS10, SW2_CS10, SW3_CS10}, + {1, SW1_CS11, SW2_CS11, SW3_CS11}, + {1, SW1_CS12, SW2_CS12, SW3_CS12}, + {1, SW1_CS13, SW2_CS13, SW3_CS13}, + {1, SW1_CS14, SW2_CS14, SW3_CS14}, - {0, A_1, B_1, C_1}, - {0, A_2, B_2, C_2}, - {0, A_3, B_3, C_3}, - {0, A_4, B_4, C_4}, - {0, A_5, B_5, C_5}, - {0, A_6, B_6, C_6}, - {0, A_7, B_7, C_7}, - {0, A_8, B_8, C_8}, - {0, A_9, B_9, C_9}, - {0, A_10, B_10, C_10}, - {0, A_11, B_11, C_11}, - {0, A_12, B_12, C_12}, - {0, A_13, B_13, C_13}, - {0, A_14, B_14, C_14}, - {1, D_1, E_1, F_1}, + {0, SW1_CS1, SW2_CS1, SW3_CS1}, + {0, SW1_CS2, SW2_CS2, SW3_CS2}, + {0, SW1_CS3, SW2_CS3, SW3_CS3}, + {0, SW1_CS4, SW2_CS4, SW3_CS4}, + {0, SW1_CS5, SW2_CS5, SW3_CS5}, + {0, SW1_CS6, SW2_CS6, SW3_CS6}, + {0, SW1_CS7, SW2_CS7, SW3_CS7}, + {0, SW1_CS8, SW2_CS8, SW3_CS8}, + {0, SW1_CS9, SW2_CS9, SW3_CS9}, + {0, SW1_CS10, SW2_CS10, SW3_CS10}, + {0, SW1_CS11, SW2_CS11, SW3_CS11}, + {0, SW1_CS12, SW2_CS12, SW3_CS12}, + {0, SW1_CS13, SW2_CS13, SW3_CS13}, + {0, SW1_CS14, SW2_CS14, SW3_CS14}, + {1, SW4_CS1, SW5_CS1, SW6_CS1}, - {0, D_1, E_1, F_1}, - {0, D_2, E_2, F_2}, - {0, D_3, E_3, F_3}, - {0, D_4, E_4, F_4}, - {0, D_5, E_5, F_5}, - {0, D_6, E_6, F_6}, - {0, D_7, E_7, F_7}, - {0, D_8, E_8, F_8}, - {0, D_9, E_9, F_9}, - {0, D_10, E_10, F_10}, - {0, D_11, E_11, F_11}, - {0, D_12, E_12, F_12}, - {0, D_13, E_13, F_13}, - {0, D_14, E_14, F_14}, - {1, D_2, E_2, F_2}, + {0, SW4_CS1, SW5_CS1, SW6_CS1}, + {0, SW4_CS2, SW5_CS2, SW6_CS2}, + {0, SW4_CS3, SW5_CS3, SW6_CS3}, + {0, SW4_CS4, SW5_CS4, SW6_CS4}, + {0, SW4_CS5, SW5_CS5, SW6_CS5}, + {0, SW4_CS6, SW5_CS6, SW6_CS6}, + {0, SW4_CS7, SW5_CS7, SW6_CS7}, + {0, SW4_CS8, SW5_CS8, SW6_CS8}, + {0, SW4_CS9, SW5_CS9, SW6_CS9}, + {0, SW4_CS10, SW5_CS10, SW6_CS10}, + {0, SW4_CS11, SW5_CS11, SW6_CS11}, + {0, SW4_CS12, SW5_CS12, SW6_CS12}, + {0, SW4_CS13, SW5_CS13, SW6_CS13}, + {0, SW4_CS14, SW5_CS14, SW6_CS14}, + {1, SW4_CS2, SW5_CS2, SW6_CS2}, - {0, G_1, H_1, I_1}, - {0, G_2, H_2, I_2}, - {0, G_3, H_3, I_3}, - {0, G_4, H_4, I_4}, - {0, G_5, H_5, I_5}, - {0, G_6, H_6, I_6}, - {0, G_7, H_7, I_7}, - {0, G_8, H_8, I_8}, - {0, G_9, H_9, I_9}, - {0, G_10, H_10, I_10}, - {0, G_11, H_11, I_11}, - {0, G_12, H_12, I_12}, - {0, G_13, H_13, I_13}, - {1, D_3, E_3, F_3}, + {0, SW7_CS1, SW8_CS1, SW9_CS1}, + {0, SW7_CS2, SW8_CS2, SW9_CS2}, + {0, SW7_CS3, SW8_CS3, SW9_CS3}, + {0, SW7_CS4, SW8_CS4, SW9_CS4}, + {0, SW7_CS5, SW8_CS5, SW9_CS5}, + {0, SW7_CS6, SW8_CS6, SW9_CS6}, + {0, SW7_CS7, SW8_CS7, SW9_CS7}, + {0, SW7_CS8, SW8_CS8, SW9_CS8}, + {0, SW7_CS9, SW8_CS9, SW9_CS9}, + {0, SW7_CS10, SW8_CS10, SW9_CS10}, + {0, SW7_CS11, SW8_CS11, SW9_CS11}, + {0, SW7_CS12, SW8_CS12, SW9_CS12}, + {0, SW7_CS13, SW8_CS13, SW9_CS13}, + {1, SW4_CS3, SW5_CS3, SW6_CS3}, - {0, J_1, K_1, L_1}, - {0, J_2, K_2, L_2}, - {0, J_3, K_3, L_3}, - {0, J_4, K_4, L_4}, - {0, J_5, K_5, L_5}, - {0, J_6, K_6, L_6}, - {0, J_7, K_7, L_7}, - {0, J_8, K_8, L_8}, - {0, J_9, K_9, L_9}, - {0, J_10, K_10, L_10}, - {0, J_11, K_11, L_11}, - {0, J_12, K_12, L_12}, - {1, D_7, E_7, F_7}, + {0, SW10_CS1, SW11_CS1, SW12_CS1}, + {0, SW10_CS2, SW11_CS2, SW12_CS2}, + {0, SW10_CS3, SW11_CS3, SW12_CS3}, + {0, SW10_CS4, SW11_CS4, SW12_CS4}, + {0, SW10_CS5, SW11_CS5, SW12_CS5}, + {0, SW10_CS6, SW11_CS6, SW12_CS6}, + {0, SW10_CS7, SW11_CS7, SW12_CS7}, + {0, SW10_CS8, SW11_CS8, SW12_CS8}, + {0, SW10_CS9, SW11_CS9, SW12_CS9}, + {0, SW10_CS10, SW11_CS10, SW12_CS10}, + {0, SW10_CS11, SW11_CS11, SW12_CS11}, + {0, SW10_CS12, SW11_CS12, SW12_CS12}, + {1, SW4_CS7, SW5_CS7, SW6_CS7}, - {0, J_13, K_13, L_13}, - {0, J_14, K_14, L_14}, - {0, J_15, K_15, L_15}, - {0, J_16, K_16, L_16}, + {0, SW10_CS13, SW11_CS13, SW12_CS13}, + {0, SW10_CS14, SW11_CS14, SW12_CS14}, + {0, SW10_CS15, SW11_CS15, SW12_CS15}, + {0, SW10_CS16, SW11_CS16, SW12_CS16}, - {0, G_14, H_14, I_14}, - {0, G_15, H_15, I_15}, - {0, G_16, H_16, I_16}, + {0, SW7_CS14, SW8_CS14, SW9_CS14}, + {0, SW7_CS15, SW8_CS15, SW9_CS15}, + {0, SW7_CS16, SW8_CS16, SW9_CS16}, - {0, D_15, E_15, F_15}, - {1, D_6, E_6, F_6}, - {1, D_5, E_5, F_5}, + {0, SW4_CS15, SW5_CS15, SW6_CS15}, + {1, SW4_CS6, SW5_CS6, SW6_CS6}, + {1, SW4_CS5, SW5_CS5, SW6_CS5}, - {1, G_1, H_1, I_1}, - {1, G_2, H_2, I_2}, - {1, G_3, H_3, I_3}, - {1, G_4, H_4, I_4}, - {1, G_5, H_5, I_5}, + {1, SW7_CS1, SW8_CS1, SW9_CS1}, + {1, SW7_CS2, SW8_CS2, SW9_CS2}, + {1, SW7_CS3, SW8_CS3, SW9_CS3}, + {1, SW7_CS4, SW8_CS4, SW9_CS4}, + {1, SW7_CS5, SW8_CS5, SW9_CS5}, - {1, J_1, K_1, L_1}, - {1, J_2, K_2, L_2}, - {1, J_3, K_3, L_3}, - {1, J_4, K_4, L_4}, - {1, J_5, K_5, L_5}, + {1, SW10_CS1, SW11_CS1, SW12_CS1}, + {1, SW10_CS2, SW11_CS2, SW12_CS2}, + {1, SW10_CS3, SW11_CS3, SW12_CS3}, + {1, SW10_CS4, SW11_CS4, SW12_CS4}, + {1, SW10_CS5, SW11_CS5, SW12_CS5}, }; #endif // clang-format on From a850d5a56c3a236a819d7a9885248cb114a0067d Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 May 2024 09:49:10 +0800 Subject: [PATCH 33/45] Update cm81.c --- keyboards/dark_project/cm81/cm81.c | 182 ++++++++++++++--------------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index cf83ff52fb6..ca4ed7555d2 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -11,106 +11,106 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { * | | G location * | | | B location * | | | | */ - {1, SW1_CS1, SW2_CS1, SW3_CS1}, - {1, SW1_CS2, SW2_CS2, SW3_CS2}, - {1, SW1_CS3, SW2_CS3, SW3_CS3}, - {1, SW1_CS4, SW2_CS4, SW3_CS4}, - {1, SW1_CS5, SW2_CS5, SW3_CS5}, - {1, SW1_CS6, SW2_CS6, SW3_CS6}, - {1, SW1_CS7, SW2_CS7, SW3_CS7}, - {1, SW1_CS8, SW2_CS8, SW3_CS8}, - {1, SW1_CS9, SW2_CS9, SW3_CS9}, - {1, SW1_CS10, SW2_CS10, SW3_CS10}, - {1, SW1_CS11, SW2_CS11, SW3_CS11}, - {1, SW1_CS12, SW2_CS12, SW3_CS12}, - {1, SW1_CS13, SW2_CS13, SW3_CS13}, - {1, SW1_CS14, SW2_CS14, SW3_CS14}, + {1, CB1_CA1, CB2_CA1, CB3_CA1}, + {1, CB1_CA2, CB2_CA2, CB3_CA2}, + {1, CB1_CA3, CB2_CA3, CB3_CA3}, + {1, CB1_CA4, CB2_CA4, CB3_CA4}, + {1, CB1_CA5, CB2_CA5, CB3_CA5}, + {1, CB1_CA6, CB2_CA6, CB3_CA6}, + {1, CB1_CA7, CB2_CA7, CB3_CA7}, + {1, CB1_CA8, CB2_CA8, CB3_CA8}, + {1, CB1_CA9, CB2_CA9, CB3_CA9}, + {1, CB1_CA10, CB2_CA10, CB3_CA10}, + {1, CB1_CA11, CB2_CA11, CB3_CA11}, + {1, CB1_CA12, CB2_CA12, CB3_CA12}, + {1, CB1_CA13, CB2_CA13, CB3_CA13}, + {1, CB1_CA14, CB2_CA14, CB3_CA14}, - {0, SW1_CS1, SW2_CS1, SW3_CS1}, - {0, SW1_CS2, SW2_CS2, SW3_CS2}, - {0, SW1_CS3, SW2_CS3, SW3_CS3}, - {0, SW1_CS4, SW2_CS4, SW3_CS4}, - {0, SW1_CS5, SW2_CS5, SW3_CS5}, - {0, SW1_CS6, SW2_CS6, SW3_CS6}, - {0, SW1_CS7, SW2_CS7, SW3_CS7}, - {0, SW1_CS8, SW2_CS8, SW3_CS8}, - {0, SW1_CS9, SW2_CS9, SW3_CS9}, - {0, SW1_CS10, SW2_CS10, SW3_CS10}, - {0, SW1_CS11, SW2_CS11, SW3_CS11}, - {0, SW1_CS12, SW2_CS12, SW3_CS12}, - {0, SW1_CS13, SW2_CS13, SW3_CS13}, - {0, SW1_CS14, SW2_CS14, SW3_CS14}, - {1, SW4_CS1, SW5_CS1, SW6_CS1}, + {0, CB1_CA1, CB2_CA1, CB3_CA1}, + {0, CB1_CA2, CB2_CA2, CB3_CA2}, + {0, CB1_CA3, CB2_CA3, CB3_CA3}, + {0, CB1_CA4, CB2_CA4, CB3_CA4}, + {0, CB1_CA5, CB2_CA5, CB3_CA5}, + {0, CB1_CA6, CB2_CA6, CB3_CA6}, + {0, CB1_CA7, CB2_CA7, CB3_CA7}, + {0, CB1_CA8, CB2_CA8, CB3_CA8}, + {0, CB1_CA9, CB2_CA9, CB3_CA9}, + {0, CB1_CA10, CB2_CA10, CB3_CA10}, + {0, CB1_CA11, CB2_CA11, CB3_CA11}, + {0, CB1_CA12, CB2_CA12, CB3_CA12}, + {0, CB1_CA13, CB2_CA13, CB3_CA13}, + {0, CB1_CA14, CB2_CA14, CB3_CA14}, + {1, CB4_CA1, CB5_CA1, CB6_CA1}, - {0, SW4_CS1, SW5_CS1, SW6_CS1}, - {0, SW4_CS2, SW5_CS2, SW6_CS2}, - {0, SW4_CS3, SW5_CS3, SW6_CS3}, - {0, SW4_CS4, SW5_CS4, SW6_CS4}, - {0, SW4_CS5, SW5_CS5, SW6_CS5}, - {0, SW4_CS6, SW5_CS6, SW6_CS6}, - {0, SW4_CS7, SW5_CS7, SW6_CS7}, - {0, SW4_CS8, SW5_CS8, SW6_CS8}, - {0, SW4_CS9, SW5_CS9, SW6_CS9}, - {0, SW4_CS10, SW5_CS10, SW6_CS10}, - {0, SW4_CS11, SW5_CS11, SW6_CS11}, - {0, SW4_CS12, SW5_CS12, SW6_CS12}, - {0, SW4_CS13, SW5_CS13, SW6_CS13}, - {0, SW4_CS14, SW5_CS14, SW6_CS14}, - {1, SW4_CS2, SW5_CS2, SW6_CS2}, + {0, CB4_CA1, CB5_CA1, CB6_CA1}, + {0, CB4_CA2, CB5_CA2, CB6_CA2}, + {0, CB4_CA3, CB5_CA3, CB6_CA3}, + {0, CB4_CA4, CB5_CA4, CB6_CA4}, + {0, CB4_CA5, CB5_CA5, CB6_CA5}, + {0, CB4_CA6, CB5_CA6, CB6_CA6}, + {0, CB4_CA7, CB5_CA7, CB6_CA7}, + {0, CB4_CA8, CB5_CA8, CB6_CA8}, + {0, CB4_CA9, CB5_CA9, CB6_CA9}, + {0, CB4_CA10, CB5_CA10, CB6_CA10}, + {0, CB4_CA11, CB5_CA11, CB6_CA11}, + {0, CB4_CA12, CB5_CA12, CB6_CA12}, + {0, CB4_CA13, CB5_CA13, CB6_CA13}, + {0, CB4_CA14, CB5_CA14, CB6_CA14}, + {1, CB4_CA2, CB5_CA2, CB6_CA2}, - {0, SW7_CS1, SW8_CS1, SW9_CS1}, - {0, SW7_CS2, SW8_CS2, SW9_CS2}, - {0, SW7_CS3, SW8_CS3, SW9_CS3}, - {0, SW7_CS4, SW8_CS4, SW9_CS4}, - {0, SW7_CS5, SW8_CS5, SW9_CS5}, - {0, SW7_CS6, SW8_CS6, SW9_CS6}, - {0, SW7_CS7, SW8_CS7, SW9_CS7}, - {0, SW7_CS8, SW8_CS8, SW9_CS8}, - {0, SW7_CS9, SW8_CS9, SW9_CS9}, - {0, SW7_CS10, SW8_CS10, SW9_CS10}, - {0, SW7_CS11, SW8_CS11, SW9_CS11}, - {0, SW7_CS12, SW8_CS12, SW9_CS12}, - {0, SW7_CS13, SW8_CS13, SW9_CS13}, - {1, SW4_CS3, SW5_CS3, SW6_CS3}, + {0, CB7_CA1, CB8_CA1, CB9_CA1}, + {0, CB7_CA2, CB8_CA2, CB9_CA2}, + {0, CB7_CA3, CB8_CA3, CB9_CA3}, + {0, CB7_CA4, CB8_CA4, CB9_CA4}, + {0, CB7_CA5, CB8_CA5, CB9_CA5}, + {0, CB7_CA6, CB8_CA6, CB9_CA6}, + {0, CB7_CA7, CB8_CA7, CB9_CA7}, + {0, CB7_CA8, CB8_CA8, CB9_CA8}, + {0, CB7_CA9, CB8_CA9, CB9_CA9}, + {0, CB7_CA10, CB8_CA10, CB9_CA10}, + {0, CB7_CA11, CB8_CA11, CB9_CA11}, + {0, CB7_CA12, CB8_CA12, CB9_CA12}, + {0, CB7_CA13, CB8_CA13, CB9_CA13}, + {1, CB4_CA3, CB5_CA3, CB6_CA3}, - {0, SW10_CS1, SW11_CS1, SW12_CS1}, - {0, SW10_CS2, SW11_CS2, SW12_CS2}, - {0, SW10_CS3, SW11_CS3, SW12_CS3}, - {0, SW10_CS4, SW11_CS4, SW12_CS4}, - {0, SW10_CS5, SW11_CS5, SW12_CS5}, - {0, SW10_CS6, SW11_CS6, SW12_CS6}, - {0, SW10_CS7, SW11_CS7, SW12_CS7}, - {0, SW10_CS8, SW11_CS8, SW12_CS8}, - {0, SW10_CS9, SW11_CS9, SW12_CS9}, - {0, SW10_CS10, SW11_CS10, SW12_CS10}, - {0, SW10_CS11, SW11_CS11, SW12_CS11}, - {0, SW10_CS12, SW11_CS12, SW12_CS12}, - {1, SW4_CS7, SW5_CS7, SW6_CS7}, + {0, CB10_CA1, CB11_CA1, CB12_CA1}, + {0, CB10_CA2, CB11_CA2, CB12_CA2}, + {0, CB10_CA3, CB11_CA3, CB12_CA3}, + {0, CB10_CA4, CB11_CA4, CB12_CA4}, + {0, CB10_CA5, CB11_CA5, CB12_CA5}, + {0, CB10_CA6, CB11_CA6, CB12_CA6}, + {0, CB10_CA7, CB11_CA7, CB12_CA7}, + {0, CB10_CA8, CB11_CA8, CB12_CA8}, + {0, CB10_CA9, CB11_CA9, CB12_CA9}, + {0, CB10_CA10, CB11_CA10, CB12_CA10}, + {0, CB10_CA11, CB11_CA11, CB12_CA11}, + {0, CB10_CA12, CB11_CA12, CB12_CA12}, + {1, CB4_CA7, CB5_CA7, CB6_CA7}, - {0, SW10_CS13, SW11_CS13, SW12_CS13}, - {0, SW10_CS14, SW11_CS14, SW12_CS14}, - {0, SW10_CS15, SW11_CS15, SW12_CS15}, - {0, SW10_CS16, SW11_CS16, SW12_CS16}, + {0, CB10_CA13, CB11_CA13, CB12_CA13}, + {0, CB10_CA14, CB11_CA14, CB12_CA14}, + {0, CB10_CA15, CB11_CA15, CB12_CA15}, + {0, CB10_CA16, CB11_CA16, CB12_CA16}, - {0, SW7_CS14, SW8_CS14, SW9_CS14}, - {0, SW7_CS15, SW8_CS15, SW9_CS15}, - {0, SW7_CS16, SW8_CS16, SW9_CS16}, + {0, CB7_CA14, CB8_CA14, CB9_CA14}, + {0, CB7_CA15, CB8_CA15, CB9_CA15}, + {0, CB7_CA16, CB8_CA16, CB9_CA16}, - {0, SW4_CS15, SW5_CS15, SW6_CS15}, - {1, SW4_CS6, SW5_CS6, SW6_CS6}, - {1, SW4_CS5, SW5_CS5, SW6_CS5}, + {0, CB4_CA15, CB5_CA15, CB6_CA15}, + {1, CB4_CA6, CB5_CA6, CB6_CA6}, + {1, CB4_CA5, CB5_CA5, CB6_CA5}, - {1, SW7_CS1, SW8_CS1, SW9_CS1}, - {1, SW7_CS2, SW8_CS2, SW9_CS2}, - {1, SW7_CS3, SW8_CS3, SW9_CS3}, - {1, SW7_CS4, SW8_CS4, SW9_CS4}, - {1, SW7_CS5, SW8_CS5, SW9_CS5}, + {1, CB7_CA1, CB8_CA1, CB9_CA1}, + {1, CB7_CA2, CB8_CA2, CB9_CA2}, + {1, CB7_CA3, CB8_CA3, CB9_CA3}, + {1, CB7_CA4, CB8_CA4, CB9_CA4}, + {1, CB7_CA5, CB8_CA5, CB9_CA5}, - {1, SW10_CS1, SW11_CS1, SW12_CS1}, - {1, SW10_CS2, SW11_CS2, SW12_CS2}, - {1, SW10_CS3, SW11_CS3, SW12_CS3}, - {1, SW10_CS4, SW11_CS4, SW12_CS4}, - {1, SW10_CS5, SW11_CS5, SW12_CS5}, + {1, CB10_CA1, CB11_CA1, CB12_CA1}, + {1, CB10_CA2, CB11_CA2, CB12_CA2}, + {1, CB10_CA3, CB11_CA3, CB12_CA3}, + {1, CB10_CA4, CB11_CA4, CB12_CA4}, + {1, CB10_CA5, CB11_CA5, CB12_CA5}, }; #endif // clang-format on From e700eb281dcaec278eae32d1f055f1a0385455d2 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 May 2024 11:09:04 +0800 Subject: [PATCH 34/45] Update cm81.c --- keyboards/dark_project/cm81/cm81.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index ca4ed7555d2..1e0b011d721 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -3,7 +3,7 @@ #include "quantum.h" // clang-format off -#ifdef RGSW2_MATRIX_ENABLE +#ifdef RGB_MATRIX_ENABLE const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver From 12fadb238b896cfe6e61409d0050a4d838328726 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:17:35 +0800 Subject: [PATCH 35/45] Delete keyboards/dark_project/cm81/rules.mk --- keyboards/dark_project/cm81/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/dark_project/cm81/rules.mk diff --git a/keyboards/dark_project/cm81/rules.mk b/keyboards/dark_project/cm81/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/dark_project/cm81/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank From e7297582ecb2cc1ce974325f67ea7d2fee2c7cd6 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:17:58 +0800 Subject: [PATCH 36/45] Rename info.json to keyboard.json --- keyboards/dark_project/cm81/{info.json => keyboard.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/dark_project/cm81/{info.json => keyboard.json} (100%) diff --git a/keyboards/dark_project/cm81/info.json b/keyboards/dark_project/cm81/keyboard.json similarity index 100% rename from keyboards/dark_project/cm81/info.json rename to keyboards/dark_project/cm81/keyboard.json From 388b505c9358bc9462f6a8a6de64d530503b11ac Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Fri, 20 Sep 2024 17:21:18 +0800 Subject: [PATCH 37/45] delete via keymap. --- .../dark_project/cm81/keymaps/via/keymap.c | 47 ------------------- .../dark_project/cm81/keymaps/via/rules.mk | 1 - 2 files changed, 48 deletions(-) delete mode 100644 keyboards/dark_project/cm81/keymaps/via/keymap.c delete mode 100644 keyboards/dark_project/cm81/keymaps/via/rules.mk diff --git a/keyboards/dark_project/cm81/keymaps/via/keymap.c b/keyboards/dark_project/cm81/keymaps/via/keymap.c deleted file mode 100644 index 8af53acd063..00000000000 --- a/keyboards/dark_project/cm81/keymaps/via/keymap.c +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2023 jonylee@hfd (@jonylee1986) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H -// clang-format off -enum __layers { - WIN_B, - WIN_FN, - MAC_B, - MAC_FN -}; -#define KC_SIRI LGUI(KC_SPC) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [WIN_B] = LAYOUT_ansi( /* Base */ - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [WIN_FN] = LAYOUT_ansi( /* FN */ - _______, KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, - _______, _______, DF(MAC_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, - _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), - - [MAC_B] = LAYOUT_ansi( /* Base */ - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_SIRI, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [MAC_FN] = LAYOUT_ansi( /* FN */ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, - _______, DF(WIN_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI) -}; diff --git a/keyboards/dark_project/cm81/keymaps/via/rules.mk b/keyboards/dark_project/cm81/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/dark_project/cm81/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes From 3dfa70a88ddd6d75223f342a3ccc01cf3ede2f5b Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:53:28 +0800 Subject: [PATCH 38/45] Update keyboards/dark_project/cm81/cm81.c Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/cm81.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index 1e0b011d721..fab7b0303db 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -115,7 +115,7 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { #endif // clang-format on -void matrix_init_kb(void){ +void keyboard_pre_init_kb(void){ // set our LED pings as output // gpio_set_pin_output(LED_CAPS_LOCK_PIN); // LED1 Num Lock // gpio_write_pin_low(LED_CAPS_LOCK_PIN); @@ -123,7 +123,8 @@ void matrix_init_kb(void){ gpio_write_pin_low(LED_MAC_OS_PIN); gpio_set_pin_output(LED_WIN_LOCK_PIN); // LED3 Win Lock gpio_write_pin_low(LED_WIN_LOCK_PIN); - matrix_init_user(); + + housekeeping_task_kb(); } void matrix_scan_kb(void) { gpio_write_pin(LED_MAC_OS_PIN, ((get_highest_layer(default_layer_state | layer_state) == 2) || (get_highest_layer(default_layer_state | layer_state) == 3))); From 2a9b37e5626eca46c6196173517de95b2ffd6de2 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:54:19 +0800 Subject: [PATCH 39/45] Update keyboards/dark_project/cm81/cm81.c Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/cm81.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/dark_project/cm81/cm81.c b/keyboards/dark_project/cm81/cm81.c index fab7b0303db..8ef0d0f0e95 100644 --- a/keyboards/dark_project/cm81/cm81.c +++ b/keyboards/dark_project/cm81/cm81.c @@ -126,8 +126,7 @@ void keyboard_pre_init_kb(void){ housekeeping_task_kb(); } -void matrix_scan_kb(void) { +void housekeeping_task_kb(void) { gpio_write_pin(LED_MAC_OS_PIN, ((get_highest_layer(default_layer_state | layer_state) == 2) || (get_highest_layer(default_layer_state | layer_state) == 3))); gpio_write_pin(LED_WIN_LOCK_PIN, keymap_config.no_gui); - matrix_scan_user(); } From 5bd136b9d2a5b3815a187369b5f15689b7c66b53 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:54:31 +0800 Subject: [PATCH 40/45] Update keyboards/dark_project/cm81/config.h Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/config.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h index bfdcbaf1aac..e7b8580ce66 100644 --- a/keyboards/dark_project/cm81/config.h +++ b/keyboards/dark_project/cm81/config.h @@ -5,11 +5,6 @@ #define RGB_TRIGGER_ON_KEYDOWN -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 From 1e0dba616ced9136b59fcfcb66776041ac412149 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:54:40 +0800 Subject: [PATCH 41/45] Update keyboards/dark_project/cm81/keyboard.json Co-authored-by: Joel Challis --- keyboards/dark_project/cm81/keyboard.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/keyboards/dark_project/cm81/keyboard.json b/keyboards/dark_project/cm81/keyboard.json index 83fbed808b6..b9b59e78222 100644 --- a/keyboards/dark_project/cm81/keyboard.json +++ b/keyboards/dark_project/cm81/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "B12" }, From e869f88454850725d38161498f42951ba2cb4cf5 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Sat, 26 Oct 2024 09:57:21 +0800 Subject: [PATCH 42/45] Update keyboards/dark_project/cm81/config.h Co-authored-by: Drashna Jaelre --- keyboards/dark_project/cm81/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h index e7b8580ce66..e2e3f496c04 100644 --- a/keyboards/dark_project/cm81/config.h +++ b/keyboards/dark_project/cm81/config.h @@ -19,8 +19,6 @@ #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO #define I2C1_SDA_PIN B7 #define I2C1_SCL_PIN B6 -#define I2C1_SCL_PAL_MODE 4 -#define I2C1_OPMODE OPMODE_I2C #define I2C1_CLOCK_SPEED 400000 /* 400000 */ #define LED_MAC_OS_PIN B13 From e4f3d4565c82478079412bc8f303a12291876a39 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Sat, 26 Oct 2024 10:28:43 +0800 Subject: [PATCH 43/45] Update config.h --- keyboards/dark_project/cm81/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/dark_project/cm81/config.h b/keyboards/dark_project/cm81/config.h index e2e3f496c04..db4036f48cd 100644 --- a/keyboards/dark_project/cm81/config.h +++ b/keyboards/dark_project/cm81/config.h @@ -20,6 +20,7 @@ #define I2C1_SDA_PIN B7 #define I2C1_SCL_PIN B6 #define I2C1_CLOCK_SPEED 400000 /* 400000 */ +#define I2C1_OPMODE OPMODE_I2C #define LED_MAC_OS_PIN B13 #define LED_WIN_LOCK_PIN B14 From 55dd9e2f16efbff2f93c51f4050943158ae0e8c1 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:36:33 +0800 Subject: [PATCH 44/45] Update keyboards/dark_project/cm81/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/dark_project/cm81/keymaps/default/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/dark_project/cm81/keymaps/default/keymap.c b/keyboards/dark_project/cm81/keymaps/default/keymap.c index 8af53acd063..3cec8695d9d 100644 --- a/keyboards/dark_project/cm81/keymaps/default/keymap.c +++ b/keyboards/dark_project/cm81/keymaps/default/keymap.c @@ -22,12 +22,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_ansi( /* FN */ - _______, KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, - _______, _______, DF(MAC_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, - _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), + _______, KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RM_TOGG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_NEXT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUEU, + _______, _______, DF(MAC_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUED, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RM_VALU, + _______, GU_TOGG, _______, _______, _______, _______, _______, RM_SPDD, RM_VALD, RM_SPDU), [MAC_B] = LAYOUT_ansi( /* Base */ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_SIRI, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, From ec58ac6c9d97cdea4103a0a39a6a26deeb20fbcd Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:36:48 +0800 Subject: [PATCH 45/45] Update keyboards/dark_project/cm81/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/dark_project/cm81/keymaps/default/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/dark_project/cm81/keymaps/default/keymap.c b/keyboards/dark_project/cm81/keymaps/default/keymap.c index 3cec8695d9d..d8cbee21b31 100644 --- a/keyboards/dark_project/cm81/keymaps/default/keymap.c +++ b/keyboards/dark_project/cm81/keymaps/default/keymap.c @@ -38,10 +38,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_ansi( /* FN */ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, - _______, DF(WIN_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI) + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RM_TOGG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_NEXT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUEU, + _______, DF(WIN_B),_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUED, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RM_VALU, + _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_VALD, RM_SPDU) };