OVP limit +0.5 if remote programming

eez-open · Jan 14, 2020 · 5efc5ce · 5efc5ce
1 parent a142e1c
commit 5efc5ce
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 21 deletions.
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -12746,7 +12746,7 @@
                     "width": 78,
                     "height": 32,
                     "focusStyle": {
-                      "inheritFrom": "default"
+                      "inheritFrom": "edit_value_active_M_center"
                     },
                     "displayOption": 0
                   },
@@ -12922,7 +12922,7 @@
                             "width": 78,
                             "height": 32,
                             "focusStyle": {
-                              "inheritFrom": "default"
+                              "inheritFrom": "edit_value_active_M_center"
                             },
                             "displayOption": 0
                           },
@@ -12950,7 +12950,7 @@
                             "width": 78,
                             "height": 32,
                             "focusStyle": {
-                              "inheritFrom": "default"
+                              "inheritFrom": "edit_value_active_M_center"
                             },
                             "displayOption": 0
                           }
@@ -12990,7 +12990,7 @@
                             "width": 78,
                             "height": 32,
                             "focusStyle": {
-                              "inheritFrom": "default"
+                              "inheritFrom": "edit_value_active_M_center"
                             },
                             "displayOption": 0
                           },
@@ -13018,7 +13018,7 @@
                             "width": 78,
                             "height": 32,
                             "focusStyle": {
-                              "inheritFrom": "default"
+                              "inheritFrom": "edit_value_active_M_center"
                             },
                             "displayOption": 0
                           }
@@ -13828,7 +13828,7 @@
                     "width": 74,
                     "height": 32,
                     "focusStyle": {
-                      "inheritFrom": "default"
+                      "inheritFrom": "edit_value_active_M_center"
                     },
                     "displayOption": 0
                   },
@@ -13972,7 +13972,7 @@
                 "width": 74,
                 "height": 32,
                 "focusStyle": {
-                  "inheritFrom": "default"
+                  "inheritFrom": "edit_value_active_M_center"
                 },
                 "displayOption": 0
               }
@@ -14487,7 +14487,7 @@
                 "width": 95,
                 "height": 32,
                 "focusStyle": {
-                  "inheritFrom": "default"
+                  "inheritFrom": "edit_value_active_M_center"
                 },
                 "displayOption": 0
               },
@@ -14566,7 +14566,7 @@
                 "width": 95,
                 "height": 32,
                 "focusStyle": {
-                  "inheritFrom": "default"
+                  "inheritFrom": "edit_value_active_M_center"
                 },
                 "displayOption": 0
               },
@@ -14594,7 +14594,7 @@
                 "width": 78,
                 "height": 32,
                 "focusStyle": {
-                  "inheritFrom": "default"
+                  "inheritFrom": "edit_value_active_M_center"
                 },
                 "displayOption": 0
               }
@@ -15027,7 +15027,7 @@
                 "width": 96,
                 "height": 32,
                 "focusStyle": {
-                  "inheritFrom": "default"
+                  "inheritFrom": "edit_value_active_M_center"
                 },
                 "displayOption": 0
               },
@@ -15055,8 +15055,7 @@
                 "width": 96,
                 "height": 32,
                 "focusStyle": {
-                  "inheritFrom": "default",
-                  "padding": 0
+                  "inheritFrom": "edit_value_active_M_center"
                 },
                 "displayOption": 0
               },

diff --git a/src/eez/modules/psu/channel.cpp b/src/eez/modules/psu/channel.cpp
@@ -1007,13 +1007,14 @@ void Channel::doRemoteProgrammingEnable(bool enable) {
     if (enable && !isOk()) {
         return;
     }
+
     flags.rprogEnabled = enable;
-    if (enable) {
-        setVoltageLimit(u.max);
-        setVoltage(u.min);
-        prot_conf.u_level = u.max;
-        prot_conf.flags.u_state = 1;
-    }
+
+    channel_dispatcher::setVoltageLimit(*this, channel_dispatcher::getUMaxLimit(*this));
+    channel_dispatcher::setVoltage(*this, u.min);
+    channel_dispatcher::setOvpLevel(*this, channel_dispatcher::getUMaxOvpLevel(*this));
+    channel_dispatcher::setOvpState(*this, 1);
+
     channelInterface->setRemoteProgramming(subchannelIndex, enable);
     setOperBits(OPER_ISUM_RPROG_ON, enable);
 }

diff --git a/src/eez/modules/psu/channel_dispatcher.cpp b/src/eez/modules/psu/channel_dispatcher.cpp
@@ -531,6 +531,13 @@ float getUMax(const Channel &channel) {
     return channel.u.max;
 }
 
+float getUMaxLimit(const Channel &channel) {
+    if (channel.flags.rprogEnabled) {
+        return getUMax(channel) + 0.5f;    
+    }
+    return getUMax(channel);
+}
+
 float getUMaxOvpLevel(const Channel &channel) {
     return getUMax(channel) + 0.5f;
 }

diff --git a/src/eez/modules/psu/channel_dispatcher.h b/src/eez/modules/psu/channel_dispatcher.h
@@ -60,6 +60,7 @@ float getUMaxLimit(const Channel &channel);
 float getUMin(const Channel &channel);
 float getUDef(const Channel &channel);
 float getUMax(const Channel &channel);
+float getUMaxLimit(const Channel &channel);
 float getUMaxOvpLevel(const Channel &channel);
 float getUProtectionLevel(const Channel &channel);
 void setVoltage(Channel &channel, float voltage);

diff --git a/src/eez/modules/psu/gui/data.cpp b/src/eez/modules/psu/gui/data.cpp
@@ -2383,7 +2383,7 @@ void data_channel_protection_ovp_limit(data::DataOperationEnum operation, data::
     } else if (operation == data::DATA_OPERATION_GET_MIN) {
         value = MakeValue(channel_dispatcher::getUMin(channel), UNIT_VOLT);
     } else if (operation == data::DATA_OPERATION_GET_MAX) {
-        value = MakeValue(channel_dispatcher::getUMax(channel), UNIT_VOLT);
+        value = MakeValue(channel_dispatcher::getUMaxLimit(channel), UNIT_VOLT);
     } else if (operation == data::DATA_OPERATION_SET) {
         channel_dispatcher::setVoltageLimit(channel, value.getFloat());
     } else if (operation == data::DATA_OPERATION_GET_NAME) {

diff --git a/src/eez/modules/psu/gui/page_ch_settings_protection.cpp b/src/eez/modules/psu/gui/page_ch_settings_protection.cpp
@@ -165,7 +165,7 @@ void ChSettingsOvpProtectionPage::pageAlloc() {
 
     origLimit = limit = MakeValue(channel_dispatcher::getULimit(*g_channel), UNIT_VOLT);
     minLimit = channel_dispatcher::getUMin(*g_channel);
-    maxLimit = channel_dispatcher::getUMax(*g_channel);
+    maxLimit = channel_dispatcher::getUMaxLimit(*g_channel);
     defLimit = channel_dispatcher::getUMax(*g_channel);
 
     origLevel = level = MakeValue(channel_dispatcher::getUProtectionLevel(*g_channel), UNIT_VOLT);