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 |
|
Jared Boone
|
95361b0036
|
Rename ffconf.h -> ffconf_template.h
To avoid #include problems with ffconf.h inside individual firmware executable projects.
|
2016-04-19 09:52:38 -07:00 |
|
Jared Boone
|
94c81528c1
|
FatFs update to R0.11a.
|
2016-04-19 09:51:31 -07:00 |
|
furrtek
|
6e496e2b26
|
Merge fixing, commit to catch up on recent files
|
2016-02-04 10:27:53 +01:00 |
|
Jared Boone
|
dc6fee8370
|
Initial firmware commit.
|
2015-07-08 08:39:24 -07:00 |
|