add:302能编译了

bsp/air302/Makefile.inc

@@ -16,6 +16,7 @@ CFLAGS_INC    +=  -I $(LUATOS_DIR)/bsp/air302/include \
 				  -I $(LUATOS_DIR)/components/sfd \
 				  -I $(LUATOS_DIR)/components/shell \
 				  -I $(LUATOS_DIR)/components/cmux \
+				  -I $(LUATOS_DIR)/components/ymodem \
 
 
 
@@ -38,6 +39,7 @@ LUATOS_SRC_DIRS += $(LUATOS_DIR)/lua/src \
 				    $(LUATOS_DIR)/components/sfd \
 					$(LUATOS_DIR)/components/shell \
 					$(LUATOS_DIR)/components/cmux \
+					$(LUATOS_DIR)/components/ymodem \
 					$(LUATOS_DIR)/bsp/air302/src 
 
 

components/flashdb/src/luat_lib_fdb.c

@@ -254,7 +254,7 @@ static const rotable_Reg_t reg_fdb[] =
     { "kv_get",             ROREG_FUNC(l_fdb_kv_get)},
     { "kv_del",             ROREG_FUNC(l_fdb_kv_del)},
     { "kv_clr",             ROREG_FUNC(l_fdb_kv_clr)},
-    { NULL,                 {}}
+    { NULL,                 ROREG_INT(0)}
 };
 
 LUAMOD_API int luaopen_fdb( lua_State *L ) {

components/lcd/luat_lib_lcd.c

@@ -178,7 +178,7 @@ static int l_lcd_init(lua_State* L) {
             }else if(lua_isstring(L, -1)){
               int len,cmd;
               const char *fail_name = luaL_checklstring(L, -1, &len);
-              FILE* fd = luat_fs_fopen(fail_name, "rb");
+              FILE* fd = (FILE *)luat_fs_fopen(fail_name, "rb");
               cst->init_cmd_count = 0;
               if (fd){
                   #define INITCMD_BUFF_SIZE 128
@@ -1168,31 +1168,31 @@ static const rotable_Reg_t reg_lcd[] =
     { "drawGtfontUtf8Gray", ROREG_FUNC(l_lcd_draw_gtfont_utf8_gray)},
 #endif // LUAT_USE_GTFONT_UTF8
 #endif // LUAT_USE_GTFONT
-    { "font_unifont_t_symbols",   ROREG_PTR(u8g2_font_unifont_t_symbols)},
-    { "font_open_iconic_weather_6x_t", ROREG_PTR(u8g2_font_open_iconic_weather_6x_t)},
-
-    { "font_opposansm8", ROREG_PTR(u8g2_font_opposansm8)},
-    { "font_opposansm10", ROREG_PTR(u8g2_font_opposansm10)},
-    { "font_opposansm12", ROREG_PTR(u8g2_font_opposansm12)},
-    { "font_opposansm16", ROREG_PTR(u8g2_font_opposansm16)},
-    { "font_opposansm18", ROREG_PTR(u8g2_font_opposansm18)},
-    { "font_opposansm20", ROREG_PTR(u8g2_font_opposansm20)},
-    { "font_opposansm22", ROREG_PTR(u8g2_font_opposansm22)},
-    { "font_opposansm24", ROREG_PTR(u8g2_font_opposansm24)},
-    { "font_opposansm32", ROREG_PTR(u8g2_font_opposansm32)},
+    { "font_unifont_t_symbols",   ROREG_PTR((void*)u8g2_font_unifont_t_symbols)},
+    { "font_open_iconic_weather_6x_t", ROREG_PTR((void*)u8g2_font_open_iconic_weather_6x_t)},
+
+    { "font_opposansm8", ROREG_PTR((void*)u8g2_font_opposansm8)},
+    { "font_opposansm10", ROREG_PTR((void*)u8g2_font_opposansm10)},
+    { "font_opposansm12", ROREG_PTR((void*)u8g2_font_opposansm12)},
+    { "font_opposansm16", ROREG_PTR((void*)u8g2_font_opposansm16)},
+    { "font_opposansm18", ROREG_PTR((void*)u8g2_font_opposansm18)},
+    { "font_opposansm20", ROREG_PTR((void*)u8g2_font_opposansm20)},
+    { "font_opposansm22", ROREG_PTR((void*)u8g2_font_opposansm22)},
+    { "font_opposansm24", ROREG_PTR((void*)u8g2_font_opposansm24)},
+    { "font_opposansm32", ROREG_PTR((void*)u8g2_font_opposansm32)},
 #ifdef USE_U8G2_OPPOSANSM12_CHINESE
-    { "font_opposansm12_chinese", ROREG_PTR(u8g2_font_opposansm12_chinese)},
+    { "font_opposansm12_chinese", ROREG_PTR((void*)u8g2_font_opposansm12_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM16_CHINESE
-    { "font_opposansm16_chinese", ROREG_PTR(u8g2_font_opposansm16_chinese)},
+    { "font_opposansm16_chinese", ROREG_PTR((void*)u8g2_font_opposansm16_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM24_CHINESE
-    { "font_opposansm24_chinese", ROREG_PTR(u8g2_font_opposansm24_chinese)},
+    { "font_opposansm24_chinese", ROREG_PTR((void*)u8g2_font_opposansm24_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM32_CHINESE
-    { "font_opposansm32_chinese", ROREG_PTR(u8g2_font_opposansm32_chinese)},
+    { "font_opposansm32_chinese", ROREG_PTR((void*)u8g2_font_opposansm32_chinese)},
 #endif
-	  {NULL, {}}
+	  {NULL, ROREG_INT(0)}
 };
 
 LUAMOD_API int luaopen_lcd( lua_State *L ) {

components/sfd/luat_lib_sfd.c

@@ -179,7 +179,7 @@ static const rotable_Reg_t reg_sfd[] =
     { "erase",             ROREG_FUNC(l_sfd_erase)},
     { "ioctl",             ROREG_FUNC(l_sfd_ioctl)},
     { "id",                ROREG_FUNC(l_sfd_id)},
-    { NULL,                {}}
+    { NULL,                ROREG_INT(0)}
 };
 
 LUAMOD_API int luaopen_sfd( lua_State *L ) {

components/ymodem/luat_lib_ymodem.c

@@ -64,7 +64,7 @@ static int l_ymodem_receive(lua_State *L){
 	int result;
 	size_t len;
 	uint8_t ack, flag, file_ok, all_done;
-	char *data;
+	const char *data;
 	if (handler && handler->ctrl)
 	{
 		if (lua_isstring(L, 2))
@@ -141,7 +141,7 @@ static const rotable_Reg_t reg_ymodem[] =
     { "receive",   			ROREG_FUNC(l_ymodem_receive)},
     { "reset",      		ROREG_FUNC(l_ymodem_reset)},
     { "release",			ROREG_FUNC(l_ymodem_release)},
-	{ NULL,             {}}
+	{ NULL,             ROREG_INT(0)}
 };
 
 LUAMOD_API int luaopen_ymodem( lua_State *L ) {

components/ymodem/luat_ymodem.c

@@ -73,7 +73,7 @@ void *luat_ymodem_create_handler(const char *save_path, const char *force_save_p
 		if (force_save_path)
 		{
 			handler->force_save_path = luat_heap_malloc(strlen(force_save_path) + 1);
-			strcpy(handler->force_save_path, force_save_path);
+			strcpy((char*)handler->force_save_path, force_save_path);
 		}
 
 

luat/packages/eink/luat_lib_eink.c

@@ -976,32 +976,32 @@ static const rotable_Reg_t reg_eink[] =
     { "MODEL_2in9f",          ROREG_INT(MODEL_2in9f)},
     { "MODEL_3in7",           ROREG_INT(MODEL_3in7)},
 
-    { "font_unifont_t_symbols",   ROREG_PTR(u8g2_font_unifont_t_symbols)},
-    { "font_open_iconic_weather_6x_t", ROREG_PTR(u8g2_font_open_iconic_weather_6x_t)},
-
-    { "font_opposansm8", ROREG_PTR(u8g2_font_opposansm8)},
-    { "font_opposansm10", ROREG_PTR(u8g2_font_opposansm10)},
-    { "font_opposansm12", ROREG_PTR(u8g2_font_opposansm12)},
-    { "font_opposansm16", ROREG_PTR(u8g2_font_opposansm16)},
-    { "font_opposansm18", ROREG_PTR(u8g2_font_opposansm18)},
-    { "font_opposansm20", ROREG_PTR(u8g2_font_opposansm20)},
-    { "font_opposansm22", ROREG_PTR(u8g2_font_opposansm22)},
-    { "font_opposansm24", ROREG_PTR(u8g2_font_opposansm24)},
-    { "font_opposansm32", ROREG_PTR(u8g2_font_opposansm32)},
+    { "font_unifont_t_symbols",   ROREG_PTR((void*)u8g2_font_unifont_t_symbols)},
+    { "font_open_iconic_weather_6x_t", ROREG_PTR((void*)u8g2_font_open_iconic_weather_6x_t)},
+
+    { "font_opposansm8", ROREG_PTR((void*)u8g2_font_opposansm8)},
+    { "font_opposansm10", ROREG_PTR((void*)u8g2_font_opposansm10)},
+    { "font_opposansm12", ROREG_PTR((void*)u8g2_font_opposansm12)},
+    { "font_opposansm16", ROREG_PTR((void*)u8g2_font_opposansm16)},
+    { "font_opposansm18", ROREG_PTR((void*)u8g2_font_opposansm18)},
+    { "font_opposansm20", ROREG_PTR((void*)u8g2_font_opposansm20)},
+    { "font_opposansm22", ROREG_PTR((void*)u8g2_font_opposansm22)},
+    { "font_opposansm24", ROREG_PTR((void*)u8g2_font_opposansm24)},
+    { "font_opposansm32", ROREG_PTR((void*)u8g2_font_opposansm32)},
 #ifdef USE_U8G2_OPPOSANSM12_CHINESE
-    { "font_opposansm12_chinese", ROREG_PTR(u8g2_font_opposansm12_chinese)},
+    { "font_opposansm12_chinese", ROREG_PTR((void*)u8g2_font_opposansm12_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM16_CHINESE
-    { "font_opposansm16_chinese", ROREG_PTR(u8g2_font_opposansm16_chinese)},
+    { "font_opposansm16_chinese", ROREG_PTR((void*)u8g2_font_opposansm16_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM24_CHINESE
-    { "font_opposansm24_chinese", ROREG_PTR(u8g2_font_opposansm24_chinese)},
+    { "font_opposansm24_chinese", ROREG_PTR((void*)u8g2_font_opposansm24_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM32_CHINESE
-    { "font_opposansm32_chinese", ROREG_PTR(u8g2_font_opposansm32_chinese)},
+    { "font_opposansm32_chinese", ROREG_PTR((void*)u8g2_font_opposansm32_chinese)},
 #endif
 
-	  { NULL,                    {}}
+	  { NULL,                    ROREG_INT(0)}
 };
 
 LUAMOD_API int luaopen_eink( lua_State *L ){

luat/packages/fatfs/luat_lib_fatfs.c

@@ -558,7 +558,7 @@ static const rotable_Reg_t reg_fatfs[] =
   { "rename",	ROREG_FUNC(fatfs_rename)}, // 文件改名
 
   { "readfile",	ROREG_FUNC(fatfs_readfile)}, // 读取文件的简易方法
-  { NULL,		{}}
+  { NULL,		ROREG_INT(0)}
 };
 
 int luaopen_fatfs( lua_State *L )

luat/packages/lfs/luat_lib_lfs2.c

@@ -160,7 +160,7 @@ static const rotable_Reg_t reg_lfs2[] =
   { "mount",	ROREG_FUNC(l_lfs2_mount)}, //初始化,挂载
 //   { "unmount",	ROREG_FUNC(l_lfs2_unmount)}, // 取消挂载
   { "mkfs",		ROREG_FUNC(l_lfs2_mkfs)}, // 格式化!!!
-  { NULL,		  {}}
+  { NULL,		  ROREG_INT(0)}
 };
 
 int luaopen_lfs2( lua_State *L )

luat/packages/minmea/luat_lib_libgnss.c

@@ -567,7 +567,7 @@ static const rotable_Reg_t reg_libgnss[] =
     // { "air530z_saveconf", ROREG_FUNC(l_libgnss_air530_saveconf)},
     // { "air530z_setbandrate", ROREG_FUNC(l_libgnss_air530_setbandrate)},
 
-	{ NULL,      {}}
+	{ NULL,      ROREG_INT(0)}
 };
 
 LUAMOD_API int luaopen_libgnss( lua_State *L ) {

luat/packages/u8g2/luat_lib_disp.c

@@ -261,29 +261,29 @@ static const rotable_Reg_t reg_disp[] =
     { "drawStr",    ROREG_FUNC(l_disp_draw_text)},
     { "setFont",    ROREG_FUNC(l_disp_set_font)},
 
-    { "font_unifont_t_symbols",   ROREG_PTR(u8g2_font_unifont_t_symbols)},
-    { "font_open_iconic_weather_6x_t", ROREG_PTR(u8g2_font_open_iconic_weather_6x_t)},
-
-    { "font_opposansm8", ROREG_PTR(u8g2_font_opposansm8)},
-    { "font_opposansm10", ROREG_PTR(u8g2_font_opposansm10)},
-    { "font_opposansm12", ROREG_PTR(u8g2_font_opposansm12)},
-    { "font_opposansm16", ROREG_PTR(u8g2_font_opposansm16)},
-    { "font_opposansm18", ROREG_PTR(u8g2_font_opposansm18)},
-    { "font_opposansm20", ROREG_PTR(u8g2_font_opposansm20)},
-    { "font_opposansm22", ROREG_PTR(u8g2_font_opposansm22)},
-    { "font_opposansm24", ROREG_PTR(u8g2_font_opposansm24)},
-    { "font_opposansm32", ROREG_PTR(u8g2_font_opposansm32)},
+    { "font_unifont_t_symbols",   ROREG_PTR((void*)u8g2_font_unifont_t_symbols)},
+    { "font_open_iconic_weather_6x_t", ROREG_PTR((void*)u8g2_font_open_iconic_weather_6x_t)},
+
+    { "font_opposansm8", ROREG_PTR((void*)u8g2_font_opposansm8)},
+    { "font_opposansm10", ROREG_PTR((void*)u8g2_font_opposansm10)},
+    { "font_opposansm12", ROREG_PTR((void*)u8g2_font_opposansm12)},
+    { "font_opposansm16", ROREG_PTR((void*)u8g2_font_opposansm16)},
+    { "font_opposansm18", ROREG_PTR((void*)u8g2_font_opposansm18)},
+    { "font_opposansm20", ROREG_PTR((void*)u8g2_font_opposansm20)},
+    { "font_opposansm22", ROREG_PTR((void*)u8g2_font_opposansm22)},
+    { "font_opposansm24", ROREG_PTR((void*)u8g2_font_opposansm24)},
+    { "font_opposansm32", ROREG_PTR((void*)u8g2_font_opposansm32)},
 #ifdef USE_U8G2_OPPOSANSM12_CHINESE
-    { "font_opposansm12_chinese", ROREG_PTR(u8g2_font_opposansm12_chinese)},
+    { "font_opposansm12_chinese", ROREG_PTR((void*)u8g2_font_opposansm12_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM16_CHINESE
-    { "font_opposansm16_chinese", ROREG_PTR(u8g2_font_opposansm16_chinese)},
+    { "font_opposansm16_chinese", ROREG_PTR((void*)u8g2_font_opposansm16_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM24_CHINESE
-    { "font_opposansm24_chinese", ROREG_PTR(u8g2_font_opposansm24_chinese)},
+    { "font_opposansm24_chinese", ROREG_PTR((void*)u8g2_font_opposansm24_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM32_CHINESE
-    { "font_opposansm32_chinese", ROREG_PTR(u8g2_font_opposansm32_chinese)},
+    { "font_opposansm32_chinese", ROREG_PTR((void*)u8g2_font_opposansm32_chinese)},
 #endif
 
 	{ NULL,         ROREG_INT(0)}

luat/packages/u8g2/luat_lib_u8g2.c

@@ -814,32 +814,32 @@ static const rotable_Reg_t reg_u8g2[] =
     { "drawGtfontUtf8", ROREG_FUNC(l_u8g2_draw_gtfont_utf8)},
 #endif // LUAT_USE_GTFONT_UTF8
 #endif // LUAT_USE_GTFONT
-    { "font_unifont_t_symbols",   ROREG_PTR(u8g2_font_unifont_t_symbols)},
-    { "font_open_iconic_weather_6x_t", ROREG_PTR(u8g2_font_open_iconic_weather_6x_t)},
-
-    { "font_opposansm8", ROREG_PTR(u8g2_font_opposansm8)},
-    { "font_opposansm10", ROREG_PTR(u8g2_font_opposansm10)},
-    { "font_opposansm12", ROREG_PTR(u8g2_font_opposansm12)},
-    { "font_opposansm16", ROREG_PTR(u8g2_font_opposansm16)},
-    { "font_opposansm18", ROREG_PTR(u8g2_font_opposansm18)},
-    { "font_opposansm20", ROREG_PTR(u8g2_font_opposansm20)},
-    { "font_opposansm22", ROREG_PTR(u8g2_font_opposansm22)},
-    { "font_opposansm24", ROREG_PTR(u8g2_font_opposansm24)},
-    { "font_opposansm32", ROREG_PTR(u8g2_font_opposansm32)},
+    { "font_unifont_t_symbols",   ROREG_PTR((void*)u8g2_font_unifont_t_symbols)},
+    { "font_open_iconic_weather_6x_t", ROREG_PTR((void*)u8g2_font_open_iconic_weather_6x_t)},
+
+    { "font_opposansm8", ROREG_PTR((void*)u8g2_font_opposansm8)},
+    { "font_opposansm10", ROREG_PTR((void*)u8g2_font_opposansm10)},
+    { "font_opposansm12", ROREG_PTR((void*)u8g2_font_opposansm12)},
+    { "font_opposansm16", ROREG_PTR((void*)u8g2_font_opposansm16)},
+    { "font_opposansm18", ROREG_PTR((void*)u8g2_font_opposansm18)},
+    { "font_opposansm20", ROREG_PTR((void*)u8g2_font_opposansm20)},
+    { "font_opposansm22", ROREG_PTR((void*)u8g2_font_opposansm22)},
+    { "font_opposansm24", ROREG_PTR((void*)u8g2_font_opposansm24)},
+    { "font_opposansm32", ROREG_PTR((void*)u8g2_font_opposansm32)},
 #ifdef USE_U8G2_OPPOSANSM12_CHINESE
-    { "font_opposansm12_chinese", ROREG_PTR(u8g2_font_opposansm12_chinese)},
+    { "font_opposansm12_chinese", ROREG_PTR((void*)u8g2_font_opposansm12_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM16_CHINESE
-    { "font_opposansm16_chinese", ROREG_PTR(u8g2_font_opposansm16_chinese)},
+    { "font_opposansm16_chinese", ROREG_PTR((void*)u8g2_font_opposansm16_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM24_CHINESE
-    { "font_opposansm24_chinese", ROREG_PTR(u8g2_font_opposansm24_chinese)},
+    { "font_opposansm24_chinese", ROREG_PTR((void*)u8g2_font_opposansm24_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM32_CHINESE
-    { "font_opposansm32_chinese", ROREG_PTR(u8g2_font_opposansm32_chinese)},
+    { "font_opposansm32_chinese", ROREG_PTR((void*)u8g2_font_opposansm32_chinese)},
 #endif
 
-	{ NULL,  {}}
+	{ NULL,  ROREG_INT(0)}
 };
 
 LUAMOD_API int luaopen_u8g2( lua_State *L ) {