显示空管

Drivers/Board/board.h

@@ -17,7 +17,7 @@
 //////////////////////////////版本号 调试开关等wxl20260416////////////////////////////////////////////
 #define VER_TYPE 1     // type, 1: ultrasound flow meter;
 #define VER_OPERATOR 1 // operator, 1: China Telecom;
-#define VER_MODULE 2   // module, 1: HC32_BC28;
+#define VER_MODULE 4   // module, 1: HC32_BC28;
 #define VER_FIRMWARE 1
 /////////////////////////////集中显示频繁使用的调试开关及其他宏定义wxl20260416//////////////////////////////
 

Users/main.c

@@ -355,7 +355,7 @@ static void tdc_business_thread(void *parameter)
 
             tof_isr_convert_tof_to_flow();
         }
-				TdcIntStep=0xff;
+
         if (TdcIntStep == 0xff)
         {
 // cnt=SYS_MS_CNT;
@@ -539,7 +539,7 @@ int32_t main(void)
     HardwareIdInit(); // 初始化硬件ID接口
     ButtonInit();     // 初始化磁组按键
     tdc_tof_init();   // ms1030 spi驱动
-    //nb_power_on();
+
     finsh_drv_init();   // 红外串口初始化波特率2400、8位数据、1位停止位、even偶校验
     lpuart0_drv_init(0); // NB串口初始化波特率9600、8位数据、1位停止位、none校验
     nb_run_init();      // NB运行数据初始化
@@ -569,7 +569,7 @@ int32_t main(void)
     rtc_init(rr);     // 设置RTC系统时钟源为外部32K（ms1030）,同时设置定时中断为1秒钟一次
 
     set_tof_state(TOF_ST_VOID); // 设置ms1030状态，降低功耗
-    // set_tof_state(TOF_ST_METER);
+//    // set_tof_state(TOF_ST_METER);
 
     ParamInit(); // 初始化全局变量参数
 
@@ -625,77 +625,16 @@ int32_t main(void)
     
     while (1)
     {
-//       static uint8_t tested = 0;
-//      static uint8_t read_data[2] = {0};
-
-//        if (tested == 0)
-//        {
-//        uint8_t write_data[2] = {12, 0};
-
-//        tested = 1;
-
-//        write_eeprom(0x1FFF0u, write_data, sizeof(write_data));
-//        read_eeprom(0x1FFF0u, read_data, sizeof(read_data));
-//        }
-//        tdc_spi_wr_code(0x04);
-//        uint16_t aa=0;    
-//        aa=tdc_spi_rd_d16(0xd0);
         PeriodProc();
 
         CheckRxHandler(); // 红外接收指令处理
 
-        // add by yuewei 20260416
-        // if ((G_KEY_CAN_DEEP_SLEEP == 0) && (key_press_time >= LONG_PRESS_MS))
-        // {
-        //     G_KEY_CAN_DEEP_SLEEP = 1;                 // 允许休眠
-        //     LOG("long press:%dms\n", key_press_time); // 长按逻辑
-        //     KEY_LONG_PRESS_FLAG = 1;                  // 上报
-        //     rt_timer_stop(key_timer);                 // 停止计时
-        //     key_press_time = 0;
-        // }
 
         // 翻屏
         if (KEY_SHORT_PRESS_FLAG == 1)
-        {
-//             at_cmd_send(COAP_IMEI, NB_CGSN, NB_CGSN_ACK, 3, 2);
-//           at_cmd_send(COAP_ICCID, NB_NCCID, NB_NCCID_ACK, 3, 2);
-//           
-//           LOG("NB raw length=%u\r\n", NbRun.rx_idx);
-
-//            for (uint16_t i = 0; i < NbRun.rx_idx; i++)
-//            {
-//            LOG("[%03u] 0x%02X '%c'\r\n",
-//                i,
-//                NbRun.rx_buf[i],
-//                (NbRun.rx_buf[i] >= 32 &&
-//                 NbRun.rx_buf[i] <= 126)
-//                    ? NbRun.rx_buf[i]
-//                    : '.');
-//            }
-            uint32_t p1=0;
-            uint32_t p2=0;
-            uint16_t aa=0;
-            extern float TdcResist; 
-            extern uint8_t temp_flag;
-            tdc_spi_wr_code(0x04);
-            if(temp_flag)
-            {    
-              aa=tdc_spi_rd_d16(0xd0);
-              p1= tdc_spi_rd_d32(0xd1);  // 参考电阻
-              p2 = tdc_spi_rd_d32(0xd2);  // NTC
-              temp_flag=0;
-            }   
-            
-//            if (p1>0xB00000u && p1<0xE00000u){
-            TdcResist = 2500.0f*p2/p1;  // ohmX10
-            Ohm2Dgr2USSpd(TdcResist, WaterPrmt);        // [0]:Temperature; [1]:ultrasonic speed @Temp
-//            }
+        {       
+
             
-//           for (i = 0; i < NbRun.rx_idx; i++)
-//            {
-//            LOG("%c", NbRun.rx_buf[i]);
-//            };
-            // 处于检表状态
             key_handle_runing = 1;
 
             if (GetCheckState() == CHECKING)

Users/rtc_isr.c

@@ -216,9 +216,9 @@ void rtc_interrupt_deal_tdc(void)
                 tof_flag |= TOF_FLAG_TDC_FAULT;
             }
 
-            TdcIntStep = 0;
-            Tu32 = (RTC_CntInt&0x00000001u) ? TDC_CFG_FIRE_DOWN : TDC_CFG_FIRE_UP;
-            tdc_start_tof(TDC_CFG_DO_CKENA | TDC_CFG_DO_CKDIS | TDC_CFG_DO_WREG | Tu32);
+            TdcIntStep = 0x01;
+//            Tu32 = (RTC_CntInt&0x00000001u) ? TDC_CFG_FIRE_DOWN : TDC_CFG_FIRE_UP;
+            tdc_start_tof(TDC_CFG_DO_CKENA | TDC_CFG_DO_CKDIS | TDC_CFG_DO_WREG);
 						
 						
             //LOG("---------------------------------2\n");

Users/tdc_tof/tdc_ms1030.c

@@ -1,18 +1,16 @@
- 
-#include "board.h"
+ #include "board.h"
 #include "tdc_tof.h"
-#define ANZ_FIRE 		24u	//fire发送脉冲数
+
+#define ANZ_FIRE 		12u	//fire发送脉冲数
 #define DIV_FIRE 		3u	//内部时钟产生脉冲的分频
-#define DIV_CLKHS 	0u	//高速时钟分频
-#define START_CLKHS 2u	//高速启动后测量前晶振启动间隔时间
-#define NEG_START  	0u	//start通道边缘
+#define DIV_CLKHS 	    0u	//高速时钟分频
+#define START_CLKHS     2u	//高速启动后测量前晶振启动间隔时间,120us
+#define NEG_START  	    0u	//start通道边缘
 #define NEG_STOP		0u	//stop通道边缘
-#define HITIN				9u	//stop预期脉冲数
-#define SEL_TIMO_MB	0u	//暂未确定数值
+#define HITIN			9u	//stop预期脉冲数
+#define SEL_TIMO_MB	    0u	//暂未确定数值
 #define SEL_TSTO2		3u	//32khz //和MS1030不同
-#define SEL_TSTO1		1u	//start tdc输出 ,暂时
-
-
+#define SEL_TSTO1		0u	//暂时不用这个引脚，配置为高速时钟输入模式
 #define DFLT_WREG0   ((ANZ_FIRE<<25) | \
                       ( DIV_FIRE<<19) | \
                       ( DIV_CLKHS<<17) | \
@@ -22,59 +20,65 @@
                       ( HITIN<< 8) | \
                       ( SEL_TSTO2<< 2) | \
                       ( SEL_TSTO1<< 0)) 
-#define EN_INT_TO 1		//TIMOUT中断触发位
-#define EN_INT_HIT 0	//END HITS中断触发位
-#define EN_INT_ALU 1  //alu中断触发位
-#define RFEDGE 0			//stop通道边沿敏感性
-#define UP_DELVAL1 0	//当EN_FIST_WAVE=1时,为第一波屏蔽窗口 BIT12~27  暂未设置
-#define OFFSET 0			//当en_hc=1时, 62~-64mV   暂未设置
+                      
 
 
-#define DFLT_WREG1   (( EN_INT_TO<<31) | \
+#define EN_INT_TO       1  //TIMOUT中断触发位
+#define EN_INT_HIT      0  //END HITS中断触发位
+#define EN_INT_ALU      1  //alu中断触发位
+#define RFEDGE          0  //stop通道边沿敏感性
+#define UP_DELVAL1      0  //当EN_FIST_WAVE=1时,为第一波屏蔽窗口 BIT12~27  暂未设置
+#define OFFSET          0	//当en_hc=1时, 62~-64mV   暂未设置
+#define DFLT_WREG1   (( EN_INT_TO<<31)  | \
                       ( EN_INT_HIT<<30) | \
                       ( EN_INT_ALU<<29) | \
-                      ( RFEDGE<<28) | \
+                      ( RFEDGE<<28)     | \
+                      ( UP_DELVAL1<<12) | \
                       ( OFFSET<< 0))
-#define EN_FIRST_WAVE	0u	//BIT31, 为1时后面的定义有效
+                      
+
+#define EN_FIRST_WAVE	    0u	//BIT31, 为1时后面的定义有效
 #define EDGE_FW				0u	//第一波边缘敏感性
 #define DELREL1				6u	//第1个stop接收第几个回波周期
 #define DELREL2				8u	//第2个stop接收第几个回波周期
 #define DELREL3				10u	//第3个stop接收第几个回波周期
 #define DELREL4				12u	//第4个stop接收第几个回波周期
 #define DELREL5				14u	//第5个stop接收第几个回波周期
-
 #define DFLT_WREG2   ((EDGE_FW<<30) | \
                       (DELREL1<<24) | \
                       (DELREL2<<18) | \
                       (DELREL3<<12) | \
                       (DELREL4<< 6) | \
                       (DELREL5<< 0))
