TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-12-06 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
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
parent ba94ce55ef e4b86d149c
commit 1b0da68d65
252 changed files with 10752 additions and 7183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/application/main.cpp
View File

@@ -68,7 +68,7 @@
#include "event_m0.hpp"
#include "m4_startup.hpp"
#include "core_control.hpp"
#include "spi_image.hpp"
#include "debug.hpp"
@@ -76,9 +76,6 @@
#include "gcc.hpp"
#include "lpc43xx_cpp.hpp"
using namespace lpc43xx;
#include "sd_card.hpp"
#include <string.h>
@@ -95,8 +92,6 @@ int main(void) {
sdcStart(&SDCD1, nullptr);
init_message_queues();
ui::Context context;
ui::SystemView system_view {
context,
@@ -129,8 +124,7 @@ int main(void) {
portapack::shutdown();
m4_init(portapack::spi_flash::hackrf, portapack::memory::map::m4_code_hackrf);
rgu::reset(rgu::Reset::M0APP);
m0_halt();
return 0;
}