#275

eez-open · Oct 25, 2021 · 22a3de5 · 22a3de5
1 parent 7583073
commit 22a3de5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/eez/modules/psu/calibration.cpp b/src/eez/modules/psu/calibration.cpp
@@ -109,11 +109,15 @@ void Value::setDacValue(float value) {
         }
     } else {
         if (channel) {
-            channel_dispatcher::setCurrent(*channel, value);
             if (type == CALIBRATION_VALUE_I_HI_RANGE) {
+                channel_dispatcher::setCurrent(*channel, value);
                 channel_dispatcher::setVoltage(*channel, channel->params.I_CAL_U_SET);
             } else {
+                // prevent false power fault detection (#275)
+                channel_dispatcher::setCurrent(*channel, 0.015);
                 channel_dispatcher::setVoltage(*channel, channel->params.I_LOW_RANGE_CAL_U_SET);
+                osDelay(3);
+                channel_dispatcher::setCurrent(*channel, value);
             }
         } else {
             channel_dispatcher::setCurrent(editor.m_slotIndex, editor.m_subchannelIndex, value, nullptr);
@@ -375,6 +379,7 @@ void CalibrationEditor::doStart() {
         channel_dispatcher::outputEnable(*channel, false);
         channel_dispatcher::setVoltage(*channel, channel->u.min);
         channel_dispatcher::setCurrent(*channel, channel->i.min);
+        m_savedCurrentRangeSelectionMode = channel->getCurrentRangeSelectionMode();
     } else {
         g_slots[m_slotIndex]->outputEnable(m_subchannelIndex, false, nullptr);
         channel_dispatcher::setVoltage(m_slotIndex, m_subchannelIndex, channel_dispatcher::getVoltageMinValue(m_slotIndex, m_subchannelIndex), nullptr);
@@ -457,6 +462,7 @@ void CalibrationEditor::stop() {
         channel_dispatcher::outputEnable(*channel, false);
         channel_dispatcher::setVoltage(*channel, channel->u.min);
         channel_dispatcher::setCurrent(*channel, channel->i.min);
+        channel->setCurrentRangeSelectionMode(m_savedCurrentRangeSelectionMode);
     } else {
         if (g_slots[m_slotIndex]->isVoltageCalibrationExists(m_subchannelIndex)) {
             g_slots[m_slotIndex]->enableVoltageCalibration(m_subchannelIndex, true);

diff --git a/src/eez/modules/psu/calibration.h b/src/eez/modules/psu/calibration.h
@@ -136,6 +136,7 @@ class CalibrationEditor : public CalibrationBase {
 
     Value m_voltageValue = Value(*this, CALIBRATION_VALUE_U);
 
+    CurrentRangeSelectionMode m_savedCurrentRangeSelectionMode;
     int8_t m_currentRangeSelected = 0;
     Value m_currentsValue[2] = {
         Value(*this, CALIBRATION_VALUE_I_HI_RANGE),

diff --git a/src/eez/modules/psu/gui/channel_calibration.cpp b/src/eez/modules/psu/gui/channel_calibration.cpp
@@ -421,6 +421,8 @@ void ChSettingsCalibrationEditPage::setCalibrationValueType(CalibrationValueType
                     channel_dispatcher::setVoltage(*channel, g_channel->params.I_CAL_U_SET);
                 } else {
                     channel_dispatcher::setVoltage(*channel, g_channel->params.I_LOW_RANGE_CAL_U_SET);
+                    // prevent false power fault detection (#275)
+                    osDelay(3);
                 }
             }
         }