浏览代码

PCR 打印调试通过上库

yidong.fan 4 月之前
父节点
当前提交
7c82c7c6f4

+ 2 - 2
WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/EEPROM.c

@@ -332,12 +332,12 @@ void Read_Sys_EE_05(void){
         if(g_tEE.CutUart == 0){
          _RP97R  = 0x01;
          _U1RXR  = 0x60; 	
-		 _RP65R	= 0x1b;
+		 _RP113R	= 0x1b;
     	 _U3RXR  = 0x70; 
 	    	 STU2 = 1;
         }
         else if(g_tEE.CutUart == 1){
-         _RP65R  = 0x01; 
+         _RP113R  = 0x01; 
          _U1RXR  = 0x70; 	
 		 _RP97R	= 0x1b;
     	 _U3RXR  = 0x60; 	

+ 5 - 5
WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/PIN.c

@@ -26,16 +26,16 @@ void PIN_Initialize(void){
     _TRISA4 = 0;   
     _TRISA5 = 0;  
     
-    _TRISD1 = 0;         
+    _TRISG1 = 0;         
     _TRISF1 = 0;
     _TRISF0 = 1;
     _TRISG0 = 1;  
 	
-    _RP97R  = 0x01; 
-    _U1RXR  = 0x60;  
+    _RP97R  = 0x1b; 
+    _U1RXR  = 0x70;  
 	
-	_RP65R	= 0x1b;
-    _U3RXR  = 0x70; 
+	_RP113R	= 0x01;
+    _U3RXR  = 0x60; 
     
 
     _TRISK11 = 0;     //SCL

+ 39 - 1
WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/Uart.c

@@ -286,6 +286,44 @@ void RS1_Ack(unsigned int sendnum)
 	}
     memset(g_ucU1TX_Data,0,sendnum*sizeof(unsigned char));
 }
+
+
+
+
+/****************************************************************
+* 函数名:    Van_Device_Printf
+* 创建时间:  2021/04/22
+* 创建人:    范义东
+* 函数说明:调试打印接口函数
+* 输入参数:   dev  传 NULL 采用本地定义
+						devNum   数码
+* 输出参数:   *name
+* 返回值 :   void
+****************************************************************/
+void Van_Device_Printf_uart1(unsigned int printLevel, const char *cmd, ...)
+{
+	char buf[128] = {};
+	int	 buflen			 = 0;
+
+	if (gloublePrintLevel >= printLevel)
+	{
+		va_list args; //定义一个va_list类型的变量,用来储存单个参数
+		va_start(args, cmd);	  //使args指向可变参数的第一个参数
+		vsprintf(buf, cmd, args); //必须用vprintf等带V的
+		va_end(args);			  //结束可变参数的获取
+		buflen = strlen((const char *)buf);
+		for(unsigned int i=0; i<buflen; i++){
+			g_ucU1TX_Data[i] = buf[i];
+		} 
+	    if(buflen==0)return;
+            while(DMA3CONbits.CHEN);        
+            DMA3CNT=(buflen-1);
+            DMA3CONbits.CHEN  = 1;		
+            DMA3REQbits.FORCE = 1;		
+	}
+	return;
+}
+
 /*******************************************************************************
  * 函数名称:Uart1_Ack
  *******************************************************************************/
@@ -1969,4 +2007,4 @@ void my_send_char(char ch){
 //
 //    
 //    return ret_num;
-//}
+//}

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

@@ -187,6 +187,8 @@ void UART1SEND(char data);
 unsigned int Check(unsigned char *p,unsigned char num);
 void Uart1_Ack(void);
 void Van_Device_Printf(unsigned int printLevel, const char *cmd, ...);
+void Van_Device_Printf_uart1(unsigned int printLevel, const char *cmd, ...);
+
 
 #endif	/* XC_HEADER_TEMPLATE_H */
 

+ 4 - 0
WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/main.c

@@ -136,6 +136,10 @@ int main(void) {
 		
         if(printtempFlag == 1){  
             printtempFlag = 0;   
+//			 Van_Device_Printf_uart1(2,"temp %f, %f, %f, %f, %f, %f\n\r",
+//			TempChn[0].fCurrentTemperature,TempChn[1].fCurrentTemperature,
+//			TempChn[2].fCurrentTemperature,TempChn[3].fCurrentTemperature,
+//			TempChn[4].fCurrentTemperature,TempChn[5].fCurrentTemperature);
 			 Van_Device_Printf(2,"temp %f, %f, %f, %f, %f, %f\n\r",
 			TempChn[0].fCurrentTemperature,TempChn[1].fCurrentTemperature,
 			TempChn[2].fCurrentTemperature,TempChn[3].fCurrentTemperature,

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

@@ -5,7 +5,9 @@
         <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>

+ 1 - 1
WZYX_UART_V1.1250726.X/WZYX_UART_V1.1250726.X/main.c

@@ -254,7 +254,7 @@ void __attribute__((interrupt, auto_psv)) _T1Interrupt(void) {
 int main(void){
 //    InitOsc();
 	unsigned char data;
-	unsigned char uartDebugflag = 1;
+	unsigned char uartDebugflag = 0;
     Pin_Init();
     LATBbits.LATB9 = 0;
     Delay_ms(3000);

+ 1 - 4
WZYX_UART_V1.1250726.X/WZYX_UART_V1.1250726.X/nbproject/private/private.xml

@@ -5,9 +5,6 @@
         <group name="source">
             <file>file:/F:/library/source/WZYX_UART_V1.1250726.X/WZYX_UART_V1.1250726.X/Pin.c</file>
         </group>
-        <group>
-            <file>file:/F:/library/source/WZYX_UART_V1.1250726.X/WZYX_UART_V1.1250726.X/main.c</file>
-            <file>file:/F:/library/source/WZYX_UART_V1.1250726.X/WZYX_UART_V1.1250726.X/Uart.c</file>
-        </group>
+        <group/>
     </open-files>
 </project-private>