Эх сурвалжийг харах

解决增加打印,导致应答结果计算错误问题

yidong.fan 8 сар өмнө
parent
commit
944c169c8d

+ 11 - 11
WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/DMA.c

@@ -34,17 +34,17 @@ void InitDMA(void)
     IFS0bits.DMA1IF = 1;
     IFS0bits.DMA1IF = 1;
 
 
 
 
-//	DMA2CON=0X6001;                           
-//    DMA2CNT=SHORT_DATA;                      
-//    DMA2REQ=0x53;                              
-//    DMA2PAD=(volatile unsigned int)&U3TXREG;   
-//    DMA2STAH=__builtin_dmapage(g_ucU3TX_Data);
-//    DMA2STAL=__builtin_dmaoffset(g_ucU3TX_Data);
-//    IFS1bits.DMA2IF = 0;                      
-//    IEC1bits.DMA2IE = 0;                       
-//    DMA2CONbits.CHEN= 0;                     
-//    IPC6bits. DMA2IP= 1;
-//    IFS1bits.DMA2IF = 1;
+	DMA2CON=0X6001;                           
+    DMA2CNT=SHORT_DATA;                      
+    DMA2REQ=0x53;                              
+    DMA2PAD=(volatile unsigned int)&U3TXREG;   
+    DMA2STAH=__builtin_dmapage(g_ucU3TX_Data);
+    DMA2STAL=__builtin_dmaoffset(g_ucU3TX_Data);
+    IFS1bits.DMA2IF = 0;                      
+    IEC1bits.DMA2IE = 0;                       
+    DMA2CONbits.CHEN= 0;                     
+    IPC6bits. DMA2IP= 1;
+    IFS1bits.DMA2IF = 1;
 
 
 }
 }
 ///*******************************************************************************
 ///*******************************************************************************

+ 3 - 0
WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/Interrupt.c

@@ -3,6 +3,8 @@
 unsigned char g_ucENABLE = 1;
 unsigned char g_ucENABLE = 1;
 unsigned int uiData_num = 0,uiData_buffer = 0;
 unsigned int uiData_num = 0,uiData_buffer = 0;
 
 
+unsigned int timecongter=0; 
+unsigned int printtempFlag=0; 
 
 
 /*******************************************************************************
 /*******************************************************************************
  * º¯ÊýÃû³Æ£ºInit_T3
  * º¯ÊýÃû³Æ£ºInit_T3
@@ -220,6 +222,7 @@ void __attribute__((interrupt,auto_psv)) _T6Interrupt (void)
     if(SampleNo > 2) {     //100ms
     if(SampleNo > 2) {     //100ms
         SampleNo=0;
         SampleNo=0;
         T4CONbits.TON=1;    //off the T4  for 1ms
         T4CONbits.TON=1;    //off the T4  for 1ms
+		printtempFlag = 1;	   
     }
     }
 
 
     
     

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

@@ -159,7 +159,7 @@ 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] __attribute__((eds));
 EXTERN_UART unsigned int ucBuffer_Data[7000] __attribute__((eds));
 EXTERN_UART unsigned int ucBuffer_Data[7000] __attribute__((eds));
-//EXTERN_UART unsigned char g_ucU3TX_Data[64] __attribute__((eds));
+EXTERN_UART unsigned char g_ucU3TX_Data[128] __attribute__((eds));
 EXTERN_UART unsigned int g_ucU3TX_Last;
 EXTERN_UART unsigned int g_ucU3TX_Last;
 
 
 EXTERN_UART unsigned long int uiEE_address;
 EXTERN_UART unsigned long int uiEE_address;

+ 41 - 54
WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/main.c

@@ -42,9 +42,8 @@
 #include "ABIS_User.h"
 #include "ABIS_User.h"
  unsigned char VersionNumber[16]="N01.20230823";//¹Ì¼þ°æ±¾ºÅ
  unsigned char VersionNumber[16]="N01.20230823";//¹Ì¼þ°æ±¾ºÅ
  unsigned char HardwareVersionNumber[16]="10062308022300802";//Ó²¼þ°æ±¾ºÅ
  unsigned char HardwareVersionNumber[16]="10062308022300802";//Ó²¼þ°æ±¾ºÅ
- 
- extern int my_printf(char* str, ...);
- int my_printfstr(char* str);
+ extern unsigned int printtempFlag;
+ extern int my_printf(const char* str, ...);
 int main(void) {   
 int main(void) {   
     unsigned int i;
     unsigned int i;
     unsigned int K;
     unsigned int K;
@@ -65,16 +64,7 @@ int main(void) {
     Write_DAC(DA_FAM);
     Write_DAC(DA_FAM);
     Delay_ms(10);
     Delay_ms(10);
     Write_DAC(DA_FAM);    
     Write_DAC(DA_FAM);    
-//    if(g_tEE.CutUart == 0){
-//     _RP97R  = 0x01; 
-//     _U1RXR  = 0x60;
-//    InitUart();     
-//    }
-//    else if(g_tEE.CutUart == 1){
-//     _RP97R  = 0x01;
-//     _U1RXR  = 0x70; 
-//    InitUart(); 
-//     }    
+  
     for(i=0;i<5;i++){
     for(i=0;i<5;i++){
         STU1 = ~STU1;
         STU1 = ~STU1;
         STU2 = ~STU2;
         STU2 = ~STU2;
@@ -83,56 +73,53 @@ int main(void) {
     POWER_STU1 = 1;                    
     POWER_STU1 = 1;                    
 
 
 
 
-//  my_printf("\n**********************************************************************\n\r");
-//  my_printf("*                         build %s %s                        *\n\r",__DATE__,__TIME__);
-//  my_printf("*                         ALPS - 004                                   *\n\r");
-//  my_printf("**********************************************************************\n\r");
+  my_printf("\n**********************************************************************\n\r");
+  my_printf("*                         build %s %s                        *\n\r",__DATE__,__TIME__);
+  my_printf("*                         ALPS - 004                                   *\n\r");
+  my_printf("**********************************************************************\n\r");
 
 
 
 
   
   
 
 
 
 
+    Init_T6();             
+    CalculateSModeLineX(g_uiMotorXPeriod, g_tEE.uiXPulseAcc, MOTORX_FREQMAX, MOTORX_FREQMIN, MOTORX_XFLEXIBLE);   
+    MotorXHome(g_tEE.uiXPulseHome,g_tEE.uiXSpeedHome,g_tEE.uiXSpeedLeave);
+    Delay_ms(500);
+    MotorXHome(g_tEE.uiXPulseHome,g_tEE.uiXSpeedHome,g_tEE.uiXSpeedLeave);
+    Delay_ms(500);
+    
+    MotorXScan(g_tEE.uiXPulseScan * 2, 1, g_tEE.uiXSpeedScan);
+    Delay_ms(500);
+    MotorXHome(g_tEE.uiXPulseHome,g_tEE.uiXSpeedHome,g_tEE.uiXSpeedLeave);
+    Delay_ms(500);
 
 
-//
-//    Init_T6();             
-//    CalculateSModeLineX(g_uiMotorXPeriod, g_tEE.uiXPulseAcc, MOTORX_FREQMAX, MOTORX_FREQMIN, MOTORX_XFLEXIBLE);   
-//    MotorXHome(g_tEE.uiXPulseHome,g_tEE.uiXSpeedHome,g_tEE.uiXSpeedLeave);
-//    Delay_ms(500);
-//    MotorXHome(g_tEE.uiXPulseHome,g_tEE.uiXSpeedHome,g_tEE.uiXSpeedLeave);
-//    Delay_ms(500);
-//    
-//    MotorXScan(g_tEE.uiXPulseScan * 2, 1, g_tEE.uiXSpeedScan);
-//    Delay_ms(500);
-//    MotorXHome(g_tEE.uiXPulseHome,g_tEE.uiXSpeedHome,g_tEE.uiXSpeedLeave);
-//    Delay_ms(500);
-//
-//    for (i = 0; i < 6; i++) {
-//        TempChn[i].cPeltierRun = 0; 
-//    }
-//    
-//    Alldata = 2;
-//    g_ucMPPCtemp = 0;
-//        
-//    CAPTarget_temp[0] = g_tEE.CAPTarget_temp[0];
-//    CAPTarget_temp[1] = g_tEE.CAPTarget_temp[1];     
-//    g_ucSTATE_RUN = 1;
-//    g_ucSTATE_CAP = 0;
-//    BTvar.ucStartbuffer = 0;
-//    BTvar.ucScanNum = 0;
-//	
-	my_printfstr("\n**********************************************************************\n\r");
-	my_printfstr("* 					 build	");
-	my_printfstr(__DATE__);
-	my_printfstr("*   ");
-	my_printfstr(__TIME__);
-	my_printfstr("	   *\n\r");
-	my_printfstr("* 					 ALPS - 004 								  *\n\r");
-	my_printfstr("**********************************************************************\n\r");
-
-	
+    for (i = 0; i < 6; i++) {
+        TempChn[i].cPeltierRun = 0; 
+    }
+    
+    Alldata = 2;
+    g_ucMPPCtemp = 0;
+        
+    CAPTarget_temp[0] = g_tEE.CAPTarget_temp[0];
+    CAPTarget_temp[1] = g_tEE.CAPTarget_temp[1];     
+    g_ucSTATE_RUN = 1;
+    g_ucSTATE_CAP = 0;
+    BTvar.ucStartbuffer = 0;
+    BTvar.ucScanNum = 0;
     while(1){
     while(1){
         if(g_ucUART1_flag == 1){  
         if(g_ucUART1_flag == 1){  
             Uart1_Ack();                       
             Uart1_Ack();                       
         }
         }
+
+		
+        if(printtempFlag == 1){  
+            printtempFlag = 0;   
+			my_printf("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);
+        }
+		
     }  
     }  
 }
 }

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

@@ -13,7 +13,9 @@
         <group>
         <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/Uart.c</file>
             <file>file:/F:/library/source/WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/myprintf.c</file>
             <file>file:/F:/library/source/WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/myprintf.c</file>
+            <file>file:/F:/library/source/WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/PIN.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/main.c</file>
+            <file>file:/F:/library/source/WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/Interrupt.c</file>
             <file>file:/F:/library/source/WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/ABIS_User.c</file>
             <file>file:/F:/library/source/WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/ABIS_User.c</file>
         </group>
         </group>
     </open-files>
     </open-files>