furrtek 8009a9b543 Merge remote-tracking branch 'upstream/master' ... Conflicts: firmware/application/Makefile firmware/application/analog_audio_app.cpp firmware/application/analog_audio_app.hpp firmware/application/event.cpp firmware/application/irq_ipc.hpp firmware/application/portapack.hpp firmware/application/receiver_model.cpp firmware/application/receiver_model.hpp firmware/application/recent_entries.cpp firmware/application/string_format.hpp firmware/application/ui_debug.cpp firmware/application/ui_debug.hpp firmware/application/ui_menu.cpp firmware/application/ui_navigation.cpp firmware/application/ui_navigation.hpp firmware/application/ui_receiver.cpp firmware/application/ui_receiver.hpp firmware/application/ui_sd_card_status_view.cpp firmware/application/ui_sd_card_status_view.hpp firmware/application/ui_setup.cpp firmware/application/ui_setup.hpp firmware/application/ui_spectrum.hpp firmware/baseband-tx/dsp_fir_taps.cpp firmware/baseband-tx/dsp_fir_taps.hpp firmware/baseband-tx/irq_ipc_m4.cpp firmware/baseband-tx/irq_ipc_m4.hpp firmware/baseband-tx/proc_audiotx.cpp firmware/baseband/Makefile firmware/baseband/audio_output.cpp firmware/baseband/audio_output.hpp firmware/baseband/block_decimator.hpp firmware/baseband/dsp_decimate.cpp firmware/baseband/dsp_decimate.hpp firmware/baseband/dsp_demodulate.cpp firmware/baseband/dsp_demodulate.hpp firmware/baseband/dsp_fir_taps.cpp firmware/baseband/irq_ipc_m4.cpp firmware/baseband/irq_ipc_m4.hpp firmware/baseband/proc_am_audio.cpp firmware/baseband/proc_am_audio.hpp firmware/baseband/proc_nfm_audio.cpp firmware/baseband/proc_nfm_audio.hpp firmware/baseband/proc_wfm_audio.cpp firmware/baseband/proc_wfm_audio.hpp firmware/baseband/spectrum_collector.hpp firmware/common/dsp_fir_taps.cpp firmware/common/dsp_fir_taps.hpp firmware/common/event.hpp firmware/common/message.hpp firmware/common/ui_painter.cpp firmware/common/ui_painter.hpp		2016-02-04 11:35:55 +01:00
..
audio_dma.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
audio_dma.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
audio_output.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
audio_output.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
audio_stats_collector.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
audio_stats_collector.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
baseband_dma.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
baseband_dma.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
baseband_processor.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
baseband_processor.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
baseband_stats_collector.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
baseband_stats_collector.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
baseband_thread.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
baseband_thread.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
block_decimator.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
channel_decimator.cpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
channel_decimator.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
channel_stats_collector.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
chconf.h	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
clock_recovery.cpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
clock_recovery.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
description	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
dsp_decimate.cpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
dsp_decimate.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
dsp_demodulate.cpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
dsp_demodulate.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
dsp_iir_config.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
dsp_iir.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
dsp_iir.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
dsp_squelch.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
dsp_squelch.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
event_m4.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
event_m4.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
fxpt_atan2.cpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
fxpt_atan2.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
gpdma_lli.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
halconf.h	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
linear_resampler.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
main.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
main.cpp.orig	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
Makefile	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
matched_filter.cpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
matched_filter.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
mcuconf.h	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
name	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
packet_builder.cpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
packet_builder.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
proc_audiotx.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
proc_audiotx.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
proc_fsk_lcr.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
proc_fsk_lcr.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
proc_jammer.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
proc_jammer.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
proc_playaudio.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
proc_playaudio.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
proc_rds.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
proc_rds.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
proc_xylos.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
proc_xylos.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
rssi_dma.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
rssi_dma.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
rssi_stats_collector.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
rssi_thread.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
rssi_thread.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
rssi.cpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
rssi.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
spectrum_collector.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
spectrum_collector.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
symbol_coding.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00
thread_base.hpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
touch_dma.cpp	Merge fixing, commit to catch up on recent files	2016-02-04 10:27:53 +01:00
touch_dma.hpp	Dynamic baseband module loading from SD card	2015-11-20 07:59:09 +01:00