From c6243da12f6643747a24a7aa761e103cc4a848c2 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Wed, 15 Mar 2023 16:51:53 +0800 Subject: Update Keychron K Pro series keyboards --- keyboards/keychron/bluetooth/bat_level_animation.c | 0 keyboards/keychron/bluetooth/bat_level_animation.h | 0 keyboards/keychron/bluetooth/battery.h | 0 keyboards/keychron/bluetooth/bluetooth.h | 12 +- keyboards/keychron/bluetooth/bluetooth.mk | 0 keyboards/keychron/bluetooth/bluetooth_config.h | 0 .../keychron/bluetooth/bluetooth_event_type.h | 0 keyboards/keychron/bluetooth/bluetooth_main.c | 0 keyboards/keychron/bluetooth/ckbt51.c | 63 ++-- keyboards/keychron/bluetooth/ckbt51.h | 0 keyboards/keychron/bluetooth/factory_test.c | 0 keyboards/keychron/bluetooth/factory_test.h | 0 keyboards/keychron/bluetooth/indicator.c | 4 +- keyboards/keychron/bluetooth/indicator.h | 0 keyboards/keychron/bluetooth/lpm.c | 0 keyboards/keychron/bluetooth/lpm.h | 0 keyboards/keychron/bluetooth/lpm_stm32l432.c | 11 +- keyboards/keychron/bluetooth/lpm_stm32l432.h | 0 keyboards/keychron/bluetooth/report_buffer.c | 0 keyboards/keychron/bluetooth/report_buffer.h | 0 keyboards/keychron/bluetooth/rtc_timer.c | 0 keyboards/keychron/bluetooth/rtc_timer.h | 0 keyboards/keychron/bluetooth/transport.c | 0 keyboards/keychron/bluetooth/transport.h | 0 keyboards/keychron/k10_pro/config.h | 7 + keyboards/keychron/k10_pro/iso/rgb/config.h | 101 +++++++ keyboards/keychron/k10_pro/iso/rgb/info.json | 133 +++++++++ .../k10_pro/iso/rgb/keymaps/default/keymap.c | 59 ++++ .../keychron/k10_pro/iso/rgb/keymaps/via/keymap.c | 59 ++++ .../keychron/k10_pro/iso/rgb/keymaps/via/rules.mk | 1 + keyboards/keychron/k10_pro/iso/rgb/rgb.c | 175 +++++++++++ keyboards/keychron/k10_pro/iso/rgb/rules.mk | 2 + keyboards/keychron/k10_pro/iso/white/config.h | 76 +++++ keyboards/keychron/k10_pro/iso/white/info.json | 133 +++++++++ .../k10_pro/iso/white/keymaps/default/keymap.c | 59 ++++ .../k10_pro/iso/white/keymaps/via/keymap.c | 59 ++++ .../k10_pro/iso/white/keymaps/via/rules.mk | 1 + keyboards/keychron/k10_pro/iso/white/rules.mk | 2 + keyboards/keychron/k10_pro/iso/white/white.c | 173 +++++++++++ keyboards/keychron/k10_pro/k10_pro.c | 18 +- keyboards/keychron/k10_pro/k10_pro.h | 0 keyboards/keychron/k10_pro/readme.md | 2 +- keyboards/keychron/k13_pro/ansi/rgb/config.h | 9 +- keyboards/keychron/k13_pro/ansi/rgb/rgb.c | 184 ++++++------ keyboards/keychron/k13_pro/ansi/white/config.h | 7 - keyboards/keychron/k13_pro/ansi/white/white.c | 4 +- keyboards/keychron/k13_pro/config.h | 7 + keyboards/keychron/k13_pro/k13_pro.c | 18 +- keyboards/keychron/k13_pro/matrix.c | 204 +++++++------ keyboards/keychron/k13_pro/readme.md | 4 +- keyboards/keychron/k13_pro/rules.mk | 3 - keyboards/keychron/k1_pro/ansi/rgb/config.h | 7 - keyboards/keychron/k1_pro/ansi/rgb/info.json | 2 +- .../k1_pro/ansi/rgb/keymaps/default/keymap.c | 56 ++-- .../keychron/k1_pro/ansi/rgb/keymaps/via/keymap.c | 56 ++-- keyboards/keychron/k1_pro/ansi/rgb/rgb.c | 184 ++++++------ keyboards/keychron/k1_pro/ansi/white/config.h | 7 - keyboards/keychron/k1_pro/ansi/white/info.json | 2 +- .../k1_pro/ansi/white/keymaps/default/keymap.c | 8 +- .../k1_pro/ansi/white/keymaps/via/keymap.c | 8 +- keyboards/keychron/k1_pro/ansi/white/white.c | 4 +- keyboards/keychron/k1_pro/config.h | 9 +- keyboards/keychron/k1_pro/k1_pro.c | 18 +- keyboards/keychron/k1_pro/matrix.c | 204 +++++++------ keyboards/keychron/k1_pro/readme.md | 4 +- keyboards/keychron/k1_pro/rules.mk | 3 - .../keychron/k1_pro/via_json/k1_pro_us_rgb.json | 289 ++++++++++++++++++ .../keychron/k1_pro/via_json/k1_pro_us_white.json | 228 +++++++++++++++ .../k2_pro/ansi/white/keymaps/candysign/config.h | 20 ++ .../k2_pro/ansi/white/keymaps/candysign/keymap.c | 59 ++++ .../k2_pro/ansi/white/keymaps/candysign/rules.mk | 1 + keyboards/keychron/k2_pro/config.h | 7 + keyboards/keychron/k2_pro/jis/rgb/config.h | 101 +++++++ keyboards/keychron/k2_pro/jis/rgb/info.json | 111 +++++++ .../k2_pro/jis/rgb/keymaps/default/keymap.c | 59 ++++ .../keychron/k2_pro/jis/rgb/keymaps/via/keymap.c | 59 ++++ .../keychron/k2_pro/jis/rgb/keymaps/via/rules.mk | 1 + keyboards/keychron/k2_pro/jis/rgb/rgb.c | 153 ++++++++++ keyboards/keychron/k2_pro/jis/rgb/rules.mk | 2 + keyboards/keychron/k2_pro/jis/white/config.h | 76 +++++ keyboards/keychron/k2_pro/jis/white/info.json | 111 +++++++ .../k2_pro/jis/white/keymaps/default/keymap.c | 59 ++++ .../keychron/k2_pro/jis/white/keymaps/via/keymap.c | 59 ++++ .../keychron/k2_pro/jis/white/keymaps/via/rules.mk | 1 + keyboards/keychron/k2_pro/jis/white/rules.mk | 2 + keyboards/keychron/k2_pro/jis/white/white.c | 151 ++++++++++ keyboards/keychron/k2_pro/k2_pro.c | 25 +- keyboards/keychron/k2_pro/k2_pro.h | 33 --- keyboards/keychron/k2_pro/readme.md | 2 +- keyboards/keychron/k3_pro/config.h | 7 + keyboards/keychron/k3_pro/jis/rgb/config.h | 102 +++++++ keyboards/keychron/k3_pro/jis/rgb/info.json | 111 +++++++ .../k3_pro/jis/rgb/keymaps/default/keymap.c | 59 ++++ .../keychron/k3_pro/jis/rgb/keymaps/via/keymap.c | 59 ++++ .../keychron/k3_pro/jis/rgb/keymaps/via/rules.mk | 1 + keyboards/keychron/k3_pro/jis/rgb/rgb.c | 153 ++++++++++ keyboards/keychron/k3_pro/jis/rgb/rules.mk | 2 + keyboards/keychron/k3_pro/jis/white/config.h | 76 +++++ keyboards/keychron/k3_pro/jis/white/info.json | 111 +++++++ .../k3_pro/jis/white/keymaps/default/keymap.c | 59 ++++ .../keychron/k3_pro/jis/white/keymaps/via/keymap.c | 59 ++++ .../keychron/k3_pro/jis/white/keymaps/via/rules.mk | 1 + keyboards/keychron/k3_pro/jis/white/rules.mk | 2 + keyboards/keychron/k3_pro/jis/white/white.c | 151 ++++++++++ keyboards/keychron/k3_pro/k3_pro.c | 18 +- keyboards/keychron/k3_pro/k3_pro.h | 33 --- keyboards/keychron/k3_pro/readme.md | 2 +- .../keychron/k3_pro/via_json/k3_pro_jis_rgb .json | 265 +++++++++++++++++ .../keychron/k3_pro/via_json/k3_pro_jis_white.json | 204 +++++++++++++ keyboards/keychron/k4_pro/config.h | 7 + keyboards/keychron/k4_pro/iso/rgb/config.h | 102 +++++++ keyboards/keychron/k4_pro/iso/rgb/info.json | 125 ++++++++ .../k4_pro/iso/rgb/keymaps/default/keymap.c | 56 ++++ .../keychron/k4_pro/iso/rgb/keymaps/via/keymap.c | 56 ++++ .../keychron/k4_pro/iso/rgb/keymaps/via/rules.mk | 1 + keyboards/keychron/k4_pro/iso/rgb/rgb.c | 167 +++++++++++ keyboards/keychron/k4_pro/iso/rgb/rules.mk | 2 + keyboards/keychron/k4_pro/iso/white/config.h | 75 +++++ keyboards/keychron/k4_pro/iso/white/info.json | 125 ++++++++ .../k4_pro/iso/white/keymaps/default/keymap.c | 56 ++++ .../keychron/k4_pro/iso/white/keymaps/via/keymap.c | 56 ++++ .../keychron/k4_pro/iso/white/keymaps/via/rules.mk | 1 + keyboards/keychron/k4_pro/iso/white/rules.mk | 2 + keyboards/keychron/k4_pro/iso/white/white.c | 165 +++++++++++ keyboards/keychron/k4_pro/k4_pro.c | 18 +- keyboards/keychron/k4_pro/k4_pro.h | 16 - keyboards/keychron/k4_pro/readme.md | 2 +- .../keychron/k4_pro/via_json/k4_pro_iso_rgb.json | 325 +++++++++++++++++++++ .../keychron/k4_pro/via_json/k4_pro_iso_white.json | 264 +++++++++++++++++ keyboards/keychron/k5_pro/ansi/rgb/config.h | 7 - keyboards/keychron/k5_pro/ansi/rgb/rgb.c | 2 +- keyboards/keychron/k5_pro/ansi/white/config.h | 7 - keyboards/keychron/k5_pro/ansi/white/white.c | 2 +- keyboards/keychron/k5_pro/config.h | 7 + keyboards/keychron/k5_pro/k5_pro.c | 18 +- keyboards/keychron/k5_pro/matrix.c | 202 +++++++------ keyboards/keychron/k5_pro/readme.md | 4 +- .../k5_pro/via_json/k5_pro_ansi_rgb_v1.00.json | 162 ++++------ .../k5_pro/via_json/k5_pro_ansi_white_v1.00.json | 114 ++------ keyboards/keychron/k6_pro/config.h | 8 +- keyboards/keychron/k6_pro/jis/rgb/config.h | 97 ++++++ keyboards/keychron/k6_pro/jis/rgb/info.json | 94 ++++++ .../k6_pro/jis/rgb/keymaps/default/keymap.c | 63 ++++ .../keychron/k6_pro/jis/rgb/keymaps/via/keymap.c | 64 ++++ .../keychron/k6_pro/jis/rgb/keymaps/via/rules.mk | 2 + keyboards/keychron/k6_pro/jis/rgb/rgb.c | 133 +++++++++ keyboards/keychron/k6_pro/jis/rgb/rules.mk | 2 + keyboards/keychron/k6_pro/k6_pro.c | 18 +- keyboards/keychron/k6_pro/k6_pro.h | 29 -- keyboards/keychron/k6_pro/readme.md | 2 +- .../keychron/k6_pro/via_json/k6_pro_jis_rgb.json | 325 +++++++++++---------- keyboards/keychron/k7_pro/config.h | 7 + keyboards/keychron/k7_pro/k7_pro.c | 18 +- keyboards/keychron/k7_pro/k7_pro.h | 29 -- keyboards/keychron/k7_pro/readme.md | 2 +- keyboards/keychron/k8_pro/config.h | 7 + keyboards/keychron/k8_pro/k8_pro.c | 28 +- keyboards/keychron/k8_pro/k8_pro.h | 48 --- keyboards/keychron/k8_pro/readme.md | 2 +- keyboards/keychron/k9_pro/ansi/rgb/config.h | 7 - keyboards/keychron/k9_pro/ansi/rgb/rgb.c | 124 ++++---- keyboards/keychron/k9_pro/config.h | 7 + keyboards/keychron/k9_pro/k9_pro.c | 20 +- keyboards/keychron/k9_pro/matrix.c | 202 +++++++------ keyboards/keychron/k9_pro/readme.md | 4 +- keyboards/keychron/k9_pro/rules.mk | 3 - .../keychron/q2_pro/ansi_encoder/ansi_encoder.c | 136 ++++----- keyboards/keychron/q2_pro/ansi_encoder/config.h | 7 - keyboards/keychron/q2_pro/chconf.h | 30 -- keyboards/keychron/q2_pro/config.h | 7 + keyboards/keychron/q2_pro/matrix.c | 204 +++++++------ keyboards/keychron/q2_pro/q2_pro.c | 18 +- keyboards/keychron/q2_pro/readme.md | 8 +- keyboards/keychron/q2_pro/rules.mk | 3 - .../keychron/q3_pro/ansi_encoder/ansi_encoder.c | 186 ++++++------ keyboards/keychron/q3_pro/ansi_encoder/config.h | 7 - .../q3_pro/ansi_encoder/keymaps/via/keymap.c | 16 +- keyboards/keychron/q3_pro/config.h | 9 +- keyboards/keychron/q3_pro/matrix.c | 54 +++- keyboards/keychron/q3_pro/q3_pro.c | 18 +- keyboards/keychron/q3_pro/readme.md | 10 +- keyboards/keychron/q3_pro/rules.mk | 3 - 182 files changed, 7746 insertions(+), 1707 deletions(-) mode change 100644 => 100755 keyboards/keychron/bluetooth/bat_level_animation.c mode change 100644 => 100755 keyboards/keychron/bluetooth/bat_level_animation.h mode change 100644 => 100755 keyboards/keychron/bluetooth/battery.h mode change 100644 => 100755 keyboards/keychron/bluetooth/bluetooth.h mode change 100644 => 100755 keyboards/keychron/bluetooth/bluetooth.mk mode change 100644 => 100755 keyboards/keychron/bluetooth/bluetooth_config.h mode change 100644 => 100755 keyboards/keychron/bluetooth/bluetooth_event_type.h mode change 100644 => 100755 keyboards/keychron/bluetooth/bluetooth_main.c mode change 100644 => 100755 keyboards/keychron/bluetooth/ckbt51.c mode change 100644 => 100755 keyboards/keychron/bluetooth/ckbt51.h mode change 100644 => 100755 keyboards/keychron/bluetooth/factory_test.c mode change 100644 => 100755 keyboards/keychron/bluetooth/factory_test.h mode change 100644 => 100755 keyboards/keychron/bluetooth/indicator.c mode change 100644 => 100755 keyboards/keychron/bluetooth/indicator.h mode change 100644 => 100755 keyboards/keychron/bluetooth/lpm.c mode change 100644 => 100755 keyboards/keychron/bluetooth/lpm.h mode change 100644 => 100755 keyboards/keychron/bluetooth/lpm_stm32l432.c mode change 100644 => 100755 keyboards/keychron/bluetooth/lpm_stm32l432.h mode change 100644 => 100755 keyboards/keychron/bluetooth/report_buffer.c mode change 100644 => 100755 keyboards/keychron/bluetooth/report_buffer.h mode change 100644 => 100755 keyboards/keychron/bluetooth/rtc_timer.c mode change 100644 => 100755 keyboards/keychron/bluetooth/rtc_timer.h mode change 100644 => 100755 keyboards/keychron/bluetooth/transport.c mode change 100644 => 100755 keyboards/keychron/bluetooth/transport.h create mode 100755 keyboards/keychron/k10_pro/iso/rgb/config.h create mode 100755 keyboards/keychron/k10_pro/iso/rgb/info.json create mode 100755 keyboards/keychron/k10_pro/iso/rgb/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k10_pro/iso/rgb/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k10_pro/iso/rgb/rgb.c create mode 100755 keyboards/keychron/k10_pro/iso/rgb/rules.mk create mode 100755 keyboards/keychron/k10_pro/iso/white/config.h create mode 100755 keyboards/keychron/k10_pro/iso/white/info.json create mode 100755 keyboards/keychron/k10_pro/iso/white/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k10_pro/iso/white/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k10_pro/iso/white/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k10_pro/iso/white/rules.mk create mode 100755 keyboards/keychron/k10_pro/iso/white/white.c mode change 100644 => 100755 keyboards/keychron/k10_pro/k10_pro.c mode change 100644 => 100755 keyboards/keychron/k10_pro/k10_pro.h create mode 100755 keyboards/keychron/k1_pro/via_json/k1_pro_us_rgb.json create mode 100755 keyboards/keychron/k1_pro/via_json/k1_pro_us_white.json create mode 100755 keyboards/keychron/k2_pro/ansi/white/keymaps/candysign/config.h create mode 100755 keyboards/keychron/k2_pro/ansi/white/keymaps/candysign/keymap.c create mode 100755 keyboards/keychron/k2_pro/ansi/white/keymaps/candysign/rules.mk create mode 100755 keyboards/keychron/k2_pro/jis/rgb/config.h create mode 100755 keyboards/keychron/k2_pro/jis/rgb/info.json create mode 100755 keyboards/keychron/k2_pro/jis/rgb/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k2_pro/jis/rgb/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k2_pro/jis/rgb/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k2_pro/jis/rgb/rgb.c create mode 100755 keyboards/keychron/k2_pro/jis/rgb/rules.mk create mode 100755 keyboards/keychron/k2_pro/jis/white/config.h create mode 100755 keyboards/keychron/k2_pro/jis/white/info.json create mode 100755 keyboards/keychron/k2_pro/jis/white/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k2_pro/jis/white/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k2_pro/jis/white/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k2_pro/jis/white/rules.mk create mode 100755 keyboards/keychron/k2_pro/jis/white/white.c mode change 100644 => 100755 keyboards/keychron/k2_pro/k2_pro.c mode change 100644 => 100755 keyboards/keychron/k2_pro/k2_pro.h create mode 100755 keyboards/keychron/k3_pro/jis/rgb/config.h create mode 100755 keyboards/keychron/k3_pro/jis/rgb/info.json create mode 100755 keyboards/keychron/k3_pro/jis/rgb/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k3_pro/jis/rgb/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k3_pro/jis/rgb/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k3_pro/jis/rgb/rgb.c create mode 100755 keyboards/keychron/k3_pro/jis/rgb/rules.mk create mode 100755 keyboards/keychron/k3_pro/jis/white/config.h create mode 100755 keyboards/keychron/k3_pro/jis/white/info.json create mode 100755 keyboards/keychron/k3_pro/jis/white/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k3_pro/jis/white/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k3_pro/jis/white/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k3_pro/jis/white/rules.mk create mode 100755 keyboards/keychron/k3_pro/jis/white/white.c mode change 100644 => 100755 keyboards/keychron/k3_pro/k3_pro.c mode change 100644 => 100755 keyboards/keychron/k3_pro/k3_pro.h create mode 100755 keyboards/keychron/k3_pro/via_json/k3_pro_jis_rgb .json create mode 100755 keyboards/keychron/k3_pro/via_json/k3_pro_jis_white.json create mode 100755 keyboards/keychron/k4_pro/iso/rgb/config.h create mode 100755 keyboards/keychron/k4_pro/iso/rgb/info.json create mode 100755 keyboards/keychron/k4_pro/iso/rgb/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k4_pro/iso/rgb/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k4_pro/iso/rgb/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k4_pro/iso/rgb/rgb.c create mode 100755 keyboards/keychron/k4_pro/iso/rgb/rules.mk create mode 100755 keyboards/keychron/k4_pro/iso/white/config.h create mode 100755 keyboards/keychron/k4_pro/iso/white/info.json create mode 100755 keyboards/keychron/k4_pro/iso/white/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k4_pro/iso/white/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k4_pro/iso/white/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k4_pro/iso/white/rules.mk create mode 100755 keyboards/keychron/k4_pro/iso/white/white.c mode change 100644 => 100755 keyboards/keychron/k4_pro/k4_pro.c mode change 100644 => 100755 keyboards/keychron/k4_pro/k4_pro.h create mode 100755 keyboards/keychron/k4_pro/via_json/k4_pro_iso_rgb.json create mode 100755 keyboards/keychron/k4_pro/via_json/k4_pro_iso_white.json create mode 100755 keyboards/keychron/k6_pro/jis/rgb/config.h create mode 100755 keyboards/keychron/k6_pro/jis/rgb/info.json create mode 100755 keyboards/keychron/k6_pro/jis/rgb/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k6_pro/jis/rgb/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k6_pro/jis/rgb/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k6_pro/jis/rgb/rgb.c create mode 100755 keyboards/keychron/k6_pro/jis/rgb/rules.mk mode change 100644 => 100755 keyboards/keychron/k6_pro/k6_pro.c mode change 100644 => 100755 keyboards/keychron/k6_pro/k6_pro.h mode change 100644 => 100755 keyboards/keychron/k7_pro/k7_pro.c mode change 100644 => 100755 keyboards/keychron/k7_pro/k7_pro.h mode change 100644 => 100755 keyboards/keychron/k8_pro/k8_pro.c mode change 100644 => 100755 keyboards/keychron/k8_pro/k8_pro.h delete mode 100755 keyboards/keychron/q2_pro/chconf.h diff --git a/keyboards/keychron/bluetooth/bat_level_animation.c b/keyboards/keychron/bluetooth/bat_level_animation.c old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/bat_level_animation.h b/keyboards/keychron/bluetooth/bat_level_animation.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/battery.h b/keyboards/keychron/bluetooth/battery.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/bluetooth.h b/keyboards/keychron/bluetooth/bluetooth.h old mode 100644 new mode 100755 index 99d406223d..0ef14e0d06 --- a/keyboards/keychron/bluetooth/bluetooth.h +++ b/keyboards/keychron/bluetooth/bluetooth.h @@ -32,11 +32,11 @@ /* Type of an enumeration of the possible BT state.*/ typedef enum { BLUETOOTH_RESET, - BLUETOOTH_INITIALIZED, // 1 - BLUETOOTH_DISCONNECTED, // 2 - BLUETOOTH_CONNECTED, // 3 - BLUETOOTH_PARING, // 4 - BLUETOOTH_RECONNECTING, // 5 + BLUETOOTH_INITIALIZED, // 1 + BLUETOOTH_DISCONNECTED, // 2 + BLUETOOTH_CONNECTED, // 3 + BLUETOOTH_PARING, // 4 + BLUETOOTH_RECONNECTING, // 5 BLUETOOTH_SUSPEND } bluetooth_state_t; @@ -85,5 +85,3 @@ bluetooth_state_t bluetooth_get_state(void); void bluetooth_low_battery_shutdown(void); bool process_record_kb_bt(uint16_t keycode, keyrecord_t *record); - - diff --git a/keyboards/keychron/bluetooth/bluetooth.mk b/keyboards/keychron/bluetooth/bluetooth.mk old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/bluetooth_config.h b/keyboards/keychron/bluetooth/bluetooth_config.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/bluetooth_event_type.h b/keyboards/keychron/bluetooth/bluetooth_event_type.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/bluetooth_main.c b/keyboards/keychron/bluetooth/bluetooth_main.c old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/ckbt51.c b/keyboards/keychron/bluetooth/ckbt51.c old mode 100644 new mode 100755 index 2be217c091..4653825839 --- a/keyboards/keychron/bluetooth/ckbt51.c +++ b/keyboards/keychron/bluetooth/ckbt51.c @@ -14,6 +14,7 @@ * along with this program. If not, see . */ +#include #include "quantum.h" #include "ckbt51.h" #include "bluetooth.h" @@ -31,7 +32,7 @@ /* CKBT51 disable its uart peripheral to save power if uart inactivity for 3s, need to * assert this pin and wait some time for its uart getting ready before sending data*/ -#define CKBT51_WAKE_WAIT_TIME 3000 // us +#define CKBT51_WAKE_WAIT_TIME 3000 // us enum { /* HID Report */ @@ -150,15 +151,17 @@ void ckbt51_send_cmd(uint8_t* payload, uint8_t len, bool ack_enable, bool retry) systime_t start = 0; - for (i=0; i< 3; i++) { + for (i = 0; i < 3; i++) { writePin(CKBT51_INT_INPUT_PIN, i % 2); start = chVTGetSystemTime(); - while (chTimeI2US(chVTTimeElapsedSinceX(start)) < CKBT51_WAKE_WAIT_TIME / 3) {}; + while (chTimeI2US(chVTTimeElapsedSinceX(start)) < CKBT51_WAKE_WAIT_TIME / 3) { + }; } writePinHigh(CKBT51_INT_INPUT_PIN); uint16_t checksum = 0; - for (i = 0; i < len; i++) checksum += payload[i]; + for (i = 0; i < len; i++) + checksum += payload[i]; i = 0; pkt[i++] = 0xAA; @@ -190,7 +193,7 @@ void ckbt51_send_nkro(uint8_t* report) { memset(payload, 0, PACKET_MAX_LEN); payload[i++] = CKBT51_CMD_SEND_KB_NKRO; - memcpy(payload + i, report, 20); // NKRO report lenght is limited to 20 bytes + memcpy(payload + i, report, 20); // NKRO report lenght is limited to 20 bytes i += 20; ckbt51_send_cmd(payload, i, true, false); @@ -203,7 +206,7 @@ void ckbt51_send_consumer(uint16_t report) { payload[i++] = CKBT51_CMD_SEND_CONSUMER; payload[i++] = report & 0xFF; payload[i++] = ((report) >> 8) & 0xFF; - i += 4; // QMK doesn't send multiple consumer reports, just skip 2nd and 3rd consumer reports + i += 4; // QMK doesn't send multiple consumer reports, just skip 2nd and 3rd consumer reports ckbt51_send_cmd(payload, i, true, false); } @@ -222,14 +225,14 @@ void ckbt51_send_mouse(uint8_t* report) { uint8_t i = 0; memset(payload, 0, PACKET_MAX_LEN); - payload[i++] = CKBT51_CMD_SEND_MOUSE; // Cmd type - payload[i++] = report[1]; // Button - payload[i++] = report[2]; // X + payload[i++] = CKBT51_CMD_SEND_MOUSE; // Cmd type + payload[i++] = report[1]; // Button + payload[i++] = report[2]; // X payload[i++] = (report[2] & 0x80) ? 0xff : 0x00; // ckbt51 use 16bit report, set high byte - payload[i++] = report[3]; // Y + payload[i++] = report[3]; // Y payload[i++] = (report[3] & 0x80) ? 0xff : 0x00; // ckbt51 use 16bit report, set high byte - payload[i++] = report[4]; // V wheel - payload[i++] = report[5]; // H wheel + payload[i++] = report[4]; // V wheel + payload[i++] = report[5]; // H wheel ckbt51_send_cmd(payload, i, false, false); } @@ -255,13 +258,13 @@ void ckbt51_become_discoverable(uint8_t host_idx, void* param) { } pairing_param_t* p = (pairing_param_t*)param; - payload[i++] = CKBT51_CMD_PAIRING; // Cmd type - payload[i++] = host_idx; // Host Index - payload[i++] = p->timeout & 0xFF; // Timeout + payload[i++] = CKBT51_CMD_PAIRING; // Cmd type + payload[i++] = host_idx; // Host Index + payload[i++] = p->timeout & 0xFF; // Timeout payload[i++] = (p->timeout >> 8) & 0xFF; payload[i++] = p->pairingMode; - payload[i++] = p->BRorLE; // BR/LE - payload[i++] = p->txPower; // LE TX POWER + payload[i++] = p->BRorLE; // BR/LE + payload[i++] = p->txPower; // LE TX POWER if (p->leName) { memcpy(&payload[i], p->leName, strlen(p->leName)); i += strlen(p->leName); @@ -276,8 +279,8 @@ void ckbt51_connect(uint8_t hostIndex, uint16_t timeout) { memset(payload, 0, PACKET_MAX_LEN); payload[i++] = CKBT51_CMD_CONNECT; - payload[i++] = hostIndex; // Host index - payload[i++] = timeout & 0xFF; // Timeout + payload[i++] = hostIndex; // Host index + payload[i++] = timeout & 0xFF; // Timeout payload[i++] = (timeout >> 8) & 0xFF; ckbt51_send_cmd(payload, i, true, false); @@ -288,7 +291,7 @@ void ckbt51_disconnect(void) { memset(payload, 0, PACKET_MAX_LEN); payload[i++] = CKBT51_CMD_DISCONNECT; - payload[i++] = 0; // Sleep mode + payload[i++] = 0; // Sleep mode ckbt51_send_cmd(payload, i, true, false); } @@ -331,7 +334,7 @@ void ckbt51_set_param(module_param_t* param) { memcpy(payload + i, param, sizeof(module_param_t)); i += sizeof(module_param_t); - ckbt51_send_cmd(payload, i, false, false); + ckbt51_send_cmd(payload, i, true, false); } void ckbt51_get_param(module_param_t* param) { @@ -351,7 +354,7 @@ void ckbt51_set_local_name(const char* name) { payload[i++] = CKBT51_CMD_SET_NAME; memcpy(payload + i, name, len); i += len; - ckbt51_send_cmd(payload, i, false, false); + ckbt51_send_cmd(payload, i, true, false); } void ckbt51_get_local_name(void) { @@ -406,7 +409,8 @@ void ckbt51_dfu_tx(uint8_t rsp, uint8_t* data, uint8_t len, uint8_t sn) { memcpy(&buf[i], data, len); i += len; - for (uint8_t k = 0; k < i; k++) checksum += buf[i]; + for (uint8_t k = 0; k < i; k++) + checksum += buf[i]; raw_hid_send(buf, RAW_EPSIZE); @@ -440,7 +444,7 @@ void ckbt51_dfu_rx(uint8_t* data, uint8_t length) { bool retry = true; if (sn != data[4]) { - sn = data[4]; + sn = data[4]; retry = false; } @@ -450,6 +454,8 @@ void ckbt51_dfu_rx(uint8_t* data, uint8_t length) { } } +__attribute__((weak)) void ckbt51_default_ack_handler(uint8_t* data, uint8_t len){}; + static void ack_handler(uint8_t* data, uint8_t len) { switch (data[1]) { case CKBT51_CMD_SEND_KB: @@ -471,12 +477,13 @@ static void ack_handler(uint8_t* data, uint8_t len) { break; } break; - default: break; + default: + ckbt51_default_ack_handler(data, len); + break; } } static void query_rsp_handler(uint8_t* data, uint8_t len) { - if (data[2]) return; switch (data[1]) { @@ -593,13 +600,13 @@ void ckbt51_task(void) { for (uint8_t i = 0; i < len; i++) { buf[i] = sdGetTimeout(&BT_DRIVER, TIME_IMMEDIATE); - } wait_for_new_pkt = true; uint16_t checksum = 0; - for (int i = 0; i < len - 2; i++) checksum += buf[i]; + for (int i = 0; i < len - 2; i++) + checksum += buf[i]; if ((checksum & 0xff) == buf[len - 2] && ((checksum >> 8) & 0xff) == buf[len - 1]) { ckbt51_event_handler(buf[0], buf + 1, len - 3, sn); diff --git a/keyboards/keychron/bluetooth/ckbt51.h b/keyboards/keychron/bluetooth/ckbt51.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/factory_test.c b/keyboards/keychron/bluetooth/factory_test.c old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/factory_test.h b/keyboards/keychron/bluetooth/factory_test.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/indicator.c b/keyboards/keychron/bluetooth/indicator.c old mode 100644 new mode 100755 index fa111817dd..d4644dbd0c --- a/keyboards/keychron/bluetooth/indicator.c +++ b/keyboards/keychron/bluetooth/indicator.c @@ -403,7 +403,7 @@ void indicator_battery_low_backlit_enable(bool enable) { } /* Indicating at first time or after the interval */ if ((rtc_time == 0 || t - rtc_time > LOW_BAT_LED_TRIG_INTERVAL) && bat_low_ind_state == 0) { - bat_low_backlit_indicator = enable ? (timer_read32() | 1) : 0; + bat_low_backlit_indicator = enable ? (timer_read32() == 0 ? 1 : timer_read32()) : 0; rtc_time = rtc_timer_read_ms(); bat_low_ind_state = 1; @@ -448,7 +448,7 @@ void indicator_battery_low(void) { bat_low_ind_state |= 0x80; } - bat_low_backlit_indicator = sync_timer_read32() | 1; + bat_low_backlit_indicator = sync_timer_read32() == 0 ? 1 : sync_timer_read32(); /* Restore backligth state */ if ((bat_low_ind_state & 0x0F) > (LOW_BAT_LED_BLINK_TIMES)) { diff --git a/keyboards/keychron/bluetooth/indicator.h b/keyboards/keychron/bluetooth/indicator.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/lpm.c b/keyboards/keychron/bluetooth/lpm.c old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/lpm.h b/keyboards/keychron/bluetooth/lpm.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/lpm_stm32l432.c b/keyboards/keychron/bluetooth/lpm_stm32l432.c old mode 100644 new mode 100755 index 8e9f2fa77f..69db4fc30d --- a/keyboards/keychron/bluetooth/lpm_stm32l432.c +++ b/keyboards/keychron/bluetooth/lpm_stm32l432.c @@ -140,7 +140,6 @@ bool lpm_set(pm_t mode) { } static inline void enter_low_power_mode_prepare(void) { - #if defined(KEEP_USB_CONNECTION_IN_BLUETOOTH_MODE) /* Usb unit is actived and running, stop and disconnect first */ usbStop(&USBD1); @@ -204,15 +203,15 @@ static inline void lpm_wakeup(void) { #ifdef USB_POWER_SENSE_PIN palDisableLineEvent(USB_POWER_SENSE_PIN); -#if defined(KEEP_USB_CONNECTION_IN_BLUETOOTH_MODE) +# if defined(KEEP_USB_CONNECTION_IN_BLUETOOTH_MODE) if (usb_power_connected()) { hsi48_init(); /* Remove USB isolation.*/ - //PWR->CR2 |= PWR_CR2_USV; /* PWR_CR2_USV is available on STM32L4x2xx and STM32L4x3xx devices only. */ + // PWR->CR2 |= PWR_CR2_USV; /* PWR_CR2_USV is available on STM32L4x2xx and STM32L4x3xx devices only. */ usb_power_connect(); usb_start(&USBD1); } -#endif +# endif #endif @@ -277,7 +276,7 @@ void stm32_clock_fast_init(void) { pll_init(); pllsai1_init(); pllsai2_init(); -/* clang-format off */ + /* clang-format off */ /* Other clock-related settings (dividers, MCO etc).*/ RCC->CFGR = STM32_MCOPRE | STM32_MCOSEL | STM32_STOPWUCK | STM32_PPRE2 | STM32_PPRE1 | STM32_HPRE; @@ -289,7 +288,7 @@ void stm32_clock_fast_init(void) { STM32_I2C3SEL | STM32_I2C2SEL | STM32_I2C1SEL | STM32_UART5SEL | STM32_UART4SEL | STM32_USART3SEL | STM32_USART2SEL | STM32_USART1SEL | STM32_LPUART1SEL; -/* clang-format on */ +/* clang-format on */ # if STM32_SAI2SEL != STM32_SAI2SEL_OFF ccipr |= STM32_SAI2SEL; # endif diff --git a/keyboards/keychron/bluetooth/lpm_stm32l432.h b/keyboards/keychron/bluetooth/lpm_stm32l432.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/report_buffer.c b/keyboards/keychron/bluetooth/report_buffer.c old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/report_buffer.h b/keyboards/keychron/bluetooth/report_buffer.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/rtc_timer.c b/keyboards/keychron/bluetooth/rtc_timer.c old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/rtc_timer.h b/keyboards/keychron/bluetooth/rtc_timer.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/transport.c b/keyboards/keychron/bluetooth/transport.c old mode 100644 new mode 100755 diff --git a/keyboards/keychron/bluetooth/transport.h b/keyboards/keychron/bluetooth/transport.h old mode 100644 new mode 100755 diff --git a/keyboards/keychron/k10_pro/config.h b/keyboards/keychron/k10_pro/config.h index 4a4c104d5d..0e53adab0b 100644 --- a/keyboards/keychron/k10_pro/config.h +++ b/keyboards/keychron/k10_pro/config.h @@ -44,6 +44,13 @@ #define LED_CAPS_LOCK_PIN A7 #define LED_PIN_ON_STATE 1 +/* Increase I2C speed to 1000 KHz */ +#define I2C1_TIMINGR_PRESC 0U +#define I2C1_TIMINGR_SCLDEL 3U +#define I2C1_TIMINGR_SDADEL 0U +#define I2C1_TIMINGR_SCLH 15U +#define I2C1_TIMINGR_SCLL 51U + #ifdef KC_BLUETOOTH_ENABLE /* Hardware configuration */ # define USB_BT_MODE_SELECT_PIN A10 diff --git a/keyboards/keychron/k10_pro/iso/rgb/config.h b/keyboards/keychron/k10_pro/iso/rgb/config.h new file mode 100755 index 0000000000..00e4cef1c1 --- /dev/null +++ b/keyboards/keychron/k10_pro/iso/rgb/config.h @@ -0,0 +1,101 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#ifdef RGB_MATRIX_ENABLE +/* RGB Matrix Driver Configuration */ +# define DRIVER_COUNT 2 + +# define DRIVER_ADDR_1 0b1110111 +# define DRIVER_ADDR_2 0b1110100 +# define DRIVER_1_LED_TOTAL 60 +# define DRIVER_2_LED_TOTAL 49 +# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) + +/* Set to infinit, which is use in USB mode by default */ +# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE + +/* Allow to shutdown driver to save power */ +# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE + +/* Turn off backllit if brightness value is low */ +# define RGB_MATRIX_TURN_OFF_VAL 48 + +# define NUM_LOCK_INDEX 37 // NumLock + +# define LOW_BAT_IND_INDEX 99 // Space + +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects + +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS + +// #define ENABLE_RGB_MATRIX_ALPHAS_MODS +// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +// #define ENABLE_RGB_MATRIX_BAND_SAT +// #define ENABLE_RGB_MATRIX_BAND_VAL +// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +// #define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +// #define ENABLE_RGB_MATRIX_HUE_BREATHING +// #define ENABLE_RGB_MATRIX_HUE_PENDULUM +// #define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +// #define ENABLE_RGB_MATRIX_PIXEL_FLOW +// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL + +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN + +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE +// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +// #define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + +/* Set LED driver current */ +# define CKLED2001_CURRENT_TUNE \ + { 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D } + +#endif diff --git a/keyboards/keychron/k10_pro/iso/rgb/info.json b/keyboards/keychron/k10_pro/iso/rgb/info.json new file mode 100755 index 0000000000..e567783100 --- /dev/null +++ b/keyboards/keychron/k10_pro/iso/rgb/info.json @@ -0,0 +1,133 @@ +{ + "keyboard_name": "Keychron K10 Pro", + "manufacturer": "Keychron", + "url": "https://github.com/Keychron", + "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x02A1", + "device_version": "1.0.0" + }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT_iso_109": { + "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,14], "x":15.25, "y":0}, + {"matrix":[0,15], "x":16.25, "y":0}, + {"matrix":[0,16], "x":17.25, "y":0}, + {"matrix":[0,17], "x":18.5, "y":0}, + {"matrix":[0,18], "x":19.5, "y":0}, + {"matrix":[0,19], "x":20.5, "y":0}, + {"matrix":[0,20], "x":21.5, "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,14], "x":15.25, "y":1.25}, + {"matrix":[1,15], "x":16.25, "y":1.25}, + {"matrix":[1,16], "x":17.25, "y":1.25}, + {"matrix":[1,17], "x":18.5, "y":1.25}, + {"matrix":[1,18], "x":19.5, "y":1.25}, + {"matrix":[1,19], "x":20.5, "y":1.25}, + {"matrix":[1,20], "x":21.5, "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,14], "x":15.25, "y":2.25}, + {"matrix":[2,15], "x":16.25, "y":2.25}, + {"matrix":[2,16], "x":17.25, "y":2.25}, + {"matrix":[2,17], "x":18.5, "y":2.25}, + {"matrix":[2,18], "x":19.5, "y":2.25}, + {"matrix":[2,19], "x":20.5, "y":2.25}, + {"matrix":[2,20], "x":21.5, "y":2.25, "h":2}, + + {"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}, + {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3,17], "x":18.5, "y":3.25}, + {"matrix":[3,18], "x":19.5, "y":3.25}, + {"matrix":[3,19], "x":20.5, "y":3.25}, + + {"matrix":[4,0], "x":0, "y":4.25, "w":1.25}, + {"matrix":[4,1], "x":1.25, "y":4.25}, + {"matrix":[4,2], "x":2.25, "y":4.25}, + {"matrix":[4,3], "x":3.25, "y":4.25}, + {"matrix":[4,4], "x":4.25, "y":4.25}, + {"matrix":[4,5], "x":5.25, "y":4.25}, + {"matrix":[4,6], "x":6.25, "y":4.25}, + {"matrix":[4,7], "x":7.25, "y":4.25}, + {"matrix":[4,8], "x":8.25, "y":4.25}, + {"matrix":[4,9], "x":9.25, "y":4.25}, + {"matrix":[4,10], "x":10.25, "y":4.25}, + {"matrix":[4,11], "x":11.25, "y":4.25}, + {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4,17], "x":18.5, "y":4.25}, + {"matrix":[4,18], "x":19.5, "y":4.25}, + {"matrix":[4,19], "x":20.5, "y":4.25}, + {"matrix":[4,20], "x":21.5, "y":4.25, "h":2}, + + {"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,6], "x":3.75, "y":5.25, "w":6.25}, + {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5,14], "x":15.25, "y":5.25}, + {"matrix":[5,15], "x":16.25, "y":5.25}, + {"matrix":[5,16], "x":17.25, "y":5.25}, + {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5,19], "x":20.5, "y":5.25} + ] + } + } +} diff --git a/keyboards/keychron/k10_pro/iso/rgb/keymaps/default/keymap.c b/keyboards/keychron/k10_pro/iso/rgb/keymaps/default/keymap.c new file mode 100755 index 0000000000..96c642deb1 --- /dev/null +++ b/keyboards/keychron/k10_pro/iso/rgb/keymaps/default/keymap.c @@ -0,0 +1,59 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +// clang-format off +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_iso_109( + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, RGB_MOD, KC_F13, KC_F14, KC_F15, KC_F16, + 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_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + + [MAC_FN] = LAYOUT_iso_109( + _______, 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, _______, _______, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + + [WIN_BASE] = LAYOUT_iso_109( + 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_PSCR, KC_CTANA, RGB_MOD, _______, _______, _______, _______, + 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_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + + [WIN_FN] = LAYOUT_iso_109( + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, _______, _______, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) +}; diff --git a/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c b/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c new file mode 100755 index 0000000000..96c642deb1 --- /dev/null +++ b/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c @@ -0,0 +1,59 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +// clang-format off +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_iso_109( + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, RGB_MOD, KC_F13, KC_F14, KC_F15, KC_F16, + 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_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + + [MAC_FN] = LAYOUT_iso_109( + _______, 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, _______, _______, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + + [WIN_BASE] = LAYOUT_iso_109( + 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_PSCR, KC_CTANA, RGB_MOD, _______, _______, _______, _______, + 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_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + + [WIN_FN] = LAYOUT_iso_109( + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, _______, _______, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) +}; diff --git a/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/rules.mk b/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/rules.mk new file mode 100755 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/keychron/k10_pro/iso/rgb/rgb.c b/keyboards/keychron/k10_pro/iso/rgb/rgb.c new file mode 100755 index 0000000000..f23203fdae --- /dev/null +++ b/keyboards/keychron/k10_pro/iso/rgb/rgb.c @@ -0,0 +1,175 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE +// clang-format off +const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to CKLED2001 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, I_1, G_1, H_1}, + {0, I_2, G_2, H_2}, + {0, I_3, G_3, H_3}, + {0, I_4, G_4, H_4}, + {0, I_5, G_5, H_5}, + {0, I_6, G_6, H_6}, + {0, I_7, G_7, H_7}, + {0, I_8, G_8, H_8}, + {0, I_9, G_9, H_9}, + {0, I_10, G_10, H_10}, + {0, I_11, G_11, H_11}, + {0, I_12, G_12, H_12}, + {0, I_13, G_13, H_13}, + {0, I_15, G_15, H_15}, + {0, I_16, G_16, H_16}, + {0, L_5, J_5, K_5}, + {0, L_6, J_6, K_6}, + {0, L_7, J_7, K_7}, + {0, L_8, J_8, K_8}, + {0, L_4, J_4, K_4}, + + {0, C_1, A_1, B_1}, + {0, C_2, A_2, B_2}, + {0, C_3, A_3, B_3}, + {0, C_4, A_4, B_4}, + {0, C_5, A_5, B_5}, + {0, C_6, A_6, B_6}, + {0, C_7, A_7, B_7}, + {0, C_8, A_8, B_8}, + {0, C_9, A_9, B_9}, + {0, C_10, A_10, B_10}, + {0, C_11, A_11, B_11}, + {0, C_12, A_12, B_12}, + {0, C_13, A_13, B_13}, + {0, C_14, A_14, B_14}, + {0, C_15, A_15, B_15}, + {0, C_16, A_16, B_16}, + {0, L_9, J_9, K_9}, + {0, L_10, J_10, K_10}, + {0, L_11, J_11, K_11}, + {0, L_12, J_12, K_12}, + {0, L_13, J_13, K_13}, + + {0, F_1, D_1, E_1}, + {0, F_2, D_2, E_2}, + {0, F_3, D_3, E_3}, + {0, F_4, D_4, E_4}, + {0, F_5, D_5, E_5}, + {0, F_6, D_6, E_6}, + {0, F_7, D_7, E_7}, + {0, F_8, D_8, E_8}, + {0, F_9, D_9, E_9}, + {0, F_10, D_10, E_10}, + {0, F_11, D_11, E_11}, + {0, F_12, D_12, E_12}, + {0, F_13, D_13, E_13}, + {0, F_15, D_15, E_15}, + {0, F_16, D_16, E_16}, + {0, L_14, J_14, K_14}, + {0, L_15, J_15, K_15}, + {0, L_16, J_16, K_16}, + {1, F_1, D_1, E_1}, + {1, F_2, D_2, E_2}, + + {1, C_16, A_16, B_16}, + {1, C_15, A_15, B_15}, + {1, C_14, A_14, B_14}, + {1, C_13, A_13, B_13}, + {1, C_12, A_12, B_12}, + {1, C_11, A_11, B_11}, + {1, C_10, A_10, B_10}, + {1, C_9, A_9, B_9}, + {1, C_8, A_8, B_8}, + {1, C_7, A_7, B_7}, + {1, C_6, A_6, B_6}, + {1, C_5, A_5, B_5}, + {1, C_3, A_3, B_3}, + {0, F_14, D_14, E_14}, + {1, F_3, D_3, E_3}, + {1, F_4, D_4, E_4}, + {1, F_5, D_5, E_5}, + + {1, I_16, G_16, H_16}, + {1, I_15, G_15, H_15}, + {1, I_14, G_14, H_14}, + {1, I_13, G_13, H_13}, + {1, I_12, G_12, H_12}, + {1, I_11, G_11, H_11}, + {1, I_10, G_10, H_10}, + {1, I_9, G_9, H_9}, + {1, I_8, G_8, H_8}, + {1, I_7, G_7, H_7}, + {1, I_6, G_6, H_6}, + {1, I_5, G_5, H_5}, + {1, I_3, G_3, H_3}, + {1, I_1, G_1, H_1}, + {1, F_6, D_6, E_6}, + {1, F_7, D_7, E_7}, + {1, F_8, D_8, E_8}, + {1, F_9, D_9, E_9}, + + {1, L_16, J_16, K_16}, + {1, L_15, J_15, K_15}, + {1, L_14, J_14, K_14}, + {1, L_10, J_10, K_10}, + {1, L_6, J_6, K_6}, + {1, L_5, J_5, K_5}, + {1, L_4, J_4, K_4}, + {1, L_3, J_3, K_3}, + {1, L_2, J_2, K_2}, + {1, L_1, J_1, K_1}, + {1, F_10, D_10, E_10}, + {1, F_11, D_11, E_11}, + {1, F_12, D_12, E_12}, +}; + +#define __ NO_LED + +led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, __, 13, 14, 15, 16, 17, 18, 19 }, + { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 }, + { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 74, 54, 55, 56, 57, 58, 59, 60 }, + { 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, __, 73, __, __, __, 75, 76, 77, __ }, + { 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, __, 90, __, 91, __, 92, 93, 94, 95 }, + { 96, 97, 98, __, __, __, 99, __, __, __, 100, 101, 102, 103, 104, 105, 106, 107, __, 108, __ } + }, + { + // LED Index to Physical Position + {0,0}, {21,0}, {31,0}, {42,0}, {52,0}, {68,0}, {78,0}, {88,0}, {99,0}, {114,0}, {125,0}, {135,0}, {146,0}, {159,0}, {169,0}, {180,0}, {193,0}, {203,0}, {214,0}, {224,0}, + {0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {62,15}, {73,15}, {83,15}, {94,15}, {104,15}, {114,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15}, + {3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {88,27}, {99,27}, {109,27}, {120,27}, {130,27}, {159,27}, {169,27}, {180,27}, {193,27}, {203,27}, {214,27}, {224,34}, + {4,40}, {18,40}, {29,40}, {39,40}, {49,40}, {60,40}, {70,40}, {81,40}, {91,40}, {101,40}, {112,40}, {122,40}, {133,40}, {147,36}, {193,40}, {203,40}, {214,40}, + {1,52}, {13,52}, {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {75,52}, {86,52}, {96,52}, {107,52}, {117,52}, {137,52}, {169,52}, {193,52}, {203,52}, {214,52}, {224,58}, + {1,64}, {14,64}, {27,64}, {66,64}, {105,64}, {118,64}, {131,64}, {144,64}, {159,64}, {169,64}, {180,64}, {198,64}, {214,6