~ruther/qmk_firmware

909003cce92ada1094d40ef4ea31574227070d31 — Drashna Jaelre 3 years ago 3a27f06
[Bug] Fix hack for chibiOS reset name (#15984)

1 files changed, 2 insertions(+), 2 deletions(-)

M quantum/keymap.h
M quantum/keymap.h => quantum/keymap.h +2 -2
@@ 35,9 35,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include "keycode_config.h"

// 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)
#    define RESET QK_RESET
#    define RESET QK_BOOTLOADER
#endif
// Gross hack, remove me and change RESET keycode to QK_BOOT
#if defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__)