Ver código fonte

新增5路板,增大栈使用至2K,缩减modbus缓存大小。

liyi 1 ano atrás
pai
commit
ed7758bab3

+ 2 - 2
truing_control/PDU_AC_OLD/ARM/System/startup_gd32e230.s

@@ -38,7 +38,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Stack_Size      EQU     0x00000400
+Stack_Size      EQU     0x00000800
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
 Stack_Mem       SPACE   Stack_Size
@@ -49,7 +49,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size       EQU     0x00000400
+Heap_Size       EQU     0x00000000
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base

+ 1 - 1
truing_control/PDU_AC_OLD/App/Main/Main.c

@@ -172,7 +172,7 @@ static void all_over_RelayState(void);
 void switch_recode();
 #if SUPPORT_SWITCH_REMENBER
 	bool handle_status[RelaySlaveChaNum] = {0};
-	#if ((RelaySlaveChaNum == 6) || (SUPPORT_2_DETECTION && RelaySlaveChaNum == 8))
+	#if ((RelaySlaveChaNum == 6) || (SUPPORT_2_DETECTION && RelaySlaveChaNum == 8) || (RelaySlaveChaNum == 5))
 			uint8_t handle_detection[2] = {1,1};
 			uint32_t input_1_ms_count = 0;
 			uint32_t input_2_ms_count = 0;

+ 9 - 1
truing_control/PDU_AC_OLD/App/Main/board_cfg.h

@@ -19,7 +19,8 @@
 #define   PRJ_7                     0
 #define   PRJ_3_ALL_O_ALL_C         0
 #define   PRJ_ONE_DE                0
-#define   PRJ_WANG_8                1
+#define   PRJ_WANG_8                0
+#define  	PRJ_5_BASE                1
 
 
 #if PRJ_4_BASE
@@ -46,6 +47,13 @@
 	#define   SUPPORT_DETECTION         1
 	#define 	ACSingCurrid 							1 
 	#define   PT_Sub_NUM                3
+#elif PRJ_5_BASE
+	#define 	RelaySlaveChaNum 					5
+	#define 	SUPPORT_2_DETECTION       2
+	#define 	SUPPORT_SWITCH_REMENBER		1
+	#define   SUPPORT_DETECTION         1
+	#define 	ACSingCurrid 							1 
+	#define   PT_Sub_NUM                3
 #elif PRJ_8_BASE
 	#define 	RelaySlaveChaNum 					8
 	#define   SUPPORT_FALLING_DETECTED  0

+ 1 - 1
truing_control/PDU_AC_OLD/App/Modbus/BARE/port/port.c

@@ -37,7 +37,7 @@
 
 //±£³Ö¼Ä´æÆ÷
 #define REG_HOLD_START   4000
-#define REG_HOLD_NREGS   1500
+#define REG_HOLD_NREGS   1300
 
 //ÏßȦ
 #define REG_COILS_START  0