#123

eez-open · Jan 30, 2021 · 1b4269f · 1b4269f
1 parent bb411e7
commit 1b4269f
Show file tree

Hide file tree

Showing 4 changed files with 895 additions and 867 deletions.
diff --git a/src/eez/modules/psu/channel_dispatcher.cpp b/src/eez/modules/psu/channel_dispatcher.cpp
@@ -2119,7 +2119,7 @@ const char *copyChannelToChannel(int srcChannelIndex, int dstChannelIndex) {
 
     channel_dispatcher::setPowerLimit(dstChannel, powerLimit);
 
-    channel_dispatcher::setOvpParameters(dstChannel, srcChannel.prot_conf.flags.u_type, srcChannel.prot_conf.flags.u_state, srcChannel.prot_conf.u_level, srcChannel.prot_conf.u_delay);
+    channel_dispatcher::setOvpParameters(dstChannel, srcChannel.prot_conf.flags.u_state, srcChannel.prot_conf.flags.u_type, srcChannel.prot_conf.u_level, srcChannel.prot_conf.u_delay);
     channel_dispatcher::setOcpParameters(dstChannel, srcChannel.prot_conf.flags.i_state, srcChannel.prot_conf.i_delay);
     channel_dispatcher::setOppParameters(dstChannel, srcChannel.prot_conf.flags.p_state, srcChannel.prot_conf.p_level, srcChannel.prot_conf.p_delay);
 

diff --git a/src/eez/modules/psu/gui/psu.cpp b/src/eez/modules/psu/gui/psu.cpp
@@ -138,8 +138,8 @@ void PsuAppContext::stateManagment() {
 
     if (m_clearTextMessage) {
         m_clearTextMessage = false;
-        if (getActivePageId() == PAGE_ID_TEXT_MESSAGE) {
-            popPage();
+        if (isPageOnStack(PAGE_ID_TEXT_MESSAGE)) {
+            removePageFromStack(PAGE_ID_TEXT_MESSAGE);
             m_textMessage[0] = 0;
         }
     }
@@ -283,14 +283,13 @@ void PsuAppContext::stateManagment() {
 
     if (m_showTextMessage) {
         m_showTextMessage = false;
-        if (getActivePageId() != PAGE_ID_TEXT_MESSAGE) {
+        if (!isPageOnStack(PAGE_ID_TEXT_MESSAGE)) {
             pushPage(PAGE_ID_TEXT_MESSAGE);
         } else {
             ++m_textMessageVersion;
         }
     } else {
-        // clear text message if active page is not PAGE_ID_TEXT_MESSAGE
-        if (getActivePageId() != PAGE_ID_TEXT_MESSAGE && m_textMessage[0]) {
+        if (isPageOnStack(PAGE_ID_TEXT_MESSAGE) && m_textMessage[0]) {
             m_textMessage[0] = 0;
         }
     }