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

components/airlink/src/luat_airlink.c

@@ -29,6 +29,7 @@ luat_rtos_queue_t airlink_ippkg_queue;
 extern int luat_airlink_start_slave(void);
 extern int luat_airlink_start_master(void);
 extern void luat_airlink_start_uart(void);
+extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
 luat_airlink_newdata_notify_cb g_airlink_newdata_notify_cb;
 luat_airlink_spi_conf_t g_airlink_spi_conf;
 airlink_statistic_t g_airlink_statistic;
@@ -549,3 +550,9 @@ int luat_airlink_has_wifi(void) {
     }
     return 0;
 }
+
+uint32_t luat_airlink_sversion(void) {
+    uint32_t version = 0;
+    memcpy(&version, g_airlink_ext_dev_info.wifi.version, 4);
+    return version;
+}

components/drv/src/luat_drv_bluetooth.c

@@ -12,6 +12,10 @@
 #define LLOGD(...) 
 
 int luat_drv_bluetooth_init(luat_bluetooth_t* luat_bluetooth) {
+    if (luat_airlink_sversion() < 10) {
+        LLOGE("wifi fw version too low, need >= 10");
+        return -1;
+    }
     return luat_airlink_drv_bluetooth_init(luat_bluetooth);
 }
 

lua/src/lbaselib.c

@@ -47,7 +47,7 @@ static void luat_debug_print(int index, const char* str, size_t slen, int eof) {
     return;
   }
   if (index > 1) {
-    dbuff.buff[dbuff.offset++] = '\t';
+    dbuff.buff[dbuff.offset++] = ' ';
   }
   if (dbuff.offset + slen >= 512) {
     dbuff.buff[dbuff.offset] = 0x00;