update：优化mbedtls设置。优化log日志

add:network控制mbedtls的log
add:libhttp

application/include/luat_conf_bsp.h

@@ -71,7 +71,9 @@
 #define LUAT_USE_DNS  1
 #define LUAT_USE_NETWORK 1
 #define LUAT_USE_TLS 1
+// #define LUAT_USE_IOTAUTH 1
 #define LUAT_USE_LORA 1
+// #define LUAT_USE_MLX90640 1
 #define LUAT_USE_MINIZ 1
 
 //----------------------------
@@ -115,6 +117,7 @@
 #define LV_FONT_OPPOSANS_M_16
 //---------------------
 // LVGL
+#define LUAT_USE_LCD
 #define LUAT_USE_LVGL
 #define LV_DISP_DEF_REFR_PERIOD gLVFlashTime
 extern unsigned int gLVFlashTime;
@@ -173,9 +176,7 @@ extern unsigned int gLVFlashTime;
 #define LV_USE_PERF_MONITOR     1
 #define __LVGL_SLEEP_ENABLE__
 #define __LUATOS_TICK_64BIT__
-#ifndef LUAT_USE_MEMORY_OPTIMIZATION_CODE_MMAP
-#define LUAT_USE_MEMORY_OPTIMIZATION_CODE_MMAP 1
-#endif
+#define LUAT_USE_MEMORY_OPTIMIZATION_CODE_MMAP
 
 #ifndef __LV_DEBUG__
 #undef LV_USE_PERF_MONITOR

application/include/mbedtls_config.h

@@ -1064,7 +1064,7 @@
  *      MBEDTLS_TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
  *      MBEDTLS_TLS_ECDHE_RSA_WITH_RC4_128_SHA
  */
-// #define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
 
 /**
  * \def MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
@@ -1088,7 +1088,7 @@
  *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
  *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
  */
-// #define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
 
 /**
  * \def MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
@@ -2404,7 +2404,7 @@
  *          library/x509write_crt.c
  *          library/x509write_csr.c
  */
-// #define MBEDTLS_ASN1_WRITE_C
+#define MBEDTLS_ASN1_WRITE_C
 
 /**
  * \def MBEDTLS_BASE64_C
@@ -2737,7 +2737,7 @@
  *           and at least one MBEDTLS_ECP_DP_XXX_ENABLED for a
  *           short Weierstrass curve.
  */
-// #define MBEDTLS_ECDSA_C
+#define MBEDTLS_ECDSA_C
 
 /**
  * \def MBEDTLS_ECJPAKE_C
@@ -3961,4 +3961,7 @@
 
 #include "mbedtls/check_config.h"
 
+
+#define __SMALL_RAM___
+
 #endif /* MBEDTLS_CONFIG_H */

application/src/luat_base_air105.c

