#49

eez-open · Aug 28, 2020 · b6832ae · b6832ae
1 parent 90a5502
commit b6832ae
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/src/eez/modules/psu/channel_dispatcher.cpp b/src/eez/modules/psu/channel_dispatcher.cpp
@@ -1240,7 +1240,8 @@ bool testOutputEnable(Channel &channel, bool enable, bool &callTriggerAbort, int
                 callTriggerAbort = true;
             }
         } else {
-            if (isTripped(channel)) {
+            int channelIndex;
+            if (isTripped(channel, channelIndex)) {
                 if (err) {
                     *err = SCPI_ERROR_CANNOT_EXECUTE_BEFORE_CLEARING_PROTECTION;
                 }
@@ -1322,19 +1323,43 @@ void remoteSensingEnable(Channel &channel, bool enable) {
     }
 }
 
-bool isTripped(Channel &channel) {
+bool isTripped(Channel &channel, int &channelIndex) {
     if (channel.channelIndex < 2 && (g_couplingType == COUPLING_TYPE_SERIES || g_couplingType == COUPLING_TYPE_PARALLEL)) {
-        return Channel::get(0).isTripped() || Channel::get(1).isTripped();
+        if (Channel::get(0).isTripped()) {
+            channelIndex = 0;
+            return true;
+        }
+        channelIndex = 1;
+        return Channel::get(1).isTripped();
     } else if (channel.flags.trackingEnabled) {
         for (int i = 0; i < CH_NUM; ++i) {
             Channel &trackingChannel = Channel::get(i);
             if (trackingChannel.flags.trackingEnabled && trackingChannel.isTripped()) {
+                channelIndex = i;
                 return true;
             }
         }
         return false;
     } else {
-        return channel.isTripped();
+        if (channel.isTripped()) {
+            channelIndex = channel.channelIndex;
+            return true;
+        }
+
+        bool triggerModeEnabled = getVoltageTriggerMode(channel) != TRIGGER_MODE_FIXED || getCurrentTriggerMode(channel) != TRIGGER_MODE_FIXED;
+        if (triggerModeEnabled) {
+            for (int i = 0; i < CH_NUM; ++i) {
+                if (i != channel.channelIndex) {
+                    Channel &otherChannel = Channel::get(i);
+                    bool triggerModeEnabled = getVoltageTriggerMode(otherChannel) != TRIGGER_MODE_FIXED || getCurrentTriggerMode(otherChannel) != TRIGGER_MODE_FIXED;
+                    if (triggerModeEnabled && otherChannel.isTripped()) {
+                        channelIndex = i;
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
     }
 }
 

diff --git a/src/eez/modules/psu/channel_dispatcher.h b/src/eez/modules/psu/channel_dispatcher.h
@@ -117,7 +117,7 @@ void disableOutputForAllTrackingChannels();
 
 void remoteSensingEnable(Channel &channel, bool enable);
 
-bool isTripped(Channel &channel);
+bool isTripped(Channel &channel, int &channelIndex);
 void clearProtection(Channel &channel);
 void disableProtection(Channel &channel);
 

diff --git a/src/eez/modules/psu/gui/psu.cpp b/src/eez/modules/psu/gui/psu.cpp
@@ -1901,11 +1901,12 @@ void channelCalibrationsNo() {
 void channelToggleOutput() {
     selectChannelByCursor();
     Channel &channel = *g_channel;
-    if (channel_dispatcher::isTripped(channel)) {
+    int channelIndex;
+    if (channel_dispatcher::isTripped(channel, channelIndex)) {
         if (temperature::sensors[temp_sensor::AUX].isTripped()) {
-            errorMessageWithAction("AUX temp. sensor is tripped!", clearTrip, "Clear", channel.channelIndex);
+            errorMessageWithAction("AUX temp. sensor is tripped!", clearTrip, "Clear", channelIndex);
         } else {
-            errorMessageWithAction("Channel is tripped!", clearTrip, "Clear", channel.channelIndex);
+            errorMessageWithAction("Channel is tripped!", clearTrip, "Clear", channelIndex);
         }
     } else {
         if (!channel.isOutputEnabled() && !channel.isCalibrationExists()) {

diff --git a/src/eez/modules/psu/list_program.cpp b/src/eez/modules/psu/list_program.cpp
@@ -583,7 +583,8 @@ void tick(uint32_t tick_usec) {
     for (int i = 0; i < CH_NUM; ++i) {
         Channel &channel = Channel::get(i);
         if (g_execution[i].counter >= 0) {
-            if (channel_dispatcher::isTripped(channel)) {
+            int channelIndex;
+            if (channel_dispatcher::isTripped(channel, channelIndex)) {
                 setActive(false);
                 trigger::abort();
                 return;