Просмотр исходного кода

处理,老8路可能得耗电量读不到的问题。

liyi 1 год назад
Родитель
Сommit
cfd9e4340b

+ 55 - 3
truing_control/PDU-AC_ADA_OLD8/hardware/hlw8110/Hlw8110.c

@@ -208,6 +208,8 @@ void Uart_Read_HLW8110_Reg(unsigned char ADDR_Reg,unsigned char u8_reg_length)
 	
 	
 	Clear_RxBuf();										//清空接收缓冲区
+	Awaken_Hlw8110();
+	DelayNms(2);
 	Start_Send_UartData(u8_TX_Length);
 }
 
@@ -372,7 +374,7 @@ void Init_HLW8110(void)
 
 	
 //电流通道A设置命令,指定当前用于计算视在功率、功率因数、相角、瞬时有功功率、瞬时视在功率和有功功率过载的信号指示 的通道为通道A	
-	for(int i = 0 ; i < 3 ;i++)
+	for(int i = 0 ; i < 50 ;i++)
 	{
 		Uart_HLW8110_WriteREG_EN();
 		DelayNms(10);
@@ -384,6 +386,7 @@ void Init_HLW8110(void)
 
 		Uart_Write_HLW8110_Reg(REG_EMUCON_ADDR,2,0x0001);	//1,使能PFA 脉冲输出和有功电能寄存器累加;
 //	Uart_Write_HLW8110_Reg(REG_EMUCON_ADDR,2,0x0018);	//正向和负向过零点均发生变化,ZXD0 = 1,ZXD1 = 1
+		DelayNms(10);
 		Uart_Write_HLW8110_Reg(REG_EMUCON2_ADDR,2,0x0065);	//0x0001是EMUCON2的默认值,waveEn = 1,zxEn = 1,A通道电量寄存器,读后不清0,EPA_CB = 1;打开功率因素检测
 		DelayNms(10);
 
@@ -393,7 +396,7 @@ void Init_HLW8110(void)
 		Check_WriteReg_Success();
 		if (B_Read_Error == 1)
 		{
-			DelayNms(50);
+			DelayNms(100);
 		}else
 		{
 			break;
@@ -425,6 +428,24 @@ void Init_HLW8110(void)
 }
 
 
+uint8_t Check_WriteReg_Sucess_Addr(uint8_t addr,uint8_t readlen, uint16_t value)
+{
+	B_Read_Error = 1;
+	Uart_Read_HLW8110_Reg(addr,readlen);
+	DelayNms(10);
+	uint16_t data = 0;
+	if (u8_RxBuf[u8_RX_Length-1] == HLW8110_checkSum_Read(u8_RX_Length))
+	{
+		data = (u8_RxBuf[0]<<8) + (u8_RxBuf[1]);
+		if(data != value)
+		{
+			B_Read_Error = 0;
+		}
+	}
+	return B_Read_Error;
+}
+
+
 void Check_WriteReg_Success(void)
 {
 	Uart_Read_HLW8110_Reg(REG_SYSCON_ADDR,2);
@@ -433,6 +454,13 @@ void Check_WriteReg_Success(void)
 	{
 		U16_Check_SysconReg_Data =  (u8_RxBuf[0]<<8) + (u8_RxBuf[1]); 
 //		printf("写入的SysconReg寄存器:%lx\n " ,U16_Check_SysconReg_Data);
+		if(U16_Check_SysconReg_Data == 0x0a04)
+		{
+		}else
+		{
+			B_Read_Error = 1;
+		}
+		
 	}
 	else
 	{
@@ -446,6 +474,13 @@ void Check_WriteReg_Success(void)
 	{
 		U16_Check_EmuconReg_Data =  (u8_RxBuf[0]<<8) + (u8_RxBuf[1]); 
 //		printf("写入的EmuconReg寄存器:%lx\n " ,U16_Check_EmuconReg_Data);
+		
+		if(U16_Check_EmuconReg_Data == 0x0001)
+		{
+		}else
+		{
+			B_Read_Error = 1;
+		}
 	}
 	else
 	{
@@ -460,6 +495,12 @@ void Check_WriteReg_Success(void)
 	{
 		U16_Check_Emucon2Reg_Data =  (u8_RxBuf[0]<<8) + (u8_RxBuf[1]); 
 //		printf("写入的Emucon2Reg寄存器寄存器:%lx\n " ,U16_Check_Emucon2Reg_Data);
+		if(U16_Check_Emucon2Reg_Data == 0x0065)
+		{
+		}else
+		{
+			B_Read_Error = 1;
+		}
 	}
 	else
 	{
@@ -474,7 +515,15 @@ void Read_HLW8110_IA(void)
 	float a;
 	
 	Uart_Read_HLW8110_Reg(REG_RMSIA_ADDR,3);
-	DelayNms(10);
+	//DelayNms(10);
+	for(uint8_t i = 0;i < 5;i++)
+	{
+		if(B_Rx_Finish == TRUE)
+		{
+			break;
+		}
+		DelayNms(2);
+	}
 	if ( u8_RxBuf[u8_RX_Length-1] == HLW8110_checkSum_Read(u8_RX_Length) )
 	{
 		U32_RMSIA_RegData = (unsigned long)(u8_RxBuf[0]<<16) + (unsigned long)(u8_RxBuf[1]<<8) + (unsigned long)(u8_RxBuf[2]); 
@@ -686,6 +735,9 @@ void Read_HLW8110_LineFreq(void)
 		a = (float)b;
 		a = 3579545/(8*a);    
 		F_AC_LINE_Freq = a;
+	}else
+	{
+		F_AC_LINE_Freq = 0;
 	}
 }
 

+ 6 - 0
truing_control/PDU-AC_ADA_OLD8/hardware/uart/uart.c

@@ -93,9 +93,15 @@ void USART1_IRQHandler(void)
 }
 
 
+void Awaken_Hlw8110()
+{
+	usart_data_transmit(USART1, 0x55); 
+}
+
 void Start_Send_UartData(unsigned char len)
 {
 	unsigned int i;
+	
 	for(i=0;i<len;i++)
 	{
 		usart_data_transmit(USART1, (uint8_t)u8_TxBuf[i]); 

+ 1 - 1
truing_control/PDU-AC_ADA_OLD8/hardware/uart/uart.h

@@ -15,7 +15,7 @@ void uart1_config(unsigned int bound);
 void Start_Send_UartData(unsigned char len);
 
 uint32_t read_voltage(uint8_t channel);
-
+void Awaken_Hlw8110(void);
 
 #endif