Browse Source

DC新程序控制板,增加开关检测

liyi 1 year ago
parent
commit
b4cb62b51c

+ 2 - 2
truing_control/PDU-DC_ADA/hardware/detection/detection.c

@@ -260,7 +260,7 @@ static void detection_opt(void)
 					{
 						for(uint8_t k = 0; k < PT_SUB_COUNT;k++)
 						{
-							board->handle_status[k] = board->md_data.r_data.state.state[k].state;
+							board->handle_status[k] = (board->md_data.r_data.rl_status & (1 << k));
 							async_data da = {0};
 							da.channel =k;
 							da.fire_or_zero = _FIRE;
@@ -297,7 +297,7 @@ static void detection_opt(void)
 					{
 						for(uint8_t k = PT_SUB_COUNT; k < RelaySlaveChaNum;k++)
 						{
-							board->handle_status[k] = board->md_data.r_data.state.state[k].state;
+							board->handle_status[k] = (board->md_data.r_data.rl_status & (1 << k));
 							async_data da = {0};
 							da.channel =k;
 							da.fire_or_zero = _FIRE;

File diff suppressed because it is too large
+ 202 - 184
truing_control/PDU-DC_ADA/prj/ctrl_board.uvguix.Gowon


+ 2 - 2
truing_control/PDU-DC_ADA/prj/ctrl_board.uvprojx

@@ -49,11 +49,11 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>ctrl_board_new_5</OutputName>
+          <OutputName>ctrl_board_DC</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
+          <DebugInformation>0</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
           <ListingPath>.\Listings\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>

+ 2 - 1
truing_control/PDU-DC_ADA/user/board_cfg.h

@@ -61,9 +61,10 @@
 #elif DC_NEW_8
 	#define 	RelaySlaveChaNum 					8
 	#define   PT_SUB_COUNT              4
-	#define 	SUPPORT_DETECTION					0
+	#define 	SUPPORT_DETECTION					1
 	#define   SURPPORT_2_PT             1
 	#define 	SUPPORT_STM32_ADC					1
+	#define   SUPPORT_RELAY_REMENBER    1
 	#define   ACSingCurrid              7
 #endif
 

+ 3 - 2
truing_control/PDU-DC_ADA/user/main.c

@@ -60,11 +60,12 @@ int main(){
 	time_init();
 	query_init();
 	key_init();
+	
 	//device
 	init_adc_parameter();
 	
 	
-	//fwdgt_Init();
+	fwdgt_Init();
 	eMBInit(MB_RTU, ac_board.haddr, 0, 115200, MB_PAR_NONE);
 	eMBEnable();
 	
@@ -114,7 +115,7 @@ int main(){
 		{
 			eMBEnable();
 		}
-		//ac_board.feed_dog();
+		ac_board.feed_dog();
 		task_query();
 		task_100ms();
 		task_1s();