#53

Author: mvladic

src/eez/modules/psu/gui/page.h

@@ -36,6 +36,8 @@ enum ToastType {
 };
 
 class ToastMessagePage : public InternalPage {
+    friend class PsuAppContext;
+
     static ToastMessagePage *findFreePage();
 
 public:

src/eez/modules/psu/gui/psu.cpp

@@ -30,6 +30,8 @@
 #include <eez/hmi.h>
 #include <eez/keyboard.h>
 
+#include <eez/scpi/regs.h>
+
 #include <eez/modules/psu/psu.h>
 #include <eez/modules/psu/calibration.h>
 #include <eez/modules/psu/channel_dispatcher.h>
@@ -317,6 +319,32 @@ void PsuAppContext::stateManagment() {
             m_asyncOperationInProgressParams.checkStatus();
         }
     }
+
+    //
+    if (getActivePageId() == INTERNAL_PAGE_ID_TOAST_MESSAGE) {
+        ToastMessagePage *page = (ToastMessagePage *)getActivePage();
+        if (page->messageValue.getType() == VALUE_TYPE_EVENT_MESSAGE) {
+
+            int16_t eventId = page->messageValue.getFirstInt16();
+            int channelIndex = page->messageValue.getSecondInt16();
+
+            bool dismissPage = false;
+            
+            if (eventId == event_queue::EVENT_ERROR_CH_OVP_TRIPPED) {
+                dismissPage = !eez::scpi::is_ques_bit_enabled(channelIndex, QUES_ISUM_OVP);
+            } else if (eventId == event_queue::EVENT_ERROR_CH_OCP_TRIPPED) {
+                dismissPage = !eez::scpi::is_ques_bit_enabled(channelIndex, QUES_ISUM_OCP);
+            } else if (eventId == event_queue::EVENT_ERROR_CH_OPP_TRIPPED) {
+                dismissPage = !eez::scpi::is_ques_bit_enabled(channelIndex, QUES_ISUM_OPP);
+            } else if (eventId == event_queue::EVENT_ERROR_CH_REMOTE_SENSE_REVERSE_POLARITY_DETECTED) {
+                dismissPage = !eez::scpi::is_ques_bit_enabled(channelIndex, QUES_ISUM_RPOL);
+            }
+
+            if (dismissPage) {
+                popPage();
+            }
+        }
+    }
 }
 
 bool PsuAppContext::isActiveWidget(const WidgetCursor &widgetCursor) {

src/eez/scpi/regs.cpp

@@ -280,6 +280,25 @@ void reg_set_ques_isum_bit(int iChannel, int bit_mask, bool on) {
 #endif
 }
 
+bool is_ques_bit_enabled(int channelIndex, int bit_mask) {
+    if (serial::g_testResult == TEST_OK) {
+        scpi_reg_val_t val = reg_get(&serial::g_scpiContext, (scpi_psu_reg_name_t)(SCPI_PSU_CH_REG_QUES_INST_ISUM_EVENT1 + channelIndex));
+        if (!(val & bit_mask)) {
+            return false;
+        }
+    }
+#if OPTION_ETHERNET
+    if (ethernet::g_testResult == TEST_OK) {
+        scpi_reg_val_t val = reg_get(&ethernet::g_scpiContext, (scpi_psu_reg_name_t)(SCPI_PSU_CH_REG_QUES_INST_ISUM_EVENT1 + channelIndex));
+        if (!(val & bit_mask)) {
+            return false;
+        }
+    }
+#endif
+
+    return true;
+}
+
 void reg_set_oper_bit(scpi_t *context, int bit_mask, bool on) {
     scpi_reg_val_t val = reg_get(context, SCPI_PSU_REG_OPER_COND);
     if (on) {

src/eez/scpi/regs.h

@@ -116,6 +116,7 @@ void reg_set_esr_bits(int bit_mask);
 
 void reg_set_ques_bit(int bit_mask, bool on);
 void reg_set_ques_isum_bit(int iChannel /* zero based */, int bit_mask, bool on);
+bool is_ques_bit_enabled(int channelIndex, int bit_mask);
 
 void reg_set_oper_bit(int bit_mask, bool on);