From 0590606868d61f9481cf0eff6b902165aa0e21c7 Mon Sep 17 00:00:00 2001 From: jiangming1399 Date: Sun, 24 May 2020 16:02:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3G84-4100=E6=8C=89=E9=94=AE?= =?UTF-8?q?=E9=98=B5=E5=88=97=E5=92=8C=E9=85=8D=E7=BD=AE=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboard/g84-4100/Makefile | 2 +- keyboard/g84-4100/config.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/keyboard/g84-4100/Makefile b/keyboard/g84-4100/Makefile index 182df1e2e..79c5c43f8 100644 --- a/keyboard/g84-4100/Makefile +++ b/keyboard/g84-4100/Makefile @@ -16,7 +16,7 @@ SRC_FILES += keymap_plain.c # 配置项：功能选项 # 关于更多的可配置项目，请参考doc目录下的相应文档 -BOOTMAGIC_ENABLE = yes # 启用Bootmagic +BOOTMAGIC_ENABLE = no # 禁用Bootmagic EXTRAKEY_ENABLE = yes # 启用媒体键功能 NKRO_ENABLE = yes # 启用USB的全键无冲功能 USB_6KRO_ENABLE = yes # 启用USB的六键无冲功能 diff --git a/keyboard/g84-4100/config.h b/keyboard/g84-4100/config.h index 0ccc0a4e8..511734549 100644 --- a/keyboard/g84-4100/config.h +++ b/keyboard/g84-4100/config.h @@ -55,6 +55,7 @@ along with this program. If not, see . #define MACRO_STORAGE /* 启用宏存储功能 */ #define CONFIG_STORAGE /* 启用配置存储功能 */ #define BUTTONLESS_DFU /* 启用免按钮DFU */ +#define BOOTCHECK_ENABLE // 启用Bootchek // #define DEBUG_SKIP_PWRON_CHECK /* 直接开机而跳过开机条件检测，用于调试 */ @@ -83,6 +84,11 @@ along with this program. If not, see . // #define LED_STATUS_CHARGING 23 #define LED_STATUS_USB 23 // #define LED_POSITIVE // LED下拉驱动 +#define LED_DFU_INIT 25 +#define LED_DFU_START 24 +#define LED_DFU_FINISH 23 +// #define LED_DFU_POSITIVE +#define LED_NO_DEINIT // 不要deinit端口，可以避免部分IO弱下拉导致灯光无法关闭的问题 // USB UART 传输配置 #define HAS_USB // 启用与CH554的通信支持 @@ -102,7 +108,7 @@ along with this program. If not, see . #define MATRIX_ROWS 8 /* 硬件阵列行数 */ #define MATRIX_COLS 14 /* 硬件阵列列数 */ static const uint8_t row_pin_array[MATRIX_ROWS] = { 9, 8, 7, 6, 5, 4, 3, 11 }; -static const uint8_t column_pin_array[MATRIX_COLS] = { 16, 17, 18, 19, 20, 30, 29, 28, 22, 21, 15, 14, 13, 12 }; +static const uint8_t column_pin_array[MATRIX_COLS] = { 16, 17, 18, 19, 20, 21, 22, 28, 29, 30, 15, 14, 13, 12 }; #define ROW_IN // 键盘阵列的二极管方向是从COL->ROW /* define if matrix has ghost */