> 1. fix UCP4008_SL feature enhancement #1792;

> 2. delete pp1s scratch of jesd timer rx1;
> 3. delete the process of resetting jesd timer rx1 when gps locked.
This commit is contained in:
xinxin.li 2024-04-01 16:01:54 +08:00
parent 049c0374f6
commit af4dbbdb3d
3 changed files with 7 additions and 5 deletions

View File

@ -1245,7 +1245,8 @@ void jesd_10ms_callback(uint8_t nTmrId)
pMtimerInt->tmrPP1sCost = GET_STC_CNT(); pMtimerInt->tmrPP1sCost = GET_STC_CNT();
} }
if (MTIMER_JESD_RX1_ID == nTmrId) //if (MTIMER_JESD_RX1_ID == nTmrId)
if (MTIMER_JESD_RX0_ID == nTmrId)
{ {
mtimer_orx_adjust(); mtimer_orx_adjust();
} }

View File

@ -46,11 +46,12 @@ void mtimer_1pps_resync(uint8_t nTmrId)
if (PROTOCOL_JESD == nBsType) if (PROTOCOL_JESD == nBsType)
{ {
stop_jesd_timer(nTmrId); stop_jesd_timer(nTmrId);
stop_jesd_timer(nTmrId+1); //stop_jesd_timer(nTmrId+1);
stop_jesd_timer(nTmrId+2); stop_jesd_timer(nTmrId+2);
stop_jesd_timer(nTmrId+3); stop_jesd_timer(nTmrId+3);
__ucps2_synch(0);
start_jesd_timer(nTmrId); start_jesd_timer(nTmrId);
start_jesd_timer(nTmrId+1); //start_jesd_timer(nTmrId+1);
start_jesd_timer(nTmrId+2); start_jesd_timer(nTmrId+2);
start_jesd_timer(nTmrId+3); start_jesd_timer(nTmrId+3);
} }
@ -59,8 +60,8 @@ void mtimer_1pps_resync(uint8_t nTmrId)
gCpriIntStatus.cpriSyncFlag = 0; gCpriIntStatus.cpriSyncFlag = 0;
stop_cpri_timer(); stop_cpri_timer();
stop_ecpri_timer(); stop_ecpri_timer();
//set_cpri_tx_rfp();
set_cpri_tmr_ctrl(); set_cpri_tmr_ctrl();
__ucps2_synch(0);
start_cpri_timer(); start_cpri_timer();
start_ecpri_timer(); start_ecpri_timer();
stCpriDelayMeasure* pCpriDelay = pEcsDmLocalMgt->pCpriDelay; stCpriDelayMeasure* pCpriDelay = pEcsDmLocalMgt->pCpriDelay;

View File

@ -224,7 +224,7 @@ int32_t set_mtimer_scratch_tod()
else if (PROTOCOL_JESD == protocolSel) else if (PROTOCOL_JESD == protocolSel)
{ {
set_jesd_1pps_scratch(0); set_jesd_1pps_scratch(0);
set_jesd_1pps_scratch(1); //set_jesd_1pps_scratch(1);
} }
else else
{ {