TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-23 00:07:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move CPLD management into PortaPack::init().

Browse Source
This commit is contained in:
Jared Boone
2016-07-18 11:30:45 -07:00
parent 5390c45e04
commit c0b9761fe5
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/application/main.cpp
View File

@@ -24,8 +24,6 @@
#include "portapack.hpp" #include "portapack.hpp"
#include "portapack_shared_memory.hpp" #include "portapack_shared_memory.hpp"
#include "cpld_update.hpp"
#include "message_queue.hpp" #include "message_queue.hpp"
#include "ui.hpp" #include "ui.hpp"
@@ -72,14 +70,6 @@ static void event_loop() {
int main(void) { int main(void) {
portapack::init(); portapack::init();
if( !cpld_update_if_necessary() ) {
chSysHalt();
}
if( !cpld_hackrf_load_sram() ) {
chSysHalt();
}
portapack::io.init(); portapack::io.init();
portapack::display.init(); portapack::display.init();

10
firmware/application/portapack.cpp
View File

@@ -32,6 +32,8 @@ using namespace hackrf::one;
#include "touch_adc.hpp" #include "touch_adc.hpp"
#include "audio.hpp" #include "audio.hpp"
#include "cpld_update.hpp"
namespace portapack { namespace portapack {
portapack::IO io { portapack::IO io {
@@ -149,6 +151,14 @@ void init() {
radio::init(); radio::init();
touch::adc::init(); touch::adc::init();
if( !cpld_update_if_necessary() ) {
chSysHalt();
}
if( !cpld_hackrf_load_sram() ) {
chSysHalt();
}
} }
void shutdown() { void shutdown() {