#106

eez-open · Nov 9, 2020 · 6ffe321 · 6ffe321
1 parent 4acf6d0
commit 6ffe321
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/eez/modules/psu/channel.cpp b/src/eez/modules/psu/channel.cpp
@@ -798,6 +798,14 @@ float Channel::getCurrentResolution(float value) const {
     return precision;
 }
 
+float Channel::getCurrentResolution() const {
+    if (flags.currentCurrentRange == CURRENT_RANGE_LOW) {
+        return calibration::g_editor.isEnabled() ? params.I_LOW_RESOLUTION_DURING_CALIBRATION : params.I_LOW_RESOLUTION; // 5uA
+    }
+
+    return  calibration::g_editor.isEnabled() ? params.I_RESOLUTION_DURING_CALIBRATION : params.I_RESOLUTION; // 0.5mA
+}
+
 float Channel::getPowerResolution() const {
     return params.P_RESOLUTION; // 1 mW;
 }
@@ -854,15 +862,15 @@ void Channel::addIMonAdcValue(float value) {
         value = 0;
     }
 
-    i.addMonValue(value, getCurrentResolution(value));
+    i.addMonValue(value, getCurrentResolution());
 }
 
 void Channel::addUMonDacAdcValue(float value) {
     u.addMonDacValue(value, getVoltageResolution());
 }
 
 void Channel::addIMonDacAdcValue(float value) {
-    i.addMonDacValue(value, getCurrentResolution(value));
+    i.addMonDacValue(value, getCurrentResolution());
 }
 
 void Channel::onAdcData(AdcDataType adcDataType, float value) {

diff --git a/src/eez/modules/psu/channel.h b/src/eez/modules/psu/channel.h
@@ -584,6 +584,7 @@ struct Channel {
 
     float getVoltageResolution() const;
     float getCurrentResolution(float value) const;
+    float getCurrentResolution() const;
     float getPowerResolution() const;
 
     bool isMicroAmperAllowed() const;