Merge remote-tracking branch 'upstream/master'

Conflicts:
	firmware/Makefile
	firmware/application/Makefile
	firmware/application/event_m0.cpp
	firmware/application/ui_setup.cpp
	firmware/application/ui_setup.hpp
	firmware/baseband/baseband_thread.cpp
	firmware/baseband/baseband_thread.hpp
	firmware/bootstrap/CMakeLists.txt
	firmware/common/message.hpp
	firmware/common/portapack_shared_memory.hpp
	hardware/.gitignore

hardware/.gitignore

@@ -0,0 +1,19 @@
+# Common
+*.bak
+
+# CPLD tool
+*.bsd
+*.rpt
+tb2_ie_info.xml
+**/cpld/db/
+**/cpld/incremental_db/
+**/cpld/output_files/*.done
+**/cpld/output_files/*.smsg
+**/cpld/output_files/*.summary
+**/cpld/output_files/*.jdi
+**/cpld/output_files/*.pin
+**/cpld/output_files/*.pof
+**/cpld/simulation/
+
+# KiCad
+*.kicad_pcb-bak