Merge branch 'master' of https://gitee.com/openLuat/LuatOS

bsp/linux/CMakeLists.txt

@@ -43,7 +43,6 @@ aux_source_directory(${TOPROOT}/components/tjpgd TJPGD_SRCS)
 add_library(luat ${PORT_SRCS} ${LUA_SRCS} ${CJSON_SRCS} ${TOPROOT}/luat/modules/luat_main.c
                  ${TOPROOT}/luat/modules/luat_base.c
                  ${TOPROOT}/luat/modules/luat_ota.c
-                 ${TOPROOT}/luat/modules/luat_luat_bin.c
                  ${TOPROOT}/luat/modules/luat_lib_rtos.c
                  ${TOPROOT}/luat/modules/luat_lib_timer.c
                  ${TOPROOT}/luat/modules/luat_lib_log.c
@@ -57,6 +56,8 @@ add_library(luat ${PORT_SRCS} ${LUA_SRCS} ${CJSON_SRCS} ${TOPROOT}/luat/modules/
                  ${TOPROOT}/components/sfd/luat_lib_sfd.c
                  ${TOPROOT}/components/sfd/luat_sfd_mem.c
                  ${TOPROOT}/components/sfd/luat_sfd_w25q.c
+                 ${TOPROOT}/components/sfd/luat_sfd_onchip.c
+                 ${TOPROOT}/components/sfd/luat_sfd.c
                  ${TOPROOT}/luat/modules/crc.c
                  ${TOPROOT}/luat/vfs/luat_vfs.c
                  ${TOPROOT}/luat/vfs/luat_fs_luadb.c

bsp/win32/CMakeLists.txt

@@ -45,7 +45,6 @@ add_library(cjson ${CJSON_SRCS})
 add_library(luat ${TOPROOT}/luat/modules/luat_main.c
                  ${TOPROOT}/luat/modules/luat_base.c
                  ${TOPROOT}/luat/modules/luat_ota.c
-                 ${TOPROOT}/luat/modules/luat_luat_bin.c
                  ${TOPROOT}/luat/modules/luat_lib_rtos.c
                  ${TOPROOT}/luat/modules/luat_lib_timer.c
                  ${TOPROOT}/luat/modules/luat_lib_log.c

components/gtfont/luat_gtfont.c

@@ -52,7 +52,7 @@ unsigned char gt_read_data(unsigned char* sendbuf , unsigned char sendlen , unsi
 {
     if (gt_spi_dev == NULL)
         return 0;
-    luat_spi_device_transfer(gt_spi_dev, sendbuf, sendlen,receivebuf, receivelen);
+    luat_spi_device_transfer(gt_spi_dev, (const char *)sendbuf, sendlen,(char *)receivebuf, receivelen);
     #if LUAT_GT_DEBUG
     LLOGD("gt_read_data sendlen:%d receivelen:%d",sendlen,receivelen);
     for(int i = 0; i < sendlen;i++){