#40

eez-open · Jul 23, 2020 · 9bddaf8 · 9bddaf8
1 parent 5645a1d
commit 9bddaf8
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 15 deletions.
diff --git a/src/eez/firmware.cpp b/src/eez/firmware.cpp
@@ -124,6 +124,7 @@ void boot() {
 
     psu::ontime::g_mcuCounter.init();
 
+    int numInstalledModules = 0;
     for (uint8_t slotIndex = 0; slotIndex < NUM_SLOTS; slotIndex++) {
         static const uint16_t ADDRESS = 0;
         uint16_t value[3];
@@ -142,6 +143,42 @@ void boot() {
         if (moduleType != MODULE_TYPE_NONE) {
             psu::persist_conf::loadModuleConf(slotIndex);
             psu::ontime::g_moduleCounters[slotIndex].init();
+
+            numInstalledModules++;
+        }
+    }
+
+    if (numInstalledModules == 1) {
+        g_isCol2Mode = true;
+
+        if (g_slots[0]->moduleInfo->moduleType == MODULE_TYPE_NONE) {
+            int i;
+            for (i = 1; i < NUM_SLOTS; i++) {
+                if (g_slots[i]->moduleInfo->moduleType != MODULE_TYPE_NONE) {
+                    g_slotIndexes[0] = i - 1;
+                    g_slotIndexes[1] = i;
+                    break;
+                }
+            }
+
+            int k = 0;
+            for (int j = 0; j < i - 1; j++) {
+                g_slotIndexes[k++] = j;
+            }
+            for (int j = i + 1; j < NUM_SLOTS; j++) {
+                g_slotIndexes[k++] = j;
+            }
+        }
+    } else if (numInstalledModules == 2)  {
+        g_isCol2Mode = true;
+
+        int j = 0;
+        for (int i = 0; i < NUM_SLOTS; i++) {
+            if (g_slots[i]->moduleInfo->moduleType != MODULE_TYPE_NONE) {
+                g_slotIndexes[j++] = i;
+            } else {
+                g_slotIndexes[2] = i;
+            }
         }
     }
 

diff --git a/src/eez/index.cpp b/src/eez/index.cpp
@@ -34,6 +34,9 @@
 
 namespace eez {
 
+bool g_isCol2Mode = false;
+int g_slotIndexes[3] = { 0, 1, 2 };
+
 ModuleInfo::ModuleInfo(uint16_t moduleType_, uint16_t moduleCategory_, const char *moduleName_, const char *moduleBrand_, uint16_t latestModuleRevision_, FlashMethod flashMethod_, uint32_t flashDuration_, uint32_t spiBaudRatePrescaler_, bool spiCrcCalculationEnable_)
     : moduleType(moduleType_)
     , moduleCategory(moduleCategory_)

diff --git a/src/eez/index.h b/src/eez/index.h
@@ -101,4 +101,7 @@ ModuleInfo *getModuleInfo(uint16_t moduleType);
 
 void getModuleSerialInfo(uint8_t slotIndex, char *text);
 
+extern bool g_isCol2Mode;
+extern int g_slotIndexes[NUM_SLOTS];
+
 } // namespace eez
diff --git a/src/eez/modules/psu/gui/data.cpp b/src/eez/modules/psu/gui/data.cpp
@@ -1420,15 +1420,9 @@ void data_channels_is_max_view(DataOperationEnum operation, Cursor cursor, Value
     }
 }
 
-bool is2ColMode() {
-    return g_slots[0]->moduleInfo->moduleType != MODULE_TYPE_NONE &&
-        g_slots[1]->moduleInfo->moduleType != MODULE_TYPE_NONE &&
-        g_slots[2]->moduleInfo->moduleType == MODULE_TYPE_NONE;
-}
-
 void data_channels_is_2col_view(DataOperationEnum operation, Cursor cursor, Value &value) {
     if (operation == DATA_OPERATION_GET) {
-        value = is2ColMode();
+        value = g_isCol2Mode;
     }
 }
 
@@ -1531,15 +1525,15 @@ void data_slot_channel_index(int slotIndex, DataOperationEnum operation, Cursor
 }
 
 void data_slot1_channel_index(DataOperationEnum operation, Cursor cursor, Value &value) {
-    data_slot_channel_index(0, operation, cursor, value);
+    data_slot_channel_index(g_slotIndexes[0], operation, cursor, value);
 }
 
 void data_slot2_channel_index(DataOperationEnum operation, Cursor cursor, Value &value) {
-    data_slot_channel_index(1, operation, cursor, value);
+    data_slot_channel_index(g_slotIndexes[1], operation, cursor, value);
 }
 
 void data_slot3_channel_index(DataOperationEnum operation, Cursor cursor, Value &value) {
-    data_slot_channel_index(2, operation, cursor, value);
+    data_slot_channel_index(g_slotIndexes[2], operation, cursor, value);
 }
 
 void data_slot_max_channel_index(DataOperationEnum operation, Cursor cursor, Value &value) {
@@ -1571,20 +1565,20 @@ void data_slot_min2_channel_index(DataOperationEnum operation, Cursor cursor, Va
 
 void data_slot_default_view(int slotIndex, DataOperationEnum operation, Cursor cursor, Value &value) {
     if (operation == DATA_OPERATION_GET) {
-        value = getSlotView(is2ColMode() ? SLOT_VIEW_TYPE_DEFAULT_2COL : SLOT_VIEW_TYPE_DEFAULT, slotIndex, cursor);
+        value = getSlotView(g_isCol2Mode ? SLOT_VIEW_TYPE_DEFAULT_2COL : SLOT_VIEW_TYPE_DEFAULT, slotIndex, cursor);
     }
 }
 
 void data_slot1_default_view(DataOperationEnum operation, Cursor cursor, Value &value) {
-    data_slot_default_view(0, operation, cursor, value);
+    data_slot_default_view(g_slotIndexes[0], operation, cursor, value);
 }
 
 void data_slot2_default_view(DataOperationEnum operation, Cursor cursor, Value &value) {
-    data_slot_default_view(1, operation, cursor, value);
+    data_slot_default_view(g_slotIndexes[1], operation, cursor, value);
 }
 
 void data_slot3_default_view(DataOperationEnum operation, Cursor cursor, Value &value) {
-    data_slot_default_view(2, operation, cursor, value);
+    data_slot_default_view(g_slotIndexes[2], operation, cursor, value);
 }
 
 void data_slot_max_view(DataOperationEnum operation, Cursor cursor, Value &value) {
@@ -1635,7 +1629,7 @@ void data_slot_def_2ch_view(DataOperationEnum operation, Cursor cursor, Value &v
     if (operation == DATA_OPERATION_GET) {
         Channel &channel = Channel::get(cursor);
         int isVert = persist_conf::devConf.channelsViewMode == CHANNELS_VIEW_MODE_NUMERIC || persist_conf::devConf.channelsViewMode == CHANNELS_VIEW_MODE_VERT_BAR;
-        if (is2ColMode()) {
+        if (g_isCol2Mode) {
             value = channel.isOutputEnabled() ? 
                 (isVert ? PAGE_ID_SLOT_DEF_2CH_VERT_ON_2COL : PAGE_ID_SLOT_DEF_2CH_HORZ_ON_2COL) :
                 (isVert ? PAGE_ID_SLOT_DEF_2CH_VERT_OFF_2COL : PAGE_ID_SLOT_DEF_2CH_HORZ_OFF_2COL);