From f3682efe53aafc8357e795b145247e90ec7ec808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Fri, 10 Nov 2017 22:48:21 +0100 Subject: [PATCH] Revert to the factory default state when the reset button is pressed upon firmware startup. Display FTY on the display in this case. --- right/src/keymap.c | 2 +- right/src/main.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/right/src/keymap.c b/right/src/keymap.c index d936f81..a2c4bbd 100644 --- a/right/src/keymap.c +++ b/right/src/keymap.c @@ -8,7 +8,7 @@ // TODO: Restore Ctrl and Super keys and Mod+N. -keymap_reference_t AllKeymaps[MAX_KEYMAP_NUM] = { { "QTY", 0, 3 } }; +keymap_reference_t AllKeymaps[MAX_KEYMAP_NUM] = { { "FTY", 0, 3 } }; uint8_t AllKeymapsCount; uint8_t DefaultKeymapIndex; uint8_t CurrentKeymapIndex = 0; diff --git a/right/src/main.c b/right/src/main.c index 9f4b120..8181666 100644 --- a/right/src/main.c +++ b/right/src/main.c @@ -18,6 +18,7 @@ #include "key_scanner.h" #include "key_states.h" #include "usb_commands/usb_command_apply_config.h" +#include "peripherals/reset_button.h" void updateUsbReports(void) { @@ -61,7 +62,10 @@ void main(void) { InitClock(); InitPeripherals(); - EEPROM_LaunchTransfer(EepromOperation_Read, ConfigBufferId_HardwareConfig, hardwareConfigurationReadFinished); + + if (!RESET_BUTTON_IS_PRESSED) { + EEPROM_LaunchTransfer(EepromOperation_Read, ConfigBufferId_HardwareConfig, hardwareConfigurationReadFinished); + } if (Wormhole.magicNumber == WORMHOLE_MAGIC_NUMBER && Wormhole.enumerationMode == EnumerationMode_BusPal) { Wormhole.magicNumber = 0;