current limit on fan or temp failure fixed

eez-open · Jan 30, 2020 · 2df4502 · 2df4502
1 parent 1ce1b51
commit 2df4502
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/src/eez/modules/psu/channel.cpp b/src/eez/modules/psu/channel.cpp
@@ -1447,12 +1447,8 @@ void Channel::limitMaxCurrent(MaxCurrentLimitCause cause) {
         maxCurrentLimitCause = cause;
 
         if (isMaxCurrentLimited()) {
-            if (isOutputEnabled() && i.mon_last > ERR_MAX_CURRENT) {
-                setCurrent(0);
-            }
-
             if (i.limit > ERR_MAX_CURRENT) {
-                setCurrentLimit(ERR_MAX_CURRENT);
+                channel_dispatcher::setCurrentLimit(*this, ERR_MAX_CURRENT);
             }
         }
     }

diff --git a/src/eez/modules/psu/psu.cpp b/src/eez/modules/psu/psu.cpp
@@ -798,13 +798,8 @@ void limitMaxCurrent(MaxCurrentLimitCause cause) {
 
         if (isMaxCurrentLimited()) {
             for (int i = 0; i < CH_NUM; ++i) {
-                if (Channel::get(i).isOutputEnabled() &&
-                    Channel::get(i).i.mon_last > ERR_MAX_CURRENT) {
-                    Channel::get(i).setCurrent(Channel::get(i).i.min);
-                }
-
-                if (ERR_MAX_CURRENT < Channel::get(i).getCurrentLimit()) {
-                    Channel::get(i).setCurrentLimit(ERR_MAX_CURRENT);
+                if (Channel::get(i).getCurrentLimit() > ERR_MAX_CURRENT) {
+                    channel_dispatcher::setCurrentLimit(Channel::get(i), ERR_MAX_CURRENT);
                 }
             }
         }