dac test for U_SET enabled

eez-open · Oct 3, 2019 · 050c722 · 050c722
1 parent 2788d05
commit 050c722
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/eez/modules/dcpX05/channel.cpp b/src/eez/modules/dcpX05/channel.cpp
@@ -377,17 +377,19 @@ struct Channel : ChannelInterface {
 	void setDacVoltageFloat(int subchannelIndex, float value) {
 		psu::Channel &channel = psu::Channel::getBySlotIndex(slotIndex);
 
-		if (channel.isOutputEnabled()) {
-			if (value < uSet) {
-				fallingEdge = true;
-				if (g_slots[slotIndex].moduleType == MODULE_TYPE_DCP405) {
-					if (channel.prot_conf.flags.u_state && channel.prot_conf.flags.u_type) {
-						// deactivate HW OVP
-						ioexp.changeBit(IOExpander::DCP405_IO_BIT_OUT_OVP_ENABLE, false);
-					}
-				}
-			}
+        if (channel.isOutputEnabled()) {
+            if (value < uSet) {
+                fallingEdge = true;
+                if (g_slots[slotIndex].moduleType == MODULE_TYPE_DCP405) {
+                    if (channel.prot_conf.flags.u_state && channel.prot_conf.flags.u_type) {
+                        // deactivate HW OVP
+                        ioexp.changeBit(IOExpander::DCP405_IO_BIT_OUT_OVP_ENABLE, false);
+                    }
+                }
+            }
+        }
 
+        if (channel.isOutputEnabled() || isDacTesting(subchannelIndex)) {
 			dac.setVoltage(value);
 		}
 

diff --git a/src/eez/modules/dcpX05/dac.cpp b/src/eez/modules/dcpX05/dac.cpp
@@ -98,7 +98,7 @@ bool DigitalAnalogConverter::test(IOExpander &ioexp, AnalogDigitalConverter &adc
     float uMon = channel.u.mon_dac_last;
     float uDiff = uMon - uSet;
     if (fabsf(uDiff) > uSet * DAC_TEST_TOLERANCE / 100) {
-        // g_testResult = TEST_FAILED;
+        g_testResult = TEST_FAILED;
 
         // DebugTrace("Ch%d DAC test, U_set failure: expected=%d, got=%d, abs diff=%d",
         //     channel.channelIndex + 1,
@@ -135,7 +135,11 @@ bool DigitalAnalogConverter::test(IOExpander &ioexp, AnalogDigitalConverter &adc
     m_testing = false;
 #endif
 
-return g_testResult != TEST_FAILED;
+#if defined(EEZ_PLATFORM_SIMULATOR)
+    g_testResult = TEST_OK;
+#endif
+
+    return g_testResult != TEST_FAILED;
 }
 
 ////////////////////////////////////////////////////////////////////////////////