Merge branch 'master' of https://github.com/emsec/ChameleonMini

Firmware/Chameleon-Mini/Settings.c

@@ -56,6 +56,7 @@
 #include "Settings.h"
 #include <avr/eeprom.h>
 #include "Configuration.h"
+#include "Memory.h"
 
 SettingsType GlobalSettings;
 SettingsType EEMEM StoredSettings = {

Firmware/Chameleon-Mini/System.c

@@ -110,7 +110,7 @@ void SystemEnterBootloader(void)
 {
     /* Use Watchdog timer to reset into bootloader. */
     CCP = CCP_IOREG_gc;
-    WDT.CTRL = WDT_PER_500CLK_gc | WDT_ENABLE_bm | WDT_CEN_bm;
+    WDT.CTRL = WDT_PER_512CLK_gc | WDT_ENABLE_bm | WDT_CEN_bm;
 }