소스 검색

固定长度上库

yidong.fan 1 개월 전
부모
커밋
3486f9da60

+ 3 - 4
WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/Uart.c

@@ -23,7 +23,6 @@ void Van_Device_Printf(unsigned int printLevel, const char *cmd, ...)
 {
 	char buf[128] = {};
 	int	 buflen			 = 0;
-
 	if (gloublePrintLevel >= printLevel)
 	{
 		va_list args; //定义一个va_list类型的变量,用来储存单个参数
@@ -1055,7 +1054,7 @@ void Uart1_Ack(void)
             memset( uiAD_Max,0,16*sizeof(unsigned int));
             
             while(DMA1CONbits.CHEN);
-            DMA1CNT=(ucBuffer_Data[1]>>8)-1;
+            DMA1CNT=(ZLENTH1)-1;
             DMA1CONbits.CHEN=1;
             DMA1REQbits.FORCE =1;
             
@@ -1606,7 +1605,7 @@ void Uart1_Ack(void)
             g_ucU1RX_Data[3] +=ucBuffer_Data[1]&0xff;
             ucBuffer_Data[GlobalNum1+2]=(g_ucU1RX_Data[3]<<8);//低位先发送,错误       
             while(DMA1CONbits.CHEN);
-            DMA1CNT=(ucBuffer_Data[1]>>8)-1;
+            DMA1CNT=(ZLENTH2)-1;
             DMA1CONbits.CHEN  = 1;
             DMA1REQbits.FORCE = 1;
             
@@ -1668,7 +1667,7 @@ void Uart1_Ack(void)
             ucBuffer_Data[GlobalNum1+2]=(g_ucU1RX_Data[3]<<8);
            
             while(DMA1CONbits.CHEN);
-            DMA1CNT=(ucBuffer_Data[1]>>8)-1;
+            DMA1CNT=(ZLENTH2)-1;
             DMA1CONbits.CHEN  = 1;                                           
             DMA1REQbits.FORCE = 1;
             

+ 1 - 2
WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/Uart.h

@@ -156,8 +156,7 @@ EXTERN_UART unsigned int PID_OVERTIME,PID_OVERTEMPUP,PID_OVERTEMPDOWN;
 EXTERN_UART unsigned int FRN;
 
 EXTERN_UART unsigned int Alldata_Max[2000];
-
-EXTERN_UART unsigned char g_ucU1TX_Data[500] __attribute__((eds));
+EXTERN_UART unsigned char g_ucU1TX_Data[500] ;
 EXTERN_UART unsigned int ucBuffer_Data[7000] __attribute__((eds));
 EXTERN_UART unsigned char g_ucU3TX_Data[128] __attribute__((eds));
 EXTERN_UART unsigned char g_ucU3TX_buf[128];

+ 0 - 3
WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/nbproject/private/private.xml

@@ -4,10 +4,7 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
             <file>file:/F:/library/source/WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/Uart.c</file>
-            <file>file:/F:/library/source/WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/Delay.c</file>
-            <file>file:/F:/library/source/WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/DS1802.c</file>
             <file>file:/F:/library/source/WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/main.c</file>
-            <file>file:/F:/library/source/WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/EEPROM.c</file>
         </group>
     </open-files>
 </project-private>