Ver Fonte

修改: qu16、qs16、qu08、qs08数据类型为int,以适配点表文件中对应数据类型的偏移是按32位的。

(cherry picked from commit c46f78f46bd8a1ee475bbfbeeb9489ccb145a1e0)

# Conflicts:
#	README.md
EWen há 7 meses atrás
pai
commit
1e4324dba1

+ 2 - 1
README.md

@@ -45,4 +45,5 @@
 01. 修改 : 网口的个数和对应的定值;
    
 # 202512(15-21)
-01. 修改 : 南网定值;
+01. 修改 : 南网定值;
+02. 修改: qu16、qs16、qu08、qs08数据类型为int,以适配点表文件中对应数据类型的偏移是按32位的。

+ 2 - 0
app_public/fuxi_public/fuxi_bsp/source/flexcan.c

@@ -668,6 +668,8 @@ int can_exit(void)
 	rt_free_irq(CFG_CAN_VECTOR_BEGIN + 5);
 	rt_free_irq(CFG_CAN_VECTOR_BEGIN + 7);
 
+	pthread_mutex_destroy(&printf_mutex);
+	
 	return 0;
 }
 

+ 4 - 4
app_public/fuxi_public/rt_lite/include/rt_types.h

@@ -49,13 +49,13 @@ typedef signed long long	s64;
 //#endif //__KERNEL__
 
 //Q16定点数,小数点在bit16后
-typedef unsigned long 		qu16;
-typedef signed long			qs16;
+typedef unsigned int 		qu16;
+typedef signed int			qs16;
 #define Q16_BASE			(65536)
 
 //Q08定点数,小数点在bit8后
-typedef unsigned long 		qu08;
-typedef signed long			qs08;
+typedef unsigned int 		qu08;
+typedef signed int			qs08;
 #define Q08_BASE			(256)
 
 //短整型复数的实部虚部对