#47

eez-open · Aug 27, 2020 · 373e6f4 · 373e6f4
1 parent 01bde48
commit 373e6f4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/eez/modules/psu/channel.cpp b/src/eez/modules/psu/channel.cpp
@@ -537,7 +537,7 @@ float Channel::getSwOvpProtectionLevel() {
 
 bool Channel::checkSwOvpCondition() {
     float uProtectionLevel = getSwOvpProtectionLevel();
-    return channel_dispatcher::getUMonLast(*this) + 0.5 > uProtectionLevel || (flags.rprogEnabled && channel_dispatcher::getUMonDacLast(*this) > uProtectionLevel);
+    return channel_dispatcher::getUMonLast(*this) > uProtectionLevel || (flags.rprogEnabled && channel_dispatcher::getUMonDacLast(*this) > uProtectionLevel);
 }
 
 void Channel::protectionCheck(ProtectionValue &cpv) {

diff --git a/src/eez/modules/psu/list_program.cpp b/src/eez/modules/psu/list_program.cpp
@@ -591,9 +591,12 @@ void tick(uint32_t tick_usec) {
 
             active = true;
 
-            uint32_t tickCount = millis();
-            if (g_execution[i].currentTotalDwellTime <= CONF_COUNTER_THRESHOLD_IN_SECONDS) {
-                tickCount *= 1000;
+            uint32_t tickCount;
+            bool tickCountInMillis = g_execution[i].currentTotalDwellTime > CONF_COUNTER_THRESHOLD_IN_SECONDS;
+            if (tickCountInMillis) {
+                tickCount = millis();
+            } else {
+                tickCount = millis() * 1000;
             }
 
             if (io_pins::isInhibited()) {
@@ -638,9 +641,15 @@ void tick(uint32_t tick_usec) {
                     if (g_execution[i].currentTotalDwellTime > CONF_COUNTER_THRESHOLD_IN_SECONDS) {
                         // ... then count in milliseconds
                         g_execution[i].currentRemainingDwellTime = (uint32_t)round(g_execution[i].currentTotalDwellTime * 1000L);
+                        if (!tickCountInMillis) {
+                            tickCount /= 1000;
+                        }
                     } else {
                         // ... else count in microseconds
                         g_execution[i].currentRemainingDwellTime = (uint32_t)round(g_execution[i].currentTotalDwellTime * 1000000L);
+                        if (tickCountInMillis) {
+                            tickCount *= 1000;
+                        }
                     }
                     g_execution[i].nextPointTime = tickCount + g_execution[i].currentRemainingDwellTime;
                 }