output disable in trigger mode

mvladic · mvladic · commit 1ac606ba9b0d · 2020-03-26T09:57:55.000+01:00
diff --git a/src/eez/modules/psu/channel_dispatcher.cpp b/src/eez/modules/psu/channel_dispatcher.cpp
@@ -1124,7 +1124,7 @@ bool outputEnable(Channel &channel, bool enable, int *err) {
                 return false;
             }
 
-            if (triggerModeEnabled) {
+            if (triggerModeEnabled && !trigger::isIdle()) {
                 trigger::abort();
             } else {
                 channel_dispatcher::outputEnable(channel, false);

Original file line number	Diff line number	Diff line change
`@@ -1124,7 +1124,7 @@ bool outputEnable(Channel &channel, bool enable, int *err) {`
`1124`	`1124`	`return false;`
`1125`	`1125`	`}`
`1126`	`1126`
`1127`		`- if (triggerModeEnabled) {`
	`1127`	`+ if (triggerModeEnabled && !trigger::isIdle()) {`
`1128`	`1128`	`trigger::abort();`
`1129`	`1129`	`} else {`
`1130`	`1130`	`channel_dispatcher::outputEnable(channel, false);`