-											
+
+
+
 #define DELREL6				16u	//第3个stop接收第几个回波周期
 #define DELREL7				18u	//第4个stop接收第几个回波周期
-#define DELREL8				20u	//第5个stop接收第几个回波周期
-//后面几位和MS1030一致
+#define DELREL8				20u	//第5个stop接收第几个回波周期                             
 #define DFLT_WREG3   ((DELREL6<<26) | \
                       (DELREL7<<20) | \
                       (DELREL8<<14))
-#define CONF_FIRE				0		//暂时设置为0 bit29~31
+                      
+                            
+#define CONF_FIRE			0		//暂时设置为0 bit29~31
 #define PHASE_FIREUP		0
-#define PHASE_FIREDOWN	0
-#define SEL_START_FIRE	1
-#define EN_ANALOG				1
-#define HZ60						0
-#define TCYCLE					1
-#define ANZ_FAKE				0
+#define PHASE_FIREDOWN	    0
+#define SEL_START_FIRE	    1
+#define EN_ANALOG			1
+#define HZ60				0
+#define TCYCLE				1
+#define ANZ_FAKE			0
 #define SEL_ECLK_TMP		1
-#define TW2							3
-#define EN_PEAK					1		//峰值检波使能 1030不同
-#define EN_DISCHARGE		1		//检波放电使能1030不同
-#define CYCLE_TOF				3		//顺流逆流自动检测模式下,顺流逆流测量间隔时间,初步确定为3=20ms 1030不同
+#define TW2					1       //120us充电时间，与1030不同
+#define EN_PEAK				0		//峰值检波使能关闭，1030不同
+#define EN_DISCHARGE		0		//检波放电使能关闭，1030不同
+#define CYCLE_TOF			3		//顺流逆流自动检测模式下,顺流逆流测量间隔时间,初步确定为3=20ms 1030不同
 #define EN_ERR_VAL			1
