Merge pull request #7 from ISISComputingGroup/Ticket4224

LowriJenkins · web-flow · commit 1975ea6dface · 2022-12-09T11:07:55.000Z
Mercury IPS mods
diff --git a/OxInstIPSApp/protocol/OxInstIPS.protocol b/OxInstIPSApp/protocol/OxInstIPS.protocol
@@ -174,8 +174,7 @@ getStatus {
 	  "A%(\$1ACTIVITY.VAL)1u"
 	  "C%(\$1CONTROL.VAL)1u"
 	  "H%(\$1HEATER:STATUS.VAL)1u"
-	  "M%(\$1SWEEPMODE:PARAMS.VAL)1u%(\$1STS:SWEEPMODE:SWEEP.VAL)1u"
-	  "P%*1u%*1u"
+	  "M%*1u%(\$1STS:SWEEPMODE:SWEEP.VAL)1u"
 	;
 	wait 100;
 }

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,7 @@ getStatus {`
`174`	`174`	`"A%(\$1ACTIVITY.VAL)1u"`
`175`	`175`	`"C%(\$1CONTROL.VAL)1u"`
`176`	`176`	`"H%(\$1HEATER:STATUS.VAL)1u"`
`177`		`- "M%(\$1SWEEPMODE:PARAMS.VAL)1u%(\$1STS:SWEEPMODE:SWEEP.VAL)1u"`
`178`		`- "P%1u%1u"`
	`177`	`+ "M%*1u%(\$1STS:SWEEPMODE:SWEEP.VAL)1u"`
`179`	`178`	`;`
`180`	`179`	`wait 100;`
`181`	`180`	`}`