refactoring of volt. and cur. limit check

eez-open · Apr 22, 2020 · c259b2c · c259b2c
1 parent b0a69dd
commit c259b2c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 19 deletions.
diff --git a/src/eez/modules/psu/channel.cpp b/src/eez/modules/psu/channel.cpp
@@ -776,8 +776,8 @@ void Channel::tick(uint32_t tick_usec) {
     }
 
     if (!io_pins::isInhibited()) {
-        setCvMode(channelInterface->isCcMode(subchannelIndex));
-        setCcMode(channelInterface->isCvMode(subchannelIndex));
+        setCvMode(channelInterface->isCvMode(subchannelIndex));
+        setCcMode(channelInterface->isCcMode(subchannelIndex));
     }
 
     // update history values
@@ -1450,6 +1450,17 @@ void Channel::setPowerLimit(float limit) {
     }
 }
 
+bool Channel::isVoltageLimitExceeded(float u) {
+    return channel_dispatcher::getValuePrecision(*this, UNIT_VOLT, u) >
+        channel_dispatcher::getValuePrecision(*this, UNIT_VOLT, channel_dispatcher::getULimit(*this));
+}
+
+bool Channel::isCurrentLimitExceeded(float i) {
+    return channel_dispatcher::getValuePrecision(*this, UNIT_AMPER, i) >
+        channel_dispatcher::getValuePrecision(*this, UNIT_AMPER, channel_dispatcher::getILimit(*this));
+}
+
+
 bool Channel::isVoltageBalanced() {
 	if (!isInstalled()) {
 		return false;
@@ -1527,12 +1538,12 @@ void Channel::setCurrentRangeSelectionMode(CurrentRangeSelectionMode mode) {
     flags.currentRangeSelectionMode = mode;
 
     if (flags.currentRangeSelectionMode == CURRENT_RANGE_SELECTION_ALWAYS_LOW) {
-        if (i.set > 0.05f) {
-            i.set = 0.05f;
+        float limit = 0.05f;
+        if (i.set > limit) {
+            i.set = limit;
         }
-
-        if (i.limit > 0.05f) {
-            i.limit = 0.05f;
+        if (i.limit > limit) {
+            i.limit = limit;
         }
     }
 

diff --git a/src/eez/modules/psu/channel.h b/src/eez/modules/psu/channel.h
@@ -499,6 +499,10 @@ class Channel {
     /// Change power limit, it will adjust U_SET or I_SET if necessary.
     void setPowerLimit(float limit);
 
+    bool isVoltageLimitExceeded(float u);
+
+    bool isCurrentLimitExceeded(float i);
+
     bool isPowerLimitExceeded(float u, float i) {
         return channelInterface->isPowerLimitExceeded(subchannelIndex, u, i);
     }

diff --git a/src/eez/modules/psu/list_program.cpp b/src/eez/modules/psu/list_program.cpp
@@ -199,12 +199,13 @@ int checkLimits(int iChannel) {
             current = roundedValue;
         }
 
-        if (voltage > channel_dispatcher::getULimit(channel)) {
+
+        if (channel.isVoltageLimitExceeded(voltage)) {
             g_errorChannelIndex = channel.channelIndex;
             return SCPI_ERROR_VOLTAGE_LIMIT_EXCEEDED;
         }
 
-        if (current > channel_dispatcher::getILimit(channel)) {
+        if (channel.isCurrentLimitExceeded(current)) {
             g_errorChannelIndex = channel.channelIndex;
             return SCPI_ERROR_CURRENT_LIMIT_EXCEEDED;
         }
@@ -547,14 +548,14 @@ int maxListsSize(Channel &channel) {
 
 bool setListValue(Channel &channel, int16_t it, int *err) {
     float voltage = channel_dispatcher::roundChannelValue(channel, UNIT_VOLT, g_channelsLists[channel.channelIndex].voltageList[it % g_channelsLists[channel.channelIndex].voltageListLength]);
-    if (voltage > channel_dispatcher::getULimit(channel)) {
+    if (channel.isVoltageLimitExceeded(voltage)) {
         g_errorChannelIndex = channel.channelIndex;
         *err = SCPI_ERROR_VOLTAGE_LIMIT_EXCEEDED;
         return false;
     }
 
     float current = channel_dispatcher::roundChannelValue(channel, UNIT_AMPER, g_channelsLists[channel.channelIndex].currentList[it % g_channelsLists[channel.channelIndex].currentListLength]);
-    if (current > channel_dispatcher::getILimit(channel)) {
+    if (channel.isCurrentLimitExceeded(current)) {
         g_errorChannelIndex = channel.channelIndex;
         *err = SCPI_ERROR_CURRENT_LIMIT_EXCEEDED;
         return false;

diff --git a/src/eez/modules/psu/scpi/appl.cpp b/src/eez/modules/psu/scpi/appl.cpp
@@ -62,12 +62,12 @@ scpi_result_t scpi_cmd_apply(scpi_t *context) {
         call_set_current = true;
     }
 
-    if (voltage > channel_dispatcher::getULimit(*channel)) {
+    if (channel->isVoltageLimitExceeded(voltage)) {
         SCPI_ErrorPush(context, SCPI_ERROR_VOLTAGE_LIMIT_EXCEEDED);
         return SCPI_RES_ERR;
     }
 
-    if (call_set_current && current > channel_dispatcher::getILimit(*channel)) {
+    if (call_set_current && channel->isCurrentLimitExceeded(current)) {
         SCPI_ErrorPush(context, SCPI_ERROR_CURRENT_LIMIT_EXCEEDED);
         return SCPI_RES_ERR;
     }

diff --git a/src/eez/modules/psu/scpi/sour.cpp b/src/eez/modules/psu/scpi/sour.cpp
@@ -156,7 +156,7 @@ scpi_result_t scpi_cmd_sourceCurrentLevelImmediateAmplitude(scpi_t *context) {
         return SCPI_RES_ERR;
     }
 
-    if (current > channel_dispatcher::getILimit(*channel)) {
+    if (channel->isCurrentLimitExceeded(current)) {
         SCPI_ErrorPush(context, SCPI_ERROR_CURRENT_LIMIT_EXCEEDED);
         return SCPI_RES_ERR;
     }
@@ -205,7 +205,7 @@ scpi_result_t scpi_cmd_sourceVoltageLevelImmediateAmplitude(scpi_t *context) {
         return SCPI_RES_ERR;
     }
 
-    if (voltage > channel_dispatcher::getULimit(*channel)) {
+    if (channel->isVoltageLimitExceeded(voltage)) {
         SCPI_ErrorPush(context, SCPI_ERROR_VOLTAGE_LIMIT_EXCEEDED);
         return SCPI_RES_ERR;
     }
@@ -955,7 +955,7 @@ scpi_result_t scpi_cmd_sourceListCurrentLevel(scpi_t *context) {
             return SCPI_RES_ERR;
         }
 
-        if (current > channel_dispatcher::getIMaxLimit(*channel)) {
+        if (channel->isCurrentLimitExceeded(current)) {
             SCPI_ErrorPush(context, SCPI_ERROR_CURRENT_LIMIT_EXCEEDED);
             return SCPI_RES_ERR;
         }
@@ -1086,7 +1086,7 @@ scpi_result_t scpi_cmd_sourceListVoltageLevel(scpi_t *context) {
             return SCPI_RES_ERR;
         }
 
-        if (voltage > channel_dispatcher::getUMaxLimit(*channel)) {
+        if (channel->isVoltageLimitExceeded(voltage)) {
             SCPI_ErrorPush(context, SCPI_ERROR_VOLTAGE_LIMIT_EXCEEDED);
             return SCPI_RES_ERR;
         }

diff --git a/src/eez/modules/psu/trigger.cpp b/src/eez/modules/psu/trigger.cpp
@@ -237,12 +237,12 @@ int checkTrigger() {
                     return err;
                 }
             } else {
-                if (channel.u.triggerLevel > channel_dispatcher::getULimit(channel)) {
+                if (channel.isVoltageLimitExceeded(channel.u.triggerLevel)) {
                     g_errorChannelIndex = channel.channelIndex;
                     return SCPI_ERROR_VOLTAGE_LIMIT_EXCEEDED;
                 }
 
-                if (channel.i.triggerLevel > channel_dispatcher::getILimit(channel)) {
+                if (channel.isCurrentLimitExceeded(channel.i.triggerLevel)) {
                     g_errorChannelIndex = channel.channelIndex;
                     return SCPI_ERROR_CURRENT_LIMIT_EXCEEDED;
                 }