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
This commit is contained in:
furrtek 2016-07-25 16:35:42 +02:00
commit fdfa7c9776
138 changed files with 17603 additions and 1930 deletions

View file

@ -32,6 +32,8 @@ using namespace hackrf::one;
#include "touch_adc.hpp"
#include "audio.hpp"
#include "cpld_update.hpp"
namespace portapack {
portapack::IO io {
@ -153,6 +155,14 @@ void init() {
radio::init();
touch::adc::init();
if( !cpld_update_if_necessary() ) {
chSysHalt();
}
if( !cpld_hackrf_load_sram() ) {
chSysHalt();
}
}
void shutdown() {
@ -160,6 +170,9 @@ void shutdown() {
radio::disable();
audio::shutdown();
cpld_hackrf_init_from_eeprom();
clock_manager.shutdown();
power.shutdown();