profiles handling redesign

Author: mvladic

modular-psu-firmware.eez-project

@@ -1487,11 +1487,6 @@
       "type": "string",
       "defaultValue": "Default"
     },
-    {
-      "name": "profile_dirty",
-      "type": "boolean",
-      "defaultValue": "1"
-    },
     {
       "name": "channel_title",
       "type": "string",
@@ -17352,7 +17347,7 @@
             "action": "channel_lists_clear_column",
             "left": 12,
             "top": 44,
-            "width": 292,
+            "width": 304,
             "height": 32,
             "text": "Clear column from cursor down",
             "enabled": "channel_lists_clear_column_enabled",
@@ -17397,9 +17392,9 @@
           }
         ],
         "closePageIfTouchedOutside": true,
-        "left": 123,
+        "left": 119,
         "top": 88,
-        "width": 316,
+        "width": 324,
         "height": 152
       },
       {
@@ -21308,7 +21303,8 @@
           {
             "type": "MultilineText",
             "style": {
-              "inheritFrom": "icon_and_text_S"
+              "inheritFrom": "icon_and_text_S",
+              "alignHorizontal": "center"
             },
             "data": "",
             "action": "edit_system_password",

src/eez/firmware.cpp

@@ -273,17 +273,14 @@ bool testMaster() {
 bool test() {
     bool testResult = true;
 
-    psu::profile::saveAtLocation(10);
-    bool wasSaveProfileEnabled = psu::profile::enableSave(false);
+    psu::profile::saveToLocation(10);
     psu::psuReset();
 
     testResult &= testMaster();
 
     testResult &= psu::testChannels();
 
-    psu::profile::enableSave(wasSaveProfileEnabled);
-    int err;
-    psu::profile::recall(10, &err);
+    psu::profile::recallFromLocation(10);
 
     if (!testResult) {
         sound::playBeep();
@@ -300,12 +297,7 @@ bool reset() {
         return true;
     }
 
-    if (psuReset()) {
-        profile::save();
-        return true;
-    }
-
-    return false;
+    return psuReset();
 }
 
 void standBy() {
@@ -332,12 +324,10 @@ void shutdown() {
 
     g_shutdownInProgress = true;
 
+    profile::shutdownSave();
+
     if (psu::isPowerUp()) {
-    	profile::saveIfDirty();
-    	profile::enableSave(false);
     	psu::changePowerState(false);
-    } else {
-    	profile::saveIfDirty();
     }
 
     osDelay(50);

src/eez/gui/action_impl.cpp

@@ -420,7 +420,6 @@ void action_ch_settings_prot_toggle_type() {
     } else {
         selectChannel();
         channel_dispatcher::setOvpType(*g_channel, g_channel->prot_conf.flags.u_type ? 0 : 1);
-        profile::save();
     }
 }
 
@@ -502,11 +501,11 @@ void action_profile_toggle_is_auto_recall_location() {
 }
 
 void action_profile_recall() {
-    ((UserProfilesPage *)getActivePage())->recall();
+    ((UserProfilesPage *)getActivePage())->recallProfile();
 }
 
 void action_profile_save() {
-    ((UserProfilesPage *)getActivePage())->save();
+    ((UserProfilesPage *)getActivePage())->saveProfile();
 }
 
 void action_profile_import() {

src/eez/gui/app_context.cpp

@@ -48,7 +48,7 @@ AppContext::AppContext() {
 
 void AppContext::stateManagment() {
     // remove alert message after period of time
-    uint32_t inactivityPeriod = psu::idle::getGuiAndEncoderInactivityPeriod();
+    uint32_t inactivityPeriod = psu::idle::getHmiInactivityPeriod();
     if (getActivePageId() == INTERNAL_PAGE_ID_TOAST_MESSAGE) {
         ToastMessagePage *page = (ToastMessagePage *)getActivePage();
         if (!page->hasAction() && inactivityPeriod >= CONF_GUI_TOAST_DURATION_MS) {
@@ -131,7 +131,7 @@ Page *AppContext::getActivePage() {
 
 void AppContext::onPageChanged(int previousPageId, int activePageId) {
     eez::mcu::display::turnOn();
-    psu::idle::noteGuiActivity();
+    psu::idle::noteHmiActivity();
 }
 
 void AppContext::doShowPage(int pageId, Page *page, int previousPageId) {

src/eez/gui/data.h

@@ -153,7 +153,7 @@ struct Value {
     {
     }
 
-    typedef float (*YtDataGetValueFunctionPointer)(int rowIndex, int columnIndex, float *max);
+    typedef float (*YtDataGetValueFunctionPointer)(uint32_t rowIndex, uint8_t columnIndex, float *max);
 
     Value(YtDataGetValueFunctionPointer ytDataGetValueFunctionPointer)
         : type_(VALUE_TYPE_YT_DATA_GET_VALUE_FUNCTION_POINTER), pVoid_((void *)ytDataGetValueFunctionPointer)