furrtek 1b0da68d65 Merge remote-tracking branch 'upstream/master' ...

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

2016-04-21 20:36:19 +02:00

..

application

Merge remote-tracking branch 'upstream/master'

2016-04-21 20:36:19 +02:00

baseband

Merge remote-tracking branch 'upstream/master'

2016-04-21 20:36:19 +02:00

baseband-tx

"sdcard" folder, for clarity

2016-02-05 17:50:35 +01:00

bootstrap

Merge fixing, commit to catch up on recent files

2016-02-04 10:27:53 +01:00

chibios

ChibiOS 2.6.8, until I can figure out where to get it from git.

2015-07-08 08:40:23 -07:00

chibios-portapack

Merge remote-tracking branch 'upstream/master'

2016-04-21 20:36:19 +02:00

common

Merge remote-tracking branch 'upstream/master'

2016-04-21 20:36:19 +02:00

tools

Merge fixing, commit to catch up on recent files

2016-02-04 10:27:53 +01:00

baseband-tx.bin

Loadmodule emergency fix

2016-02-06 23:19:28 +01:00

baseband.bin

Loadmodule emergency fix

2016-02-06 23:19:28 +01:00

hackrf_one_usb_ram.dfu

Update hackrf_one_usb_ram.dfu to HackRF release 2015.07.2.

2015-07-29 22:21:35 -07:00

Makefile

"sdcard" folder, for clarity

2016-02-05 17:50:35 +01:00

portapack-h1-firmware.bin

Loadmodule emergency fix

2016-02-06 23:19:28 +01:00