#74

eez-open · Oct 19, 2020 · 4be53be · 4be53be
1 parent 2593f51
commit 4be53be
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/src/eez/modules/dib-dcp405/dib-dcp405.cpp b/src/eez/modules/dib-dcp405/dib-dcp405.cpp
@@ -457,7 +457,16 @@ struct DcpChannel : public Channel {
 		}
 	}
 
+	bool shouldDisableDP() {
+		// disable DP if low current range and current of 10 mA or less is set
+		return flags.currentCurrentRange == 1 && i.set <= 10E-3f;
+	}
+
 	void setDpEnable(bool enable) {
+		if (enable && shouldDisableDP()) {
+			return;
+		}
+
 		// DP bit is active low
 		ioexp.changeBit(IOExpander::IO_BIT_OUT_DP_ENABLE, !enable);
 
@@ -651,6 +660,18 @@ struct DcpChannel : public Channel {
 	}
 
 	void setDacCurrentFloat(float value) override {
+		if (isOk() && ioexp.testBit(IOExpander::IO_BIT_OUT_OUTPUT_ENABLE) && flags.dprogState == DPROG_STATE_ON) {
+			if (dpOn) {
+				if (shouldDisableDP()) {
+					setDpEnable(false);
+				}
+			} else {
+				if (!shouldDisableDP()) {
+					setDpEnable(true);
+				}
+			}
+		}
+
 		dac.setCurrent(value);
 		iBeforeBalancing = NAN;
 		restoreVoltageToValueBeforeBalancing(*this);