profile recall fixed

eez-open · Jan 28, 2020 · 9f66a16 · 9f66a16
1 parent c95e696
commit 9f66a16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/eez/modules/psu/persist_conf.cpp b/src/eez/modules/psu/persist_conf.cpp
@@ -749,7 +749,7 @@ profile::Parameters *loadProfile(int location) {
         if (location != NUM_PROFILE_LOCATIONS - 1) { // last location is not stored in EEPROM
             profile::Parameters profile;
             if (confRead((uint8_t *)&profile, sizeof(profile::Parameters), getProfileAddress(location), profile::PROFILE_VERSION)) {
-            memcpy(&g_profilesCache[location].profile, &profile, sizeof(profile::Parameters));
+                memcpy(&g_profilesCache[location].profile, &profile, sizeof(profile::Parameters));
             }
         }
         g_profilesCache[location].loaded = true;

diff --git a/src/eez/modules/psu/profile.cpp b/src/eez/modules/psu/profile.cpp
@@ -247,7 +247,7 @@ void recallChannelsFromProfile(Parameters &profile, int location) {
 
         int j = channelsMap[i];
 
-        if (j != -1) {
+        if (profile.channels[j].flags.parameters_are_valid) {
             channel.u.set = MIN(profile.channels[j].u_set, channel.u.max);
             channel.u.step = profile.channels[j].u_step;
             channel.u.limit = MIN(profile.channels[j].u_limit, channel.u.max);