Use simple scheme with direct model slot to model filename

2021-11-10 11:07:00 +01:00
parent 96b256cbdb
commit c696313a4e
21 changed files with 284 additions and 659 deletions
@@ -1419,10 +1419,11 @@ void menuModelSetup(event_t event)
                }
                else if (event == EVT_KEY_LONG(KEY_ENTER)) {
                  killEvents(event);
-#if defined(EEPROM)
-                  uint8_t newVal = findNextUnusedModelId(g_eeGeneral.currModel, moduleIdx);
+                  uint8_t newVal = 0;
+#if defined(STORAGE_MODELSLIST)
+                  newVal = modelslist.findNextUnusedModelId(moduleIdx);
 #else
-                  uint8_t newVal = modelslist.findNextUnusedModelId(moduleIdx);
+                  newVal = findNextUnusedModelId(g_eeGeneral.currModel, moduleIdx);
 #endif
                  if (newVal != g_model.header.modelId[moduleIdx]) {
                    modelHeaders[g_eeGeneral.currModel].modelId[moduleIdx] = g_model.header.modelId[moduleIdx] = newVal;