adjust spectrometer attenuator thermal couple PV again

tongju12 · Mar 6, 2024 · 12d713f · 12d713f
1 parent bf14a85
commit 12d713f
Show file tree

Hide file tree

Showing 3 changed files with 2,443 additions and 2,293 deletions.
diff --git a/plc-tmo-motion/_Config/PLC/tmo_motion.xti b/plc-tmo-motion/_Config/PLC/tmo_motion.xti
@@ -12678,14 +12678,6 @@ External Setpoint Generation:
 						</Comment>
 					</SubVar>
 				</Var>
-				<Var>
-					<Name>GVL_PMPS.fbFastFaultOutput1.q_xFastFaultOut</Name>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL_PMPS.fbFastFaultOutput2.q_xFastFaultOut</Name>
-					<Type>BOOL</Type>
-				</Var>
 				<Var>
 					<Name>Main.M1.Axis.PlcToNc</Name>
 					<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
@@ -13203,6 +13195,14 @@ External Setpoint Generation:
 					</Comment>
 					<Type>BOOL</Type>
 				</Var>
+				<Var>
+					<Name>GVL_PMPS.fbFastFaultOutput1.q_xFastFaultOut</Name>
+					<Type>BOOL</Type>
+				</Var>
+				<Var>
+					<Name>GVL_PMPS.fbFastFaultOutput2.q_xFastFaultOut</Name>
+					<Type>BOOL</Type>
+				</Var>
 			</Vars>
 			<Vars VarGrpType="8">
 				<Name>PlcTask Retains</Name>

diff --git a/plc-tmo-motion/tmo_motion/POUs/PRG_SP1K4.TcPOU b/plc-tmo-motion/tmo_motion/POUs/PRG_SP1K4.TcPOU
@@ -102,7 +102,7 @@ VAR
                               .bOverrange := TIIB[SP1K4-EL3202-E9A]^RTD Inputs Channel 1^Status^Overrange;
                               .bError := TIIB[SP1K4-EL3202-E9A]^RTD Inputs Channel 1^Status^Error'}
     {attribute 'pytmc' := '
-        pv: SP1K4:SPEC:ATT:RTD:01
+        pv: TMO:SPEC:RTD:01
         field: EGU C
         io: i
     '}
@@ -113,7 +113,7 @@ VAR
                               .bOverrange := TIIB[SP1K4-EL3202-E9A]^RTD Inputs Channel 2^Status^Overrange;
                               .bError := TIIB[SP1K4-EL3202-E9A]^RTD Inputs Channel 2^Status^Error'}
     {attribute 'pytmc' := '
-        pv: SP1K4:SPEC:ATT:RTD:02
+        pv: TMO:SPEC:RTD:02
         field: EGU C
         io: i
     '}