diff --git a/src/epics/util/lib/IPCx.pm b/src/epics/util/lib/IPCx.pm index 85efb0a4fdb61905a07591562162bacfafb88497..ca1a64c2d781450790f183fef467e6dd2a42b318 100644 --- a/src/epics/util/lib/IPCx.pm +++ b/src/epics/util/lib/IPCx.pm @@ -816,7 +816,7 @@ my ($medmDir,$mdlName,$ifo,$dcuid,$medmTarget,$ipcxCnt1) = @_; # Calculate screen height based on number of IPC RCV signals my $ind_ipc_ypos_start = 55; #This is the ypos start of the individual IPC table and column header - my $dispH = $ind_ipc_ypos_start; + my $dispH = $ind_ipc_ypos_start + 20; for(my $ii=0;$ii<$ipcxCnt1;$ii++) { if($::ipcxParts[$ii][9] == 0) diff --git a/src/fe/commData3.c b/src/fe/commData3.c index 2752d8b989db9295659a1994bf62b43a828d4498..4418dcc4b07e1c0ce033bfd3316106c2d851aace 100644 --- a/src/fe/commData3.c +++ b/src/fe/commData3.c @@ -570,7 +570,7 @@ int commData3Receive( if( temp_sleep_count > 0 && g_in_error_state == false) { int time_waited_ns = (int)timer_tock_ns(&g_cycle_start_tsc); - RTSLOG_INFO("Slept for %d ns waiting for IPC: %d\n", time_waited_ns, slow_ipc_num); + //RTSLOG_INFO("Slept for %d ns waiting for IPC: %d\n", time_waited_ns, slow_ipc_num); ++g_ipc_wait_time_stats.numWaitsInSec; g_ipc_wait_time_stats.slowIpcListIndex = slow_ipc_num; if( time_waited_ns > g_ipc_wait_time_stats.ipcMaxWait_ns ) @@ -578,7 +578,7 @@ int commData3Receive( } else if ( temp_sleep_count > 0 ) { - RTSLOG_INFO("Timed out waiting %d ns for IPC: %d\n", max_time_to_wait_ns, slow_ipc_num); + //RTSLOG_INFO("Timed out waiting %d ns for IPC: %d\n", max_time_to_wait_ns, slow_ipc_num); } diff --git a/src/fe/controllerApp.c b/src/fe/controllerApp.c index 141992a758ea8ab9548a16fdadcf798e74781322..369a76c690f7da15c82bc2f67834db4491201821 100644 --- a/src/fe/controllerApp.c +++ b/src/fe/controllerApp.c @@ -482,9 +482,11 @@ fe_start_controller( void ) // ********************************************************************** if ( cycleNum == HKP_TIMING_UPDATES ) { - sendTimingDiags2Epics( pLocalEpics, &timeinfo, &adcinfo ); - + + //sendTimingDiags2Epics() will clear cycleTimeSec, so we set it here commData3SetCycleMax( timeinfo.cycleTimeSec ); + + sendTimingDiags2Epics( pLocalEpics, &timeinfo, &adcinfo ); if ( ( adcinfo.adcHoldTime > CYCLE_TIME_ALRM_HI ) || ( adcinfo.adcHoldTime < CYCLE_TIME_ALRM_LO ) ) diff --git a/src/fe/controllerIop.c b/src/fe/controllerIop.c index d37f5205af30e1a0869512bd16d9ca083bfe7814..fc9208b61f0595d2318830a79acc7c71c29c7460 100644 --- a/src/fe/controllerIop.c +++ b/src/fe/controllerIop.c @@ -1180,9 +1180,10 @@ fe_start_controller( void ) // ***************************************************************** if ( hkp_cycle == HKP_TIMING_UPDATES ) { - sendTimingDiags2Epics( pLocalEpics, &timeinfo, &adcinfo ); - + //sendTimingDiags2Epics() will clear cycleTimeSec, so we set it here commData3SetCycleMax( timeinfo.cycleTimeSec ); + + sendTimingDiags2Epics( pLocalEpics, &timeinfo, &adcinfo ); pLocalEpics->epicsOutput.dacEnable = dacEnable;