diff options
Diffstat (limited to 'keyboards/keychron/q1')
-rw-r--r-- | keyboards/keychron/q1/q1.c | 9 | ||||
-rw-r--r-- | keyboards/keychron/q1/rev_0100/rev_0100.c | 24 | ||||
-rw-r--r-- | keyboards/keychron/q1/rev_0100/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/keychron/q1/rev_0102/rev_0102.c | 26 |
4 files changed, 32 insertions, 31 deletions
diff --git a/keyboards/keychron/q1/q1.c b/keyboards/keychron/q1/q1.c index b496e278e8..a316c1fdcf 100644 --- a/keyboards/keychron/q1/q1.c +++ b/keyboards/keychron/q1/q1.c @@ -26,9 +26,10 @@ const matrix_row_t matrix_mask[] = { 0b0111111111111111, }; -void dip_switch_update_kb(uint8_t index, bool active) { +bool dip_switch_update_kb(uint8_t index, bool active) { + if (!dip_switch_update_user(index, active)) { return false;} if (index == 0) { - default_layer_set(1UL << (active ? 2 : 0)); + default_layer_set(1UL << (active ? 2 : 0)); } - dip_switch_update_user(index, active); -}
\ No newline at end of file + return true; +} diff --git a/keyboards/keychron/q1/rev_0100/rev_0100.c b/keyboards/keychron/q1/rev_0100/rev_0100.c index 9227e01b11..abc4f2716c 100644 --- a/keyboards/keychron/q1/rev_0100/rev_0100.c +++ b/keyboards/keychron/q1/rev_0100/rev_0100.c @@ -17,7 +17,7 @@ #include "quantum.h" -const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { /* Refer to IS31 manual for these locations * driver * | R location @@ -31,7 +31,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { {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_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}, @@ -42,7 +42,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { {0, F_1, D_1, E_1}, {0, F_2, D_2, E_2}, - {0, F_3, D_3, E_3}, + {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}, @@ -70,8 +70,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { {0, I_12, G_12, H_12}, {0, I_13, G_13, H_13}, {0, I_14, G_14, H_14}, - {0, I_16, G_16, H_16}, - + {0, I_16, G_16, H_16}, + {0, L_1, J_1, K_1}, {0, L_2, J_2, K_2}, {0, L_3, J_3, K_3}, @@ -86,7 +86,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { {0, L_12, J_12, K_12}, {0, L_14, J_14, K_14}, {0, L_16, J_16, K_16}, - + {1, C_1, A_1, B_1}, {1, C_3, A_3, B_3}, {1, C_4, A_4, B_4}, @@ -100,15 +100,15 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { {1, C_12, A_12, B_12}, {1, C_14, A_14, B_14}, {1, C_15, A_15, B_15}, - + {1, F_1, D_1, E_1}, {1, F_2, D_2, E_2}, {1, F_3, D_3, E_3}, {1, F_7, D_7, E_7}, {1, F_11, D_11, E_11}, {1, F_12, D_12, E_12}, - {1, F_13, D_13, E_13}, - {1, F_14, D_14, E_14}, + {1, F_13, D_13, E_13}, + {1, F_14, D_14, E_14}, {1, F_15, D_15, E_15}, {1, F_16, D_16, E_16} @@ -128,7 +128,7 @@ led_config_t g_led_config = { {0,13}, {15,13}, {30,13}, {45,13}, {60,13}, {75,13}, {90,13}, {105,13}, {120,13}, {135,13}, {150,13}, {165,13}, {180,13}, {195,13}, {224,13}, {0,26}, {15,26}, {30,26}, {45,26}, {60,26}, {75,26}, {90,26}, {105,26}, {120,26}, {135,26}, {150,26}, {165,26}, {180,26}, {195,26}, {224,26}, {0,39}, {15,39}, {30,39}, {45,39}, {60,39}, {75,39}, {90,39}, {105,39}, {120,39}, {135,39}, {150,39}, {165,39}, {195,39}, {224,39}, - {0,52}, {30,52}, {45,52}, {60,52}, {75,52}, {90,52}, {105,52}, {120,52}, {135,52}, {150,52}, {165,52}, {195,52}, {210,52}, + {0,52}, {30,52}, {45,52}, {60,52}, {75,52}, {90,52}, {105,52}, {120,52}, {135,52}, {150,52}, {165,52}, {195,52}, {210,52}, {0,64}, {15,64}, {30,64}, {90,64}, {150,64}, {165,64}, {180,64}, {195,64}, {210,64}, {224,64}, }, { @@ -136,8 +136,8 @@ led_config_t g_led_config = { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 } -};
\ No newline at end of file +}; diff --git a/keyboards/keychron/q1/rev_0100/rules.mk b/keyboards/keychron/q1/rev_0100/rules.mk index 9b17251584..9615d19b51 100644 --- a/keyboards/keychron/q1/rev_0100/rules.mk +++ b/keyboards/keychron/q1/rev_0100/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug @@ -22,4 +22,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3733
\ No newline at end of file +RGB_MATRIX_DRIVER = IS31FL3733 diff --git a/keyboards/keychron/q1/rev_0102/rev_0102.c b/keyboards/keychron/q1/rev_0102/rev_0102.c index b7f767c416..722284aaaf 100644 --- a/keyboards/keychron/q1/rev_0102/rev_0102.c +++ b/keyboards/keychron/q1/rev_0102/rev_0102.c @@ -13,11 +13,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - + #include "quantum.h" -const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { /* Refer to IS31 manual for these locations * driver * | R location @@ -31,7 +31,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { {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_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}, @@ -42,7 +42,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { {0, F_1, D_1, E_1}, {0, F_2, D_2, E_2}, - {0, F_3, D_3, E_3}, + {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}, @@ -69,8 +69,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { {0, I_11, G_11, H_11}, {0, I_12, G_12, H_12}, {0, I_13, G_13, H_13}, - {0, I_16, G_16, H_16}, - + {0, I_16, G_16, H_16}, + {0, L_1, J_1, K_1}, {0, L_2, J_2, K_2}, {0, L_3, J_3, K_3}, @@ -86,7 +86,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { {0, L_14, J_14, K_14}, {0, I_14, G_14, H_14}, {0, L_16, J_16, K_16}, - + {1, C_1, A_1, B_1}, {1, C_2, A_2, B_2}, {1, C_3, A_3, B_3}, @@ -101,15 +101,15 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { {1, C_12, A_12, B_12}, {1, C_14, A_14, B_14}, {1, C_15, A_15, B_15}, - + {1, F_1, D_1, E_1}, {1, F_2, D_2, E_2}, {1, F_3, D_3, E_3}, {1, F_7, D_7, E_7}, {1, F_11, D_11, E_11}, {1, F_12, D_12, E_12}, - {1, F_13, D_13, E_13}, - {1, F_14, D_14, E_14}, + {1, F_13, D_13, E_13}, + {1, F_14, D_14, E_14}, {1, F_15, D_15, E_15}, {1, F_16, D_16, E_16} }; @@ -128,7 +128,7 @@ led_config_t g_led_config = { {0,13}, {15,13}, {30,13}, {45,13}, {60,13}, {75,13}, {90,13}, {105,13}, {120,13}, {135,13}, {150,13}, {165,13}, {180,13}, {195,13}, {224,13}, {0,26}, {15,26}, {30,26}, {45,26}, {60,26}, {75,26}, {90,26}, {105,26}, {120,26}, {135,26}, {150,26}, {165,26}, {180,26}, {224,26}, {0,39}, {15,39}, {30,39}, {45,39}, {60,39}, {75,39}, {90,39}, {105,39}, {120,39}, {135,39}, {150,39}, {165,39}, {180,39}, {195,26}, {224,39}, - {0,52}, {15,52}, {30,52}, {45,52}, {60,52}, {75,52}, {90,52}, {105,52}, {120,52}, {135,52}, {150,52}, {165,52}, {180,52}, {210,52}, + {0,52}, {15,52}, {30,52}, {45,52}, {60,52}, {75,52}, {90,52}, {105,52}, {120,52}, {135,52}, {150,52}, {165,52}, {180,52}, {210,52}, {0,64}, {15,64}, {30,64}, {90,64}, {150,64}, {165,64}, {180,64}, {195,64}, {210,64}, {224,64}, }, { @@ -136,8 +136,8 @@ led_config_t g_led_config = { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 } -};
\ No newline at end of file +}; |