-#define EN_DC						1		//stop端口充电模式 这里设置为直流  1030不同
-#define FIRE0_DEF				1
+#define EN_DC				1		//stop端口充电模式 这里设置为直流  1030不同
+#define FIRE0_DEF			1       //fire通道默认电平
 #define DOUBLE_RES			0
-#define QUAD_RES				0
+#define QUAD_RES			1
 #define DFLT_WREG4   (( PHASE_FIREUP<<28) | \
                       ( PHASE_FIREDOWN<<27) | \
                       ( SEL_START_FIRE<<26) | \
@@ -85,29 +89,29 @@
                       ( SEL_ECLK_TMP<<21) | \
                       ( TW2<<17) | \
                       ( EN_PEAK<<16) | \
-											( EN_DISCHARGE<<15) | \
-											( CYCLE_TOF<<11) | \
+					  ( EN_DISCHARGE<<15) | \
+					  ( CYCLE_TOF<<11) | \
                       ( EN_ERR_VAL<<10) | \
-											( EN_DC<<9) | \
-											( FIRE0_DEF<<8) | \
-											( DOUBLE_RES<<7) | \
-											( QUAD_RES<<6))
-
-#define CYCLE_AUTOTOF	 (250<<20)		//自动测量循环时间 500ms
-#define ANZ_AUTOTOF  (1<<16)					//循环次数 一直开启
-#define AUTOTOF_MODE (0<<15)					//顺逆顺逆
-#define PHASE_FIRENUM (3<<6)					//插入相位位置
-#define ANZ_PHASE			(8)							//插入周期数
-#define DFLT_WREG5   (CYCLE_AUTOTOF|ANZ_AUTOTOF|AUTOTOF_MODE|PHASE_FIRENUM|ANZ_PHASE)
-
-#define DOWN_DELVAL1  (0<<12)//第一波屏蔽窗口
+					  ( EN_DC<<9) | \
+					  ( FIRE0_DEF<<8) | \
+					  ( DOUBLE_RES<<7) | \
+					  ( QUAD_RES<<6))
+
+
+#define CYCLE_AUTOTOF	 (250<<20)	//自动测量循环时间 500ms
+#define ANZ_AUTOTOF      (1<<16)	//循环次数 一直开启
+#define AUTOTOF_MODE     (0<<15)	//顺逆顺逆
+#define PHASE_FIRENUM    (3<<6)		//插入相位位置
+#define ANZ_PHASE		 (8)		//插入周期数
+#define DFLT_WREG5        0
+
+#define DOWN_DELVAL1    (0<<12)//第一波屏蔽窗口
 #define SEL_SRC_CLK		(0<<7)//使用晶振产生时钟
