Procházet zdrojové kódy

Merge branch 'master' of https://gowone.dy.takin.cc/liyuezong/SmartPDCode

liyuezong před 1 rokem
rodič
revize
373407b734

+ 9 - 0
truing_control/PDU-AC_ADA_NEW_6/hardware/hlw8110/Hlw8110.c

@@ -12,6 +12,7 @@
 #include "SysTick.h"
 #include "uart.h"
 #include "Timer.h"
+#include "mb.h"
 #if HLW8110
 
 #define HIGH	1
@@ -522,6 +523,7 @@ void Read_HLW8110_IA(void)
 		{
 			break;
 		}
+		eMBPoll();
 		DelayNms(2);
 	}
 	if ( u8_RxBuf[u8_RX_Length-1] == HLW8110_checkSum_Read(u8_RX_Length) )
@@ -566,6 +568,7 @@ void Read_HLW8110_U(void)
 		{
 			break;
 		}
+		eMBPoll();
 		DelayNms(2);
 	}
 	
@@ -614,6 +617,7 @@ void Read_HLW8110_PA(void)
 		{
 			break;
 		}
+		eMBPoll();
 		DelayNms(2);
 	}
 	//DelayNms(10);
@@ -663,6 +667,7 @@ void Read_HLW8110_EA(void)
 		{
 			break;
 		}
+		eMBPoll();
 		DelayNms(2);
 	}
 	//DelayNms(10);
@@ -717,7 +722,9 @@ void Read_HLW8110_LineFreq(void)
 		{
 			break;
 		}
+		eMBPoll();
 		DelayNms(2);
+		
 	}
 	//DelayNms(10);
 	if ( u8_RxBuf[u8_RX_Length-1] == HLW8110_checkSum_Read(u8_RX_Length) )
@@ -757,6 +764,7 @@ void Read_HLW8110_PF(void)
 		{
 			break;
 		}
+		eMBPoll();
 		DelayNms(2);
 	}
 	//DelayNms(10);
@@ -801,6 +809,7 @@ void Read_HLW8110_Angle(void)
 		{
 			break;
 		}
+		eMBPoll();
 		DelayNms(2);
 	}
 	//DelayNms(10);

+ 2 - 1
truing_control/PDU-AC_ADA_NEW_6/user/main.c

@@ -188,11 +188,12 @@ static void task_10s(void)
 				ac_board.write_eeprom_page(EEPROM_CONSUMER_ADDR +(CONSUM_PAGE*i),(uint8_t *)&chache1,CONSUM_PAGE);
 			ac_board.con_da.row = 0;
 		}
+		eMBPoll();
 		ac_board.con_da.iic_da.iic_con.recode_index1 = ac_board.con_da.index;
 		ac_board.write_eeprom_page(EEPROM_CONSUMER_ADDR+(CONSUM_PAGE*ac_board.con_da.row),(uint8_t*)&ac_board.con_da.iic_da.iic_con,CONSUM_PAGE);
 		ac_board.con_da.index++;
 		ac_board.con_da.row++;
-
+		eMBPoll();
 	}
 }
 //static void app_init(META_DATA_S *meta)