#46

eez-open · Sep 24, 2020 · 1442760 · 1442760
1 parent 2888e60
commit 1442760
Show file tree

Hide file tree

Showing 7 changed files with 47,093 additions and 47,057 deletions.
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -14744,14 +14744,20 @@
                       {
                         "type": "Text",
                         "style": {
-                          "inheritFrom": "status_icon_enabled"
+                          "inheritFrom": "status_bgnd",
+                          "font": "Heydings14",
+                          "alignVertical": "center",
+                          "color": "status_line_text",
+                          "backgroundColor": "status_line_background",
+                          "activeColor": "status_line_background",
+                          "activeBackgroundColor": "status_line_text"
                         },
-                        "action": "show_main_page",
+                        "action": "show_previous_page",
                         "left": 0,
                         "top": 0,
                         "width": 41,
                         "height": 32,
-                        "text": "H"
+                        "text": "E"
                       },
                       {
                         "type": "Text",
@@ -15261,14 +15267,16 @@
                       {
                         "type": "Text",
                         "style": {
-                          "inheritFrom": "status_icon_enabled"
+                          "inheritFrom": "status_title",
+                          "font": "Heydings14",
+                          "alignHorizontal": "center"
                         },
-                        "action": "show_main_page",
+                        "action": "show_previous_page",
                         "left": 0,
                         "top": 0,
                         "width": 41,
                         "height": 32,
-                        "text": "H"
+                        "text": "E"
                       },
                       {
                         "type": "Text",
@@ -15752,14 +15760,16 @@
                       {
                         "type": "Text",
                         "style": {
-                          "inheritFrom": "status_icon_enabled"
+                          "inheritFrom": "status_title",
+                          "font": "Heydings14",
+                          "alignHorizontal": "center"
                         },
-                        "action": "show_main_page",
+                        "action": "show_previous_page",
                         "left": 0,
                         "top": 0,
                         "width": 41,
                         "height": 32,
-                        "text": "H"
+                        "text": "E"
                       },
                       {
                         "type": "Text",

diff --git a/src/eez/firmware.cpp b/src/eez/firmware.cpp
@@ -144,7 +144,6 @@ void boot() {
         g_slots[slotIndex]->enabled = true;
         g_slots[slotIndex]->moduleRevision = moduleRevision;
         g_slots[slotIndex]->firmwareInstalled = firmwareInstalled;
-        g_slots[slotIndex]->boot();
 
         if (g_slots[slotIndex]->moduleType != MODULE_TYPE_NONE) {
             g_slots[slotIndex]->enabled = psu::persist_conf::isSlotEnabled(slotIndex);
@@ -153,6 +152,8 @@ void boot() {
 
             numInstalledModules++;
         }
+
+        g_slots[slotIndex]->boot();
     }
 
     if (numInstalledModules == 1) {

diff --git a/src/eez/gui/document_simulator.cpp b/src/eez/gui/document_simulator.cpp
diff --git a/src/eez/gui/document_simulator.h b/src/eez/gui/document_simulator.h
@@ -2112,4 +2112,4 @@ enum PagesEnum {
     PAGE_ID_DIB_DCM224_SLOT_MICRO_2CH_OFF = 246
 };
 
-extern const uint8_t assets[533118];
+extern const uint8_t assets[533105];