From fecd6f58348cc34807ff588f82f1f7b840fad704 Mon Sep 17 00:00:00 2001 From: Will Toohey Date: Mon, 12 Nov 2018 14:59:15 +1000 Subject: [PATCH] Actually update config version, use -Werror --- Firmware/PocketVoltex/Config.c | 1 + Firmware/PocketVoltex/makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/PocketVoltex/Config.c b/Firmware/PocketVoltex/Config.c index 8a4748e..d7cb980 100644 --- a/Firmware/PocketVoltex/Config.c +++ b/Firmware/PocketVoltex/Config.c @@ -59,6 +59,7 @@ void InitConfig(void) { // update the ones that actually need upgrade eeprom_write_byte(&eeConfig.ledBrightness, sdvxConfig.ledBrightness); eeprom_update_block(&sdvxConfig.startColour, &eeConfig.startColour, sizeof(sdvxConfig.startColour)); + eeprom_write_word(&eeConfig.configVersion, CONFIG_VERSION); case CONFIG_VERSION: // nothing needs to change break; default: diff --git a/Firmware/PocketVoltex/makefile b/Firmware/PocketVoltex/makefile index 98bcdf4..5661a13 100644 --- a/Firmware/PocketVoltex/makefile +++ b/Firmware/PocketVoltex/makefile @@ -20,7 +20,7 @@ OPTIMIZATION = s TARGET = PocketVoltex SRC = $(TARGET).c asciihid.c Descriptors.c Config.c Encoder.c LED.c LEDPatterns.c Macro.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) LUFA_PATH = ../LUFA -CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ +CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -Werror LD_FLAGS = AVRDUDE = avrdude -c usbasp -p $(MCU) @@ -72,7 +72,7 @@ rfuse: wfuse: # no more HWB, boot directly to bootloader $(AVRDUDE) -U lfuse:w:0xde:m -U hfuse:w:0xda:m -U efuse:w:0xfe:m - + disablereset: $(AVRDUDE) -U lfuse:w:0xde:m -U hfuse:w:0x9a:m -U efuse:w:0xfe:m