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

luat/include/luat_pin.h

@@ -49,18 +49,21 @@ typedef struct
 	uint8_t altfun_id;	//复用功能id
 }luat_pin_iomux_info;	//pin复用信息
 
-typedef struct
+typedef union
 {
-	uint16_t peripheral_type:5;
-	uint16_t peripheral_id:4;
-	uint16_t function_id:4;
-	uint16_t pad:2;
-	uint16_t is_no_use:1;
-}luat_pin_peripheral_function_description_t;
+	struct
+	{
+		uint16_t function_id:4;
+		uint16_t peripheral_id:4;
+		uint16_t peripheral_type:5;
+		uint16_t is_no_use:1;
+	};
+	uint16_t code;
+}luat_pin_peripheral_function_description_u;
 
 typedef struct
 {
-	luat_pin_peripheral_function_description_t function[8];
+	uint16_t function_code[8];
 	uint16_t index;
 	uint8_t uid;
 }luat_pin_function_description_t;

luat/modules/luat_lib_pins.c

@@ -16,7 +16,7 @@
 #define LUAT_LOG_TAG "pins"
 #include "luat_log.h"
 
-static luat_pin_peripheral_function_description_t luat_pins_function_analyze(char *string)
+static uint16_t luat_pins_function_analyze(char *string)
 {
 	const char *peripheral_names[LUAT_MCU_PERIPHERAL_QTY] = {
 			"UART","I2C","SPI","PWM","CAN","GPIO","I2S","SDIO","LCD","CAMERA","ONEWIRE","KEYBORAD"
@@ -36,6 +36,7 @@ static luat_pin_peripheral_function_description_t luat_pins_function_analyze(cha
 	const char *function4_names[2] = {
 			"MCLK","CMD"
 	};
+	return 0xffff;
 }
 
 /**

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