直流bug问题。

truing_control/PDU-DC_ADA/hardware/adc/ADC.c

@@ -248,7 +248,7 @@ uint32_t DC_I_calfunction(uint16_t da,uint8_t channel)
 				temp_i /= 10;//去掉第3位小数
 				temp_i *= 10;
 				//temp_i += 70;
-				if(temp_i <= 200)
+				if(temp_i <= 50)
 							temp_i = 0;
 			}
 		}

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.rl_status & (1 << k));
+							board->handle_status[k] = (board->md_data.r_data.rl_status & (1 << k)) ? 1 : 0;
 							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.rl_status & (1 << k));
+							board->handle_status[k] = (board->md_data.r_data.rl_status & (1 << k)) ? 1 : 0;
 							async_data da = {0};
 							da.channel =k;
 							da.fire_or_zero = _FIRE;

truing_control/PDU-DC_ADA/hardware/electricity/electricity.c

@@ -207,15 +207,22 @@ static void read_vatage(void)
 			uint32_t voltage_chi_2 = 0;
 			voltage_chi_1 = read_stm_voltage(STM32_ADC_V_1) ;
 			//delay_ms(5);
+
 			voltage_chi_2 = read_stm_voltage(STM32_ADC_V_2) ;
 
 			board->md_data.r_data.input.voltage = voltage_chi_1 > voltage_chi_2 ? voltage_chi_1 : voltage_chi_2;
-			
-			for(int i = 0;i < RelaySlaveChaNum;i++)
+
+			for(int i = 0;i < PT_SUB_COUNT;i++)
 			{
-				board->md_data.r_data.output[i].voltage = board->md_data.r_data.input.voltage;
+				board->md_data.r_data.output[i].voltage = voltage_chi_1;
 			}
-
+#if SURPPORT_2_PT
+			for(int i = PT_SUB_COUNT;i < RelaySlaveChaNum;i++)
+			{
+				board->md_data.r_data.output[i].voltage = voltage_chi_2;
+			}			
+#endif
+			
 	#endif
 	
 #endif

truing_control/PDU-DC_ADA/user/board_cfg.h

@@ -50,7 +50,8 @@
 
 
 #define    DC_OLD_7										0
-#define    DC_NEW_8                   1
+#define    DC_NEW_8                   0
+#define    DC_NEW_4                   1
 
 
 #if DC_OLD_7
@@ -66,6 +67,13 @@
 	#define 	SUPPORT_STM32_ADC					1
 	#define   SUPPORT_RELAY_REMENBER    1
 	#define   ACSingCurrid              7
+#elif DC_NEW_4
+	#define 	RelaySlaveChaNum 					4
+	#define 	SUPPORT_DETECTION					1
+	#define   PT_SUB_COUNT              RelaySlaveChaNum
+	#define 	SUPPORT_STM32_ADC					1
+	#define   SUPPORT_RELAY_REMENBER    1
+	#define   ACSingCurrid              7
 #endif