Merge remote-tracking branch 'origin/emulator' into dev_aaron

discovery/src/ll_filesystem.c

@@ -0,0 +1,38 @@
+#include "ll_filesystem.h"
+#include <stdio.h>
+
+bool ll_filesystem_init() {
+	return false;
+}
+
+DIRECTORY_STRUCT* ll_filesystem_dir_open(const char* path) {
+	return NULL;
+}
+
+void ll_filesystem_dir_close(DIRECTORY_STRUCT* dir) {
+	
+
+}
+
+FILE_HANDLE* ll_filesystem_file_open(const char* filename) {
+	return NULL;	
+}
+
+void ll_filesystem_file_close(FILE_HANDLE* handle) {
+	
+}
+
+FILE_STATUS ll_filesystem_file_seek(FILE_HANDLE* handle, uint32_t offset) {
+	return F_DISKERROR;
+}
+
+FILE_STATUS ll_filesystem_file_read(FILE_HANDLE* handle, uint8_t* buf, uint32_t size) {
+	return F_DISKERROR;
+}
+
+FILE_STATUS ll_filesystem_file_write(FILE_HANDLE* handle, uint8_t* buf, uint32_t size) {
+	return F_DISKERROR;
+}
+                                                                                                                                                                               
+
+

discovery/src/ll_tft.c

@@ -604,7 +604,8 @@ void ll_tft_draw_char(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor,
     bool enTrans            = 0;
     
     ll_tft_set_window(x, y, x + width - 1, y + height - 1);
-    
+    ll_tft_set_cursor(x, y);   
+ 
     for(cnt = (width / 8) * height; cnt > 0; cnt--){
         for(bitm = 0x80; bitm > 0; bitm >>= 1){
             if((font[ind]) & bitm){