@@ -206,6 +206,7 @@ static const luaL_Reg loadedlibs[] = {
   {"w5500", luaopen_w5500},
   {"network", luaopen_network_adapter},
   {"mqtt", luaopen_mqtt},
+  {"http2", luaopen_http2},
 #endif
 // #ifdef LUAT_USE_FOTA
   {"fota", luaopen_fota},
@@ -221,6 +222,9 @@ static const luaL_Reg loadedlibs[] = {
 #endif
 #ifdef LUAT_USE_MINIZ
   {"miniz", luaopen_miniz},
+#endif
+#ifdef LUAT_USE_IOTAUTH
+  {"iotauth", luaopen_iotauth},
 #endif
   {"usbapp", luaopen_usbapp},
   {"audio", luaopen_multimedia_audio},
@@ -249,6 +253,10 @@ void luat_os_reboot(int code) {
 	SystemReset();
 }
 
+uint32_t luat_poweron_reason(void){
+  return 0;
+}
+
 const char* luat_os_bsp(void) {
     return "AIR105";
 }

bsp/air105/hal/core_debug.c

@@ -366,7 +366,7 @@ void DBG_HexPrintf(void *Data, unsigned int len)
 void DBG_Printf(const char* format, ...)
 {
 	char *buf = NULL;
-	char isr_buf[256];
+	char isr_buf[128];
 	int len;
 	va_list ap;
 	if (!prvDBGCtrl.AppMode) return;
@@ -374,7 +374,7 @@ void DBG_Printf(const char* format, ...)
 	if (OS_CheckInIrq())
 	{
 		buf = isr_buf;
-		len = vsnprintf_(buf, 255, format, ap);
+		len = vsnprintf_(buf, 127, format, ap);
 	}
 	else
 	{

xmake.lua

@@ -58,6 +58,7 @@ add_defines("__AIR105_BSP__","__USE_XTL__","CMB_CPU_PLATFORM_TYPE=CMB_CPU_ARM_CO
 add_defines("__FLASH_OTA_INFO_ADDR__=0x0100F000")
 add_defines("_7ZIP_ST")
 add_defines("MBEDTLS_CONFIG_FILE=\"mbedtls_config.h\"")
+
 -- set warning all as error
 set_warnings("allextra")
 -- set_optimize("smallest")
@@ -132,14 +133,14 @@ target("lvgl")
     set_kind("static")
     add_defines("__BUILD_APP__","__BUILD_OS__","CMB_USING_OS_PLATFORM","CMB_OS_PLATFORM_TYPE=CMB_OS_PLATFORM_FREERTOS",luatos_define)
     on_load(function (target)
-        local conf_data = io.readfile("$(projectdir)/application/include/luat_conf_bsp.h")
+        local conf_data = io.readfile("$(projectdir)/application/air105/include/luat_conf_bsp.h")
         local LVGL_CONF = conf_data:find("// #define LUAT_USE_LVGL\n")
         if LVGL_CONF == nil then target:set("default", true) else target:set("default", false) end
     end)
 
     add_files(luatos.."components/lvgl/**.c")
 
-    add_includedirs("application/include")
+    add_includedirs("application/air105/include")
     add_includedirs("bsp/air105/include",{public = true})
     add_includedirs("bsp/usb/include",{public = true})
     --add_includedirs("bsp/common",{public = true})
@@ -167,7 +168,7 @@ target("miniz")
     set_arch("c-sky")
 
     add_files(luatos.."components/miniz/*.c")
-    add_includedirs("application/include")
+    add_includedirs("application/air105/include")
     add_includedirs("bsp/air105/include",{public = true})
     add_includedirs(luatos.."lua/include")
     add_includedirs(luatos.."luat/include")
@@ -208,17 +209,16 @@ target("app.elf")
     set_kind("binary")
     set_targetdir("$(buildir)/out")
     add_defines("__BUILD_APP__","__BUILD_OS__","CMB_USING_OS_PLATFORM","CMB_OS_PLATFORM_TYPE=CMB_OS_PLATFORM_FREERTOS",luatos_define)
-
 if with_luatos then
     on_load(function (target)
-        local conf_data = io.readfile("$(projectdir)/application/include/luat_conf_bsp.h")
+        local conf_data = io.readfile("$(projectdir)/application/air105/include/luat_conf_bsp.h")
         AIR105_VERSION = conf_data:match("#define LUAT_BSP_VERSION \"(%w+)\"")
         local LVGL_CONF = conf_data:find("// #define LUAT_USE_LVGL\n")
         if LVGL_CONF == nil then target:add("deps", "lvgl") end
         target:add("deps", "miniz")
     end)
 
-    --add_deps("tflm")
+    -- add_deps("tflm")
 end
 
     -- add deps
@@ -269,10 +269,11 @@ end
     add_includedirs("bsp/air105/include",{public = true})
 
 if with_luatos then
-    add_files("application/src/*.c")
+    add_files("application/air105/src/*.c")
 
     add_files(luatos.."lua/src/*.c")
     add_files(luatos.."luat/modules/*.c")
+    remove_files(luatos.."luat/modules/luat_lib_http.c")
     add_files(luatos.."luat/vfs/*.c")
     remove_files(luatos.."luat/vfs/luat_fs_posix.c")
     add_files(luatos.."components/common/*.c")
@@ -294,7 +295,7 @@ if with_luatos then
     add_files(luatos.."components/coremark/*.c")
     add_files(luatos.."components/cjson/*.c")
     
-    add_includedirs("application/include",{public = true})
+    add_includedirs("application/air105/include",{public = true})
     add_includedirs(luatos.."lua/include",{public = true})
     add_includedirs(luatos.."luat/include",{public = true})
     add_includedirs(luatos.."components/common",{public = true})
@@ -373,10 +374,17 @@ if with_luatos then
     add_includedirs(luatos.."components/network/libemqtt",{public = true})
     add_files(luatos.."components/network/libemqtt/*.c")
 
+    -- http
+    add_includedirs(luatos.."components/network/libhttp",{public = true})
+    add_files(luatos.."components/network/libhttp/luat_lib_http.c")
+
+    -- iotauth
+    add_files(luatos.."components/iotauth/luat_lib_iotauth.c")
+
     -- qrcode
     add_includedirs(luatos.."components/qrcode",{public = true})
     add_files(luatos.."components/qrcode/*.c")
-    
+
     -- lora
     add_includedirs(luatos.."components/lora",{public = true})
     add_files(luatos.."components/lora/**.c")
@@ -384,8 +392,7 @@ if with_luatos then
     -- fonts
     add_includedirs(luatos.."components/luatfonts",{public = true})
     add_files(luatos.."components/luatfonts/**.c")
-    add_includedirs(luatos.."components/lvgl/src/lv_font",{public = true})
-    
+
     -- crypto
     add_files(luatos.."components/crypto/**.c")
 else