-#define EN_HC					(1<<6)
-#define CURR32K				(0<<5)
-#define DIS_Vref			(1<<4)
+#define EN_HC			(1<<6)
+#define CURR32K			(0<<5)
+#define DIS_Vref		(1<<4)
 #define ADJ_LDO_ROUGH	(0<<3)
 #define ADJ_LDO_FINE	(4<<0)	
-
 #define DFLT_WREG6 (DOWN_DELVAL1|SEL_SRC_CLK|EN_HC|CURR32K|DIS_Vref|ADJ_LDO_ROUGH|ADJ_LDO_FINE)
 
 uint16_t tof_state = TOF_ST_INIT;
@@ -136,11 +140,21 @@ void tdc_tof_init(void)
     tdc_spi_wr_code(0x50);
     us_delay(1000);     // 1000us > specification(500us)
 
-    tdc_spi_wr_d32(0x80, DFLT_WREG0);
-    uint32_t reg0=tdc_spi_rd_d32(0xa0);
-		if(reg0==0)return;
+//    tdc_spi_wr_d32(0x80, 0x1E18884E);  // 修正：SEL_TIMO_MB = 8（合法）
+//    tdc_spi_wr_d32(0x81, 0xA00C8005);
+//    tdc_spi_wr_d32(0x82, 0x83105187);
+//    tdc_spi_wr_d32(0x83, 0x20928400);
+//    tdc_spi_wr_d32(0x84, 0x66E00540);
+//    tdc_spi_wr_d32(0x85, 0x07D10000);
+//    tdc_spi_wr_d32(0x86, 0x000C8004); 
+
+     tdc_spi_wr_d32(0x80, DFLT_WREG0);
+     uint32_t read_a0=tdc_spi_rd_d32(0xA0);
+     read_a0=read_a0&0xFFu;
+     
+#if 1    
     tof_flag = TOF_FLAG_UNALGND_CHOP;
-    if (tdc_spi_rd_d8(0xd3)!=(DFLT_WREG0&0xFFu)){
+    if (read_a0!=(DFLT_WREG0&0xFFu)){
         tof_flag |= TOF_FLAG_TDC_FAULT;
     } else {
         // write_reg0
@@ -150,7 +164,7 @@ void tdc_tof_init(void)
 
         // write_reg1
         tdc_spi_wr_d32(0x81, DFLT_WREG1 |
-                            (5760u<< 7)     // DELVAL1=45us, format:16.5, time unit:Tref;
+                            (5760u<< 12)     // DELVAL1=45us, format:16.5, time unit:Tref;
                       );
 
         // write_reg2
@@ -165,8 +179,12 @@ void tdc_tof_init(void)
 
         // write_reg4
         tdc_spi_wr_d32(0x84, DFLT_WREG4);
-				tdc_spi_wr_d32(0x85, DFLT_WREG5);
-				tdc_spi_wr_d32(0x86, DFLT_WREG6);
+        
+        // write_reg5
+	    tdc_spi_wr_d32(0x85, DFLT_WREG5);
+ 
+        // write_reg6
+		tdc_spi_wr_d32(0x86, DFLT_WREG6);
 				
 
         tdc_spi_wr_code(0x70);
@@ -185,9 +203,9 @@ void tdc_tof_init(void)
 //
 //            tdc_read_tof(TDC_CFG_FIRE_UP);  // read data and clear interrupt
     }
-
-    DMA_ReqClkOff();
-    PeriClk_MutDisable(PeriClk_Spi1);
+#endif 
+DMA_ReqClkOff();
+PeriClk_MutDisable(PeriClk_Spi1);
 
     // MS1030 INTN : PD03 falling edge trigger
     GpioInit(PD03_AF0, GPIO_DIG_IN_PULLUP_NONEDOWN);
@@ -217,7 +235,7 @@ void tdc_start_tof(uint32_t cfg)
         // write_reg1
         // DN15: L/C > (42+21+10*2)*1000/1555=53us
         tdc_spi_wr_d32(0x81, DFLT_WREG1 |
-                            (5760u<< 12)     // DELVAL1=45us, format:16.5, time unit:Tref;//1031 从BIT12开始
+                              (5760u<< 12)     // DELVAL1=45us, format:16.5, time unit:Tref;//1031 从BIT12开始
 //                            (6400u<< 7)   // DELVAL1=50us, format:16.5, time unit:Tref;
 //                            (7040u<< 7)   // DELVAL1=55us, format:16.5, time unit:Tref;
 //                            (7680u<< 7)   // DELVAL1=60us, format:16.5, time unit:Tref;
@@ -242,18 +260,14 @@ void tdc_start_tof(uint32_t cfg)
 
     // write_reg4
     u32tmp = DFLT_WREG4;
-    if (cfg & TDC_CFG_FIRE_UP){
-        u32tmp |= (1u<<30);     // FIRE_UP,   0:off; 1:on;
-    } else {
-        u32tmp |= (1u<<29);     // FIRE_DOWN, 0:off; 1:on;
-    }
+    u32tmp |= (1u<<30);     // FIRE_UP,   0:off; 1:on;
     tdc_spi_wr_d32(0x84, u32tmp);
 
     // Initial TDC status regs
     tdc_spi_wr_code(0x70);
 
     // start single-direction measure
-    tdc_spi_wr_code(0x01);
+    tdc_spi_wr_code(0x03);
 
     if (cfg & TDC_CFG_DO_CKDIS){
         DMA_ReqClkOff();
@@ -290,8 +304,8 @@ void tdc_read_tof(uint32_t cfg)
         DMA_ReqClkOn();
     }
 
-    TdcStatus = tdc_spi_rd_d16(0xd2);   // status
-    if ((TdcStatus&0x0600)==0x0000u){
+    TdcStatus = tdc_spi_rd_d16(0xd0);   // 读取状态寄存器
+    if ((TdcStatus&0x0300)==0x0000u){
         tof_flag ^= TOF_FLAG_UNALGND_CHOP;
 //        if (CntSync>=240){
 //            CntSync = 10;
@@ -300,31 +314,24 @@ void tdc_read_tof(uint32_t cfg)
 //        }
     }
 
-    if ((TdcStatus&0x06F0)!=0x0090u){
+    if ((TdcStatus&0x03F0)!=0x0090u){
         tof_flag |= TOF_FLAG_BLANK_PIPE;
         tdc_spi_wr_code(0x70);
-    } else {
-        if (cfg & TDC_CFG_FIRE_UP){
-            TdcUPwFw = tdc_spi_rd_d16(0xd0);    // First wave pulse width
-            TdcUPwHw = tdc_spi_rd_d16(0xd1);    // 1st Hit wave pulse width
+    } 
+    else 
+     {
+       
+            TdcUPwFw = tdc_spi_rd_d16(0xd3);    // First wave pulse width
+            TdcUPwHw = tdc_spi_rd_d16(0xd4);    // 1st Hit wave pulse width
             tdc_spi_wr_code(0x70);
-
             // TOF_UP_HITs
             TdcUToF[0] = tdc_spi_rd_d32(0xb8)*(1.0f/8);  // average of all
-//            for(i=0; i<8; i++){
-//                TdcUToF[i+1] = tdc_spi_rd_d32(0xb0 + i);
-//            };
-        } else if (cfg & TDC_CFG_FIRE_DOWN){
-            TdcDPwFw = tdc_spi_rd_d16(0xd0);    // First wave pulse width
-            TdcDPwHw = tdc_spi_rd_d16(0xd1);    // 1st Hit wave pulse width
-            tdc_spi_wr_code(0x70);
-
             // TOF_DOWN_HITs
-            TdcDToF[0] = tdc_spi_rd_d32(0xb8)*(1.0f/8);  // average of all
+            TdcDToF[0] = tdc_spi_rd_d32(0xc8)*(1.0f/8);  // average of all
 //            for(i=0; i<8; i++){
 //                TdcDToF[i+1] = tdc_spi_rd_d32(0xb0 + i);
 //            };
-        }
+        
     }
 
     if (cfg & TDC_CFG_DO_CKDIS){
@@ -372,8 +379,8 @@ void tdc_read_cal(uint32_t cfg)
         DMA_ReqClkOn();
     }
 
-    TdcStatus = tdc_spi_rd_d16(0xd2);   // status
-    if ((TdcStatus&0x0600)==0x0000u){
+    TdcStatus = tdc_spi_rd_d16(0xd0);   // status
+    if ((TdcStatus&0x0300)==0x0000u){
         tof_flag ^= TOF_FLAG_UNALGND_CHOP;
 //        if (CntSync>=240){
 //            CntSync = 10;
@@ -381,7 +388,7 @@ void tdc_read_cal(uint32_t cfg)
 //            CntSync += 10;
 //        }
         tdc_spi_wr_code(0x70);
-        TdcCal = tdc_spi_rd_d32(0xd4);
+        TdcCal = tdc_spi_rd_d32(0xd5);
 
 //        TdcScale = 244140.625f/TdcCal;
         TdcScale += (244140.625f/TdcCal - TdcScale)*(1.0f/2);
@@ -407,8 +414,10 @@ void tdc_start_temp(uint32_t cfg)
 
     if (cfg & TDC_CFG_DO_WREG){
         // write_reg0
+        
+        
         tdc_spi_wr_d32(0x80, DFLT_WREG0 |
-                              ( 3u<< 4)     // SEL_TIMO_MB, 0:64us; 1:128us; 2:256us; 3:512us; ~ 6:4096us;
+                              ( 3u<< 6)     // SEL_TIMO_MB, 0:64us; 1:128us; 2:256us; 3:512us; ~ 6:4096us;
                       );
 
         // write_reg1
@@ -440,10 +449,10 @@ void tdc_read_temp(uint32_t cfg)
         DMA_ReqClkOn();
     }
 
-    TdcStatus = tdc_spi_rd_d16(0xd2);   // status
+    TdcStatus = tdc_spi_rd_d16(0xd0);   // status
     tdc_spi_wr_code(0x70);
-    TdcPT[0] = tdc_spi_rd_d32(0xc2);  // REF 5K +/- 5
-    TdcPT[1] = tdc_spi_rd_d32(0xc3);  // U7
+    TdcPT[0] = tdc_spi_rd_d32(0xd1);  // REF 5K +/- 5
+    TdcPT[1] = tdc_spi_rd_d32(0xd2);  // U7
     //TdcPT[2] = tdc_spi_rd_d32(0xc4);  // U8
     //TdcPT[3] = tdc_spi_rd_d32(0xc5);  // REF 1.5K
 

Users/tdc_tof/tof_isr.c

@@ -234,36 +234,37 @@ void tof_isr_convert_tof_to_flow(void)
     float TmpFloat;
     uint32_t Tu32;
     uint32_t ch = get_mux_ch();
-/*
+
     switch (TdcIntStep)
     {
-    case (0x00u):
-        Tu32 = (RTC_CntInt & 0x00000001u) ? TDC_CFG_FIRE_DOWN : TDC_CFG_FIRE_UP;
-        tdc_read_tof(TDC_CFG_DO_CKENA | Tu32);
-        //            if(Tu32 == TDC_CFG_FIRE_UP)
-        //            {
-        //								LOG("ch-%d-0-U, %.6f\n", ch, TdcScale*TdcUToF[0]);
-        //            }
-        //            else
-        //            {
-        //                LOG("ch-%d-0-D, %.6f\n", ch, TdcScale*TdcDToF[0]);
-        //            }
-        // LOG("ch-%d-0-U:%.6f-D:%.6f\n\n", ch, TdcScale*TdcUToF[0],TdcScale*TdcDToF[0]);
-        Tu32 = (RTC_CntInt & 0x00000001u) ? TDC_CFG_FIRE_UP : TDC_CFG_FIRE_DOWN;
-        tdc_start_tof(TDC_CFG_DO_CKDIS | Tu32);
-        TdcIntStep = 0x01u;
-
-        break;
-
-    case (0x01u):
-        // RTC_CntInt奇数UP、偶数DOWN
-        Tu32 = (RTC_CntInt & 0x00000001u) ? TDC_CFG_FIRE_UP : TDC_CFG_FIRE_DOWN;
+//    case (0x00u):
+//        Tu32 = (RTC_CntInt & 0x00000001u) ? TDC_CFG_FIRE_DOWN : TDC_CFG_FIRE_UP;
+//        tdc_read_tof(TDC_CFG_DO_CKENA | Tu32);
+//        //            if(Tu32 == TDC_CFG_FIRE_UP)
+//        //            {
+//        //								LOG("ch-%d-0-U, %.6f\n", ch, TdcScale*TdcUToF[0]);
+//        //            }
+//        //            else
+//        //            {
+//        //                LOG("ch-%d-0-D, %.6f\n", ch, TdcScale*TdcDToF[0]);
+//        //            }
+//        // LOG("ch-%d-0-U:%.6f-D:%.6f\n\n", ch, TdcScale*TdcUToF[0],TdcScale*TdcDToF[0]);
+//        Tu32 = (RTC_CntInt & 0x00000001u) ? TDC_CFG_FIRE_UP : TDC_CFG_FIRE_DOWN;
+//        tdc_start_tof(TDC_CFG_DO_CKDIS | Tu32);
+//        TdcIntStep = 0x01u;
+
+//        break;
+
+    case (0x01u):      
+       
+//        // RTC_CntInt奇数UP、偶数DOWN
+//        Tu32 = (RTC_CntInt & 0x00000001u) ? TDC_CFG_FIRE_UP : TDC_CFG_FIRE_DOWN;
 
         // 根据RTC_CntInt设置校准、采集温度，读取飞行时间
         if ((RTC_CntInt & RTC_CNTMSK_CAL) == 0x0u)
         {
             // 间隔8秒进行一次校准
-            tdc_read_tof(TDC_CFG_DO_CKENA | Tu32);
+            tdc_read_tof(TDC_CFG_DO_CKENA);
             tdc_start_cal(TDC_CFG_DO_WREG | TDC_CFG_DO_CKDIS);
             if (tof_flag & TOF_FLAG_UNALGND_CHOP)
             {
@@ -277,14 +278,14 @@ void tof_isr_convert_tof_to_flow(void)
         else if ((RTC_CntInt & RTC_CNTMSK_TEMP) == 0x4u)
         {
             // 间隔4秒采集一次温度
-            tdc_read_tof(TDC_CFG_DO_CKENA | Tu32);
+            tdc_read_tof(TDC_CFG_DO_CKENA);
             tdc_start_temp(TDC_CFG_DO_WREG | TDC_CFG_DO_CKDIS);
             TdcIntStep = 0x04u;
         }
         else
         {
             // 读取飞行时间
-            tdc_read_tof(TDC_CFG_DO_CKENA | Tu32 | TDC_CFG_DO_CKDIS);
+            tdc_read_tof(TDC_CFG_DO_CKENA | TDC_CFG_DO_CKDIS);
             TdcIntStep = 0xFFu;
         }
 
@@ -477,8 +478,7 @@ void tof_isr_convert_tof_to_flow(void)
 
     case (0x80u):
         TdcIntStep = 0xFFu;
-    }*/
-		TdcIntStep = 0xFFu;
+    }
 }
 uint8_t temp_flag=0;
 void PORTD_F_IRQHandler(void)