masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Bug] Fix hack for chibiOS reset name (#15984)

This commit is contained in:
Drashna Jaelre 2022-01-21 20:59:19 -08:00 committed by GitHub
parent 3a27f065b7
commit 909003cce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quantum/keymap.h
View File

@ -35,9 +35,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keycode_config.h" #include "keycode_config.h"
// ChibiOS uses RESET in its FlagStatus enumeration // ChibiOS uses RESET in its FlagStatus enumeration
// Therefore define it as QK_RESET here, to avoid name collision // Therefore define it as QK_BOOTLOADER here, to avoid name collision
#if defined(PROTOCOL_CHIBIOS) #if defined(PROTOCOL_CHIBIOS)
# define RESET QK_RESET # define RESET QK_BOOTLOADER
#endif #endif
// Gross hack, remove me and change RESET keycode to QK_BOOT // Gross hack, remove me and change RESET keycode to QK_BOOT
#if defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__) #if defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__)