Merge branch 'master' into developer

Conflicts:
	Makefile
This commit is contained in:
TuxSH
2016-06-11 00:00:53 +02:00
25 changed files with 321 additions and 320 deletions

View File

@@ -67,6 +67,7 @@ void __attribute__((noreturn)) mainHandler(u32 regs[REG_DUMP_SIZE / 4], u32 type
for(u32 i = 0; i < dumpHeader.stackDumpSize / 4; i++)
*final++ = sp[i];
((void (*)())0xFFFF0830)(); //Ensure that all memory transfers have completed and that the data cache has been flushed
i2cWriteRegister(I2C_DEV_MCU, 0x20, 1 << 2); //Reboot
while(1);
}