diff --git a/lcls-plc-rixs-optics/_Config/NC/Axes/M1K2-Pitch.xti b/lcls-plc-rixs-optics/_Config/NC/Axes/M1K2-Pitch.xti index 6760d46c..6ab260ba 100644 --- a/lcls-plc-rixs-optics/_Config/NC/Axes/M1K2-Pitch.xti +++ b/lcls-plc-rixs-optics/_Config/NC/Axes/M1K2-Pitch.xti @@ -1328,7 +1328,7 @@ External Setpoint Generation: - + diff --git a/lcls-plc-rixs-optics/_Config/PLC/rixs_optics.xti b/lcls-plc-rixs-optics/_Config/PLC/rixs_optics.xti index a5a54322..68bd7211 100644 --- a/lcls-plc-rixs-optics/_Config/PLC/rixs_optics.xti +++ b/lcls-plc-rixs-optics/_Config/PLC/rixs_optics.xti @@ -1349,7 +1349,7 @@ External Setpoint Generation: - + rixs_optics Instance {08500001-0000-0000-F000-000000000064} diff --git a/lcls-plc-rixs-optics/rixs_optics/rixs_optics.tmc b/lcls-plc-rixs-optics/rixs_optics/rixs_optics.tmc index 869fe1a5..55152650 100644 --- a/lcls-plc-rixs-optics/rixs_optics/rixs_optics.tmc +++ b/lcls-plc-rixs-optics/rixs_optics/rixs_optics.tmc @@ -1,5 +1,5 @@ - + ComSerialLineMode_t @@ -82439,7 +82439,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t PI Serial 112640 FB_PI_E621_SerialDriver - 1265797632 + 1265016832 GVL_M1K2.M1K2_Pitch @@ -82546,7 +82546,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t Input - 1265017536 + 1265133632 PRG_DAQ_ENCODER.iLatchNeg @@ -82562,7 +82562,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t Input - 1265017600 + 1265133696 PRG_DAQ_ENCODER.nEncoderCount @@ -82578,7 +82578,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t Input - 1265017664 + 1265133760 @@ -82729,7 +82729,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 172.21.140.21 - 1265017728 + 1265133824 PRG_DAQ_ENCODER.bUseHWTriggers @@ -82738,7 +82738,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t true - 1265018376 + 1265134472 PRG_DAQ_ENCODER.bUseSWTriggers @@ -82747,14 +82747,14 @@ The BPTM will throw an error if the arbiter does not have enough space for the t false - 1265018384 + 1265134480 PRG_DAQ_ENCODER.bNewTrigger Internals 8 BOOL - 1265018392 + 1265134488 PRG_DAQ_ENCODER.tSWTriggerDelay @@ -82763,20 +82763,20 @@ The BPTM will throw an error if the arbiter does not have enough space for the t T#8ms - 1265018400 + 1265134496 PRG_DAQ_ENCODER.iTimeSincePos Outputs 64 ULINT - 1265018432 + 1265134528 PRG_DAQ_ENCODER.iMaxTime 64 ULINT - 1265018496 + 1265134592 PRG_DAQ_ENCODER.iMinTime @@ -82785,19 +82785,19 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 10000000000 - 1265018560 + 1265134656 PRG_DAQ_ENCODER.fTimeInS 64 LREAL - 1265018624 + 1265134720 PRG_DAQ_ENCODER.iTriggerWidth 64 ULINT - 1265018688 + 1265134784 PRG_DAQ_ENCODER.fTriggerRate @@ -82812,25 +82812,25 @@ The BPTM will throw an error if the arbiter does not have enough space for the t - 1265018752 + 1265134848 PRG_DAQ_ENCODER.tonSWTrigger 256 TON - 1265018816 + 1265134912 PRG_DAQ_ENCODER.iPrevLatchPos 64 ULINT - 1265019072 + 1265135168 PRG_DAQ_ENCODER.fMaxTimeInS 64 LREAL - 1265019136 + 1265135232 PRG_DAQ_ENCODER.fMinTimeInS @@ -82839,19 +82839,19 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 10000000 - 1265019200 + 1265135296 PRG_DAQ_ENCODER.iTimeSinceLast 64 ULINT - 1265019264 + 1265135360 PRG_DAQ_ENCODER.nUpdateCycles 64 ULINT - 1265019328 + 1265135424 PRG_DAQ_ENCODER.nFrameCount @@ -82866,67 +82866,67 @@ The BPTM will throw an error if the arbiter does not have enough space for the t - 1265019392 + 1265135488 PRG_DAQ_ENCODER.stTaskInfo 1024 PlcTaskSystemInfo - 1265019456 + 1265135552 PRG_DAQ_ENCODER.iUnderflowCount 64 ULINT - 1265020480 + 1265136576 PRG_DAQ_ENCODER.fUnderflowPercent 64 LREAL - 1265020544 + 1265136640 PRG_DAQ_ENCODER.fEncScale 64 LREAL - 1265020608 + 1265136704 PRG_DAQ_ENCODER.fEncScaleDenominator 64 LREAL - 1265020672 + 1265136768 PRG_DAQ_ENCODER.fbSocketHandler 110592 FB_UDPSocketHandler - 1265020736 + 1265136832 PRG_DAQ_ENCODER.fbSocketSend 275200 FB_BufferedSocketSend - 1265131328 + 1265247424 PRG_DAQ_ENCODER.fbSocketHandlerTest 110592 FB_UDPSocketHandler - 1265406528 + 1265522624 PRG_DAQ_ENCODER.fbSocketSendTest 275200 FB_BufferedSocketSend - 1265517120 + 1265633216 PRG_DAQ_ENCODER.payload 512 DUT_01_Channel_NW - 1265792320 + 1265908416 PRG_DAQ_ENCODER.fbHeader @@ -82938,7 +82938,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t plc-tst-proto6 - 1265792832 + 1265908928 PRG_DAQ_ENCODER.fbChannel @@ -82950,14 +82950,14 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 1 - 1265793408 + 1265909504 PRG_DAQ_ENCODER.fbGetTaskIndex Function blocks 256 GETCURTASKINDEX - 1265794240 + 1265910336 PRG_DAQ_ENCODER.fEpicsEncCount @@ -82973,7 +82973,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t - 1265794496 + 1265910592 PRG_DAQ_ENCODER.fEpicsTrigWidth @@ -82988,7 +82988,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t - 1265794528 + 1265910624 TwinCAT_SystemInfoVarList._TaskInfo @@ -101679,30 +101679,11 @@ Emergency Stop for MR1K1 1264978656 - - PRG_DAQ_ENCODER.nBusyCycles - Temp testing - 16 - UINT - 1265019408 - - - PRG_DAQ_ENCODER.nMaxBusyCycles - 16 - UINT - 1265019424 - - - PRG_DAQ_ENCODER.nDroppedFrames - 16 - UINT - 1265019440 - PiezoSerial.rtInitParams_M1K2 128 R_TRIG - 1265910272 + 1265129472 PiezoSerial.tonTimeoutRst_M1K2 @@ -101715,7 +101696,26 @@ Emergency Stop for MR1K1 T#2S - 1265910400 + 1265129600 + + + PRG_DAQ_ENCODER.nBusyCycles + Temp testing + 16 + UINT + 1265135504 + + + PRG_DAQ_ENCODER.nMaxBusyCycles + 16 + UINT + 1265135520 + + + PRG_DAQ_ENCODER.nDroppedFrames + 16 + UINT + 1265135536 PRG_1_PlcTask.fbLogHandler @@ -108834,7 +108834,7 @@ M4K2 KBV X ENC CNT ChangeDate - 2025-01-24T17:46:51 + 2025-01-30T09:44:03 GeneratedCodeSize