Merge branch 'master' of https://gitee.com/openLuat/luatos-soc-air105

Third_Party/ZBAR/include/refcnt.h

@@ -24,6 +24,7 @@
 #define _REFCNT_H_
 
 #include <config.h>
+#include "debug.h"
 //#include <assert.h>
 
 #if defined(_WIN32)

application/src/luat_fs_air105.c

@@ -10,10 +10,10 @@ struct lfs LFS;
 #define LFS_BLOCK_DEVICE_PROG_SIZE      (__FLASH_PAGE_SIZE__)
 #define LFS_BLOCK_DEVICE_LOOK_AHEAD     (16)
 #define LFS_BLOCK_DEVICE_CACHE_SIZE     (256)
-
+#define SCRIPT_LUADB_START_ADDR			(__FLASH_BASE_ADDR__ + __CORE_FLASH_SECTOR_NUM__ * __FLASH_SECTOR_SIZE__)
 // 根据头文件的定义, 算出脚本区和文件系统区的绝对地址
-const size_t script_luadb_start_addr = __FLASH_BASE_ADDR__ + __CORE_FLASH_SECTOR_NUM__ * __FLASH_SECTOR_SIZE__ ;
-const size_t lfs_fs_start_addr = script_luadb_start_addr + __SCRIPT_FLASH_SECTOR_NUM__ * __FLASH_SECTOR_SIZE__ ;
+const size_t script_luadb_start_addr = SCRIPT_LUADB_START_ADDR;
+const size_t lfs_fs_start_addr = SCRIPT_LUADB_START_ADDR + __SCRIPT_FLASH_SECTOR_NUM__ * __FLASH_SECTOR_SIZE__ ;
 
 static int block_device_read(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, void *buffer, lfs_size_t size)

lib/README.md

@@ -0,0 +1,5 @@
+# 存放第三方静态库
+
+本目录存放的均为可选的第三方库, 不需要就无视
+
+* libgt.a 高通字体芯片的静态库