上报荧光模块温度

WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/EEPROM.c

@@ -276,7 +276,10 @@ void Read_Sys_EE_03(void){
         EE_StrRead(0x338, (unsigned char*) &TempPara[4].fB,  4);        
         EE_StrRead(0x33C, (unsigned char*) &TempPara[5].fK1, 4);         
         EE_StrRead(0x340, (unsigned char*) &TempPara[5].fK2, 4);        
-        EE_StrRead(0x344, (unsigned char*) &TempPara[5].fB,  4);               
+        EE_StrRead(0x344, (unsigned char*) &TempPara[5].fB,  4);         
+        EE_StrRead(0x348, (unsigned char*) &TempPara[6].fK1, 4);         
+        EE_StrRead(0x34c, (unsigned char*) &TempPara[6].fK2, 4);        
+        EE_StrRead(0x350, (unsigned char*) &TempPara[6].fB,  4);               
    
         EE_StrRead(0x390, (unsigned char*) &TempPara[0].TTk1, 4);            
         EE_StrRead(0x394, (unsigned char*) &TempPara[0].TTk2, 4);      

WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/Interrupt.c

@@ -213,9 +213,9 @@ void __attribute__((interrupt,auto_psv)) _T6Interrupt (void)
         MCUAdcBuff[3][SampleNo]  = AD_Get(0x02);     //BLOCK4
         MCUAdcBuff[4][SampleNo]  = AD_Get(0x06);     //BLOCK5ÖÆÀä³Ø
         MCUAdcBuff[5][SampleNo]  = AD_Get(0x07);     //BLOCK6ÖÆÀä³Ø
-        MCUAdcBuff[6][SampleNo]  = AD_Get(0x02);     //ÈÈ¸Ç      
+        MCUAdcBuff[6][SampleNo]  = AD_Get(0x0f);     //ÈÈ¸Ç      
 //        MCUAdcBuff[7][SampleNo]  = AD_Get(0x07);     //
-        MCUAdcBuff[8][SampleNo]  = AD_Get(0x08);     //    É¢ÈÈƬ
+//        MCUAdcBuff[8][SampleNo]  = AD_Get(0x08);     //    É¢ÈÈƬ
     SampleNo++;
     if(SampleNo > 2) {     //100ms
         SampleNo=0;
@@ -255,7 +255,7 @@ void __attribute__((interrupt,auto_psv)) _T4Interrupt (void)
         dTemperature[i]=TempAD/3;
         dTemperatureAD[i] = (unsigned int)dTemperature[i];
     } 
-    for(i=0;i<6;i++){
+    for(i=0;i<7;i++){
         TempChn[i].fCurrentTemperature = (double)(TempPara[i].fK1 * dTemperature[i]*dTemperature[i] + TempPara[i].fK2 * dTemperature[i] + TempPara[i].fB);
         if(TempChn[i].fCurrentTemperature > 90)  TempChn[i].fCurrentTemperature = (double)(TempChn[i].fCurrentTemperature + TempPara[i].TTb);       
     }  

WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/PWM.h

@@ -85,7 +85,7 @@ typedef struct __TEMPPARA{
     float HoldPWMc1;
     
 }TEMPPARA;
- TEMPCTRLEXTERN TEMPPARA TempPara[6];
+ TEMPCTRLEXTERN TEMPPARA TempPara[7];
 
  
 #define MODEMRANGE              3 

WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/file/Uart.c

@@ -1445,7 +1445,7 @@ void Uart1_Ack(void)
             }else{
                 g_cTubeTempAriv = 0;
             } 
-            g_uiFrmLth = 23;
+            g_uiFrmLth = 25;
             g_ucU1TX_Data[0]  = FRAME_HEAD;
             g_ucU1TX_Data[1]  = g_ucCMD1|0X80;
             g_ucU1TX_Data[2]  = 0;
@@ -1465,10 +1465,12 @@ void Uart1_Ack(void)
             g_ucU1TX_Data[16] = (unsigned int)(TempChn[5].fCurrentTemperature*100.0) >> 8;
             g_ucU1TX_Data[17] = (unsigned char) (TempChn[5].fCurrentTemperature*100.0);
             g_ucU1TX_Data[18] = (unsigned int)(TempChn[5].fCurrentTemperature*100.0) >> 8;
-            g_ucU1TX_Data[19] = (unsigned char) (TempChn[5].fCurrentTemperature*100.0);            
-            g_ucU1TX_Data[20] = g_cTubeTempAriv;
-            g_ucU1TX_Data[21] = Flag_STATUS; //״̬λ
-            g_ucU1TX_Data[22] = (unsigned char) Check(g_ucU1TX_Data, g_uiFrmLth - 1);
+            g_ucU1TX_Data[19] = (unsigned char) (TempChn[5].fCurrentTemperature*100.0);   
+            g_ucU1TX_Data[20] = (unsigned int)(TempChn[6].fCurrentTemperature*100.0) >> 8;
+            g_ucU1TX_Data[21] = (unsigned char) (TempChn[6].fCurrentTemperature*100.0);            
+            g_ucU1TX_Data[22] = g_cTubeTempAriv;
+            g_ucU1TX_Data[23] = Flag_STATUS; //״̬λ
+            g_ucU1TX_Data[24] = (unsigned char) Check(g_ucU1TX_Data, g_uiFrmLth - 1);
                         
             while(DMA3CONbits.CHEN);        
             DMA3CNT=(g_uiFrmLth-1);

WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/nbproject/Makefile-genesis.properties

@@ -1,10 +1,10 @@
 #
-#Tue Aug 05 18:39:51 CST 2025
+#Fri Feb 06 09:56:22 CST 2026
 default.languagetoolchain.version=2.10
 default.Pack.dfplocation=C\:\\Users\\onechip\\.mchp_packs\\Microchip\\dsPIC33E-GM-GP-MC-GU-MU_DFP\\1.0.23
 conf.ids=default
-default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc16\\v2.10\\bin
-host.id=1lj1-c7wd-qs
+default.languagetoolchain.dir=D\:\\Program Files\\Microchip\\xc16\\v2.10\\bin
+host.id=1707-dsfu-bg
 configurations-xml=04f6ad8908cb296473dfdf6bc72baa34
 default.com-microchip-mplab-mdbcore-PICKit3Tool-PICkit3DbgToolManager.md5=50072f33d27b72924000ca2dca4b7622
 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=e62346c0c0ecee2637e613b49cb7b7fa

WZYXPCR_NO1.20250726.X/WZYXPCR_NO1.20250726.X/nbproject/Makefile-local-default.mk

@@ -15,23 +15,23 @@
 # $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...  
 #
 SHELL=cmd.exe
-PATH_TO_IDE_BIN=C:/Program Files/Microchip/MPLABX/v6.15/mplab_platform/platform/../mplab_ide/modules/../../bin/
+PATH_TO_IDE_BIN=D:/Program Files/Microchip/MPLABX/v6.15/mplab_platform/platform/../mplab_ide/modules/../../bin/
 # Adding MPLAB X bin directory to path.
-PATH:=C:/Program Files/Microchip/MPLABX/v6.15/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
+PATH:=D:/Program Files/Microchip/MPLABX/v6.15/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
 # Path to java used to run MPLAB X when this makefile was created
-MP_JAVA_PATH="C:\Program Files\Microchip\MPLABX\v6.15\sys\java\zulu8.64.0.19-ca-fx-jre8.0.345-win_x64/bin/"
+MP_JAVA_PATH="D:\Program Files\Microchip\MPLABX\v6.15\sys\java\zulu8.64.0.19-ca-fx-jre8.0.345-win_x64/bin/"
 OS_CURRENT="$(shell uname -s)"
-MP_CC="C:\Program Files\Microchip\xc16\v2.10\bin\xc16-gcc.exe"
+MP_CC="D:\Program Files\Microchip\xc16\v2.10\bin\xc16-gcc.exe"
 # MP_CPPC is not defined
 # MP_BC is not defined
-MP_AS="C:\Program Files\Microchip\xc16\v2.10\bin\xc16-as.exe"
-MP_LD="C:\Program Files\Microchip\xc16\v2.10\bin\xc16-ld.exe"
-MP_AR="C:\Program Files\Microchip\xc16\v2.10\bin\xc16-ar.exe"
-DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files/Microchip/MPLABX/v6.15/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
-MP_CC_DIR="C:\Program Files\Microchip\xc16\v2.10\bin"
+MP_AS="D:\Program Files\Microchip\xc16\v2.10\bin\xc16-as.exe"
+MP_LD="D:\Program Files\Microchip\xc16\v2.10\bin\xc16-ld.exe"
+MP_AR="D:\Program Files\Microchip\xc16\v2.10\bin\xc16-ar.exe"
+DEP_GEN=${MP_JAVA_PATH}java -jar "D:/Program Files/Microchip/MPLABX/v6.15/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
+MP_CC_DIR="D:\Program Files\Microchip\xc16\v2.10\bin"
 # MP_CPPC_DIR is not defined
 # MP_BC_DIR is not defined
-MP_AS_DIR="C:\Program Files\Microchip\xc16\v2.10\bin"
-MP_LD_DIR="C:\Program Files\Microchip\xc16\v2.10\bin"
-MP_AR_DIR="C:\Program Files\Microchip\xc16\v2.10\bin"
+MP_AS_DIR="D:\Program Files\Microchip\xc16\v2.10\bin"
+MP_LD_DIR="D:\Program Files\Microchip\xc16\v2.10\bin"
+MP_AR_DIR="D:\Program Files\Microchip\xc16\v2.10\bin"
 DFP_DIR=C:/Users/onechip/.mchp_packs/Microchip/dsPIC33E-GM-GP-MC-GU-MU_DFP/1.0.23