Browse Source

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

alienwalker 11 tháng trước cách đây
mục cha
commit
2b0f806594

+ 1 - 1
components/airlink/src/task/luat_airlink_spi_master_task.c

@@ -193,7 +193,7 @@ __USER_FUNC_IN_RAM__ static void spi_master_task(void *param)
         }
         // slave_rdy = 0;
         luat_gpio_set(TEST_CS_PIN, 0);
-        for (size_t i = 0; i < 5; i++)
+        for (size_t i = 0; i < 1000; i++)
         {
             tmpval = luat_gpio_get(TEST_RDY_PIN);
             if (tmpval == 1) {

+ 7 - 5
components/airlink/src/task/luat_airlink_task.c

@@ -17,11 +17,13 @@ extern int luat_airlink_cmd_exec_ip_pkg(luat_airlink_cmd_t* cmd, void* userdata)
 
 __USER_FUNC_IN_RAM__ void luat_airlink_on_data_recv(uint8_t *data, size_t len) {
     luat_airlink_cmd_t* cmd = (luat_airlink_cmd_t*)data;
-    // if (cmd->cmd == 0x100) {
-    //     // IP数据直接处理,不走线程
-    //     luat_airlink_cmd_exec_ip_pkg(cmd, NULL);
-    //     return;
-    // }
+    #ifdef __BK72XX__
+    if (cmd->cmd == 0x100) {
+        // IP数据直接处理,不走线程
+        luat_airlink_cmd_exec_ip_pkg(cmd, NULL);
+        return;
+    }
+    #endif
     void* ptr = luat_heap_opt_malloc(AIRLINK_MEM_TYPE, len);
     if (ptr == NULL) {
         LLOGE("airlink分配内存失败!!! %d", len);

+ 2 - 0
luat/include/luat_libs.h

@@ -210,4 +210,6 @@ LUAMOD_API int luaopen_airlink( lua_State *L );
 // 充电芯片
 LUAMOD_API int luaopen_yhm27xx( lua_State *L );
 
+LUAMOD_API int luaopen_vtool( lua_State *L );
+
 #endif

+ 1 - 1
script/libs/iotcloud.lua

@@ -382,7 +382,7 @@ end
 local function iotcloud_onenet_autoenrol(iotcloudc)
     local version = '2022-05-01'
     local res = "userid/"..iotcloudc.userid
-    local et = '32472115200'
+    local et = '2051193600'
     local method = 'SHA256'
     local key = crypto.base64_decode(iotcloudc.userkey)
     local StringForSignature  = et .. '\n' .. method .. '\n' .. res ..'\n' .. version