Procházet zdrojové kódy

直流板增加6路板,7路板,磁保持处理第一通道数据异常问题。

liyi před 1 rokem
rodič
revize
8801339c42

+ 13 - 2
control/PDU-DC_UPGRADE/App/Main/board_cnf.h

@@ -10,8 +10,9 @@
 #define 								PRJ_ADC_V_DC_8														0
 #define                 PRJ_ADC_V_DC_7_1                          0
 #define                 PRJ_ADC_V_DC_4_4                          0
-#define                 PRJ_ADC_V_DC_NEW_8                        1
-
+#define                 PRJ_ADC_V_DC_NEW_8                        0
+#define                 PRJ_ADC_V_DC_NEW_7                        0
+#define                 PRJ_ADC_V_DC_NEW_6                        1
 #if   PRJ_BASE_DC_8
 	#define RELAY_ChN_default             		8
 	#define SUPPORT_IM1253E										1
@@ -39,6 +40,16 @@
 	#define SURPPOT_ALL_ON_ALL_OFF          	1
 	#define SUPPORT_DETECTION               	1
 	#define SUPPORT_STM32_ADC                 1
+#elif    PRJ_ADC_V_DC_NEW_7
+	#define RELAY_ChN_default             		7
+	#define SURPPOT_ALL_ON_ALL_OFF          	1
+	#define SUPPORT_DETECTION               	1
+	#define SUPPORT_STM32_ADC                 1
+#elif    PRJ_ADC_V_DC_NEW_6
+	#define RELAY_ChN_default             		6
+	#define SURPPOT_ALL_ON_ALL_OFF          	1
+	#define SUPPORT_DETECTION               	1
+	#define SUPPORT_STM32_ADC                 1
 #endif
 
 

+ 0 - 3
truing_control/PDU-Magnetic-Retention-AC/hardware/Flash/Flash.h

@@ -9,9 +9,6 @@
 
 #define MD5_LENTH       										8
 
-#define UNIQU_1                       			0x1FFFF7AC
-#define UNIQU_2                       			0x1FFFF7B0
-#define UNIQU_3                       			0x1FFFF7B4
 
 
 

+ 4 - 3
truing_control/PDU-Magnetic-Retention-AC/usr/cfg.h

@@ -52,9 +52,10 @@
 
 
 
-#define UNIQU_1                       			0x1FFFF7AC
-#define UNIQU_2                       			0x1FFFF7B0
-#define UNIQU_3                       			0x1FFFF7B4
+#define UNIQU_1                       			0x1FFFF7E8
+#define UNIQU_2                       			0x1FFFF7EC
+#define UNIQU_3                       			0x1FFFF7F0
+
 
 
 typedef struct {

+ 4 - 3
truing_control/PDU-Magnetic-Retention-AC/usr/main.c

@@ -697,7 +697,8 @@ static  void  InitHardware(void)
 #endif
 	ReadEeprom();
 	channel = 0;
-	
+	select_channel(channel);
+	Init_HLW8110();	
 	while(1)						
 	{
 		select_channel(channel);
@@ -801,7 +802,7 @@ int main(void)
 	nvic_priority_group_set(NVIC_PRIGROUP_PRE0_SUB4);
   systick_config();
 	InitHardware(); 
-//	Fwdgt_Init();	
+	Fwdgt_Init();	
     
   while(1)
   {
@@ -809,7 +810,7 @@ int main(void)
 		Proc100msTask();		
 		check_channel_reset();
     Proc1SecTask(); 			  
-//		Fwdgt_reload();
+		Fwdgt_reload();
 		switch_recode();
 		
 #if SUPPORT_ALL_ON_OFF