Commit Graph

14 Commits

Author SHA1 Message Date
furrtek
5e40669cbc Merge 'upstream/master' - At least it builds... 2017-01-16 03:45:44 +00:00
Jared Boone
11a5aa9766 FatFs: Apply patch ff12a_p6.diff. 2016-08-21 23:03:08 -07:00
Jared Boone
60cc9b7faa FatFs: Apply patch ff12a_p5.diff.
Fixed one chunk of this patch in an earlier commit.
2016-08-21 23:02:00 -07:00
Jared Boone
69173f5292 FatFs: My patch to fix wrong argument type warning. 2016-07-28 23:21:13 -07:00
Jared Boone
4f6254cc93 FatFs: Apply patch ff12a_p4.diff. 2016-07-28 23:14:08 -07:00
Jared Boone
aa8c8b2937 FatFs: Apply patch ff12a_p3.diff. 2016-07-28 23:13:07 -07:00
Jared Boone
897110f715 FatFs: Apply patch ff12a_p2.diff. 2016-07-28 23:12:04 -07:00
Jared Boone
3a51933882 FatFs: Apply patch ff12a_p1.diff. 2016-07-28 23:11:23 -07:00
Jared Boone
d5234633ba FatFs: Update to R0.12a. 2016-07-28 23:06:21 -07:00
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