add:修改LUATOS宏标识

app/main.c

@@ -3,7 +3,7 @@
 #include "wm_psram.h"
 #include "wm_internal_flash.h"
 
-#ifdef USE_LUATOS
+#ifdef __LUATOS__
 #include "string.h"
 #include "luat_fs.h"
 #include "bget.h"
@@ -77,7 +77,7 @@ static OS_STK __attribute__((aligned(4))) 			TaskStartStk[TASK_START_STK_SIZE] =
 
 uint32_t rst_sta = 0;
 
-#ifdef USE_LUATOS
+#ifdef __LUATOS__
 extern unsigned int  TLS_FLASH_PARAM_DEFAULT        ;
 extern unsigned int  TLS_FLASH_PARAM1_ADDR          ;
 extern unsigned int  TLS_FLASH_PARAM2_ADDR          ;
@@ -106,7 +106,7 @@ void UserMain(void){
 	luat_shell_poweron(0);
 #endif
 
-#ifdef USE_LUATOS
+#ifdef __LUATOS__
 	tls_fls_read_unique_id(unique_id);
 	if (unique_id[1] == 0x10){
 		printf("I/main auth ok %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X %s\n",
@@ -149,7 +149,7 @@ TLS_FLASH_END_ADDR             =		  (0x80FFFFFUL);
 	//uint8_t* psram_ptr = (uint8_t*)(PSRAM_ADDR_START);
 #endif
 	
-#ifdef USE_LUATOS
+#ifdef __LUATOS__
 #ifdef LUAT_USE_LVGL
 	lv_init();
 	static tls_os_timer_t *os_timer = NULL;
@@ -169,7 +169,7 @@ TLS_FLASH_END_ADDR             =		  (0x80FFFFFUL);
 #endif
 }
 
-#ifndef USE_LUATOS
+#ifndef __LUATOS__
 // void vApplicationTickHook( void ) {}
 void bpool(void *buffer, long len) {}
 #endif

lib/xmake.lua

@@ -20,7 +20,7 @@ toolchain_end()
 
 set_toolchains("csky_toolchain")
 --add macro defination
-add_defines("GCC_COMPILE=1","TLS_CONFIG_CPU_XT804=1","NIMBLE_FTR=1","USE_LUATOS")
+add_defines("GCC_COMPILE=1","TLS_CONFIG_CPU_XT804=1","NIMBLE_FTR=1","__LUATOS__")
 -- set warning all as error
 set_warnings("all")
 set_optimize("smallest")

xmake.lua

@@ -26,7 +26,7 @@ toolchain_end()
 
 set_toolchains("csky_toolchain")
 --add macro defination
-add_defines("GCC_COMPILE=1","TLS_CONFIG_CPU_XT804=1","NIMBLE_FTR=1","USE_LUATOS")
+add_defines("GCC_COMPILE=1","TLS_CONFIG_CPU_XT804=1","NIMBLE_FTR=1","__LUATOS__")
 
 set_warnings("all")
 set_optimize("smallest")
@@ -82,7 +82,7 @@ target("air10x")
         local custom_data = io.readfile("$(projectdir)/app/port/luat_conf_bsp.h")
         local TARGET_CONF = custom_data:find("#define AIR101")
         if TARGET_CONF == nil then TARGET_NAME = "AIR103" else TARGET_NAME = "AIR101" end
-        target:add("defines", TARGET_NAME)
+        -- target:add("defines", TARGET_NAME)
         target:set("filename", TARGET_NAME..".elf")
         target:add("ldflags", flto .. "-Wl,--gc-sections -Wl,-zmax-page-size=1024 -Wl,--whole-archive ./lib/libwmsys.a ./lib/libdrivers.a ./lib/libos.a ./lib/libblehost.a ./lib/libwmarch.a ./lib/libwmcommon.a ./lib/libapp.a ./lib/libgt.a ./lib/libwlan.a ./lib/libdsp.a ./lib/libbtcontroller.a -Wl,--no-whole-archive -mcpu=ck804ef -nostartfiles -mhard-float -lm -Wl,-T./ld/"..TARGET_NAME..".ld -Wl,-ckmap=./build/out/"..TARGET_NAME..".map ",{force = true})
     end)