Merge remote-tracking branch 'upstream/master'

Conflicts:
	firmware/application/Makefile
	firmware/application/core_control.cpp
	firmware/application/touch.cpp
	firmware/application/ui_debug.cpp
	firmware/application/ui_debug.hpp
	firmware/application/ui_navigation.cpp
	firmware/baseband/baseband_thread.cpp
This commit is contained in:
furrtek
2016-04-21 20:36:19 +02:00
252 changed files with 10752 additions and 7183 deletions

View File

@@ -178,9 +178,12 @@ vectors_t _vectors = {
__attribute__ ((naked))
#endif
void _unhandled_exception(void) {
#if CH_DBG_ENABLED
chDbgPanic("Unhandled");
#else
while (TRUE)
;
#endif
}
void NMIVector(void) __attribute__((weak, alias("_unhandled_exception")));