fix(color): play startup 'hello' audio before Lua widgets (#7096)

This commit is contained in:
philmoz
2026-02-18 16:52:24 +10:00
committed by GitHub
parent 0df8d8650f
commit 2e609d8223
8 changed files with 28 additions and 47 deletions
+5 -31
View File
@@ -166,22 +166,19 @@ const char * createModel()
storageDirty(EE_GENERAL);
storageDirty(EE_MODEL);
storageCheck(true);
#if defined(COLORLCD)
// Default layout loaded when setting model defaults - neeed to remove it.
LayoutFactory::deleteCustomScreens(true);
#endif
}
postModelLoad(false);
return g_eeGeneral.currModelFilename;
}
#endif
const char* loadModel(char* filename, bool alarms)
const char* loadModel(const char* filename, bool alarms, const char* filePath)
{
preModelLoad();
const char* error = readModel(filename, (uint8_t*)&g_model, sizeof(g_model));
const char* error = readModel(filename, (uint8_t*)&g_model, sizeof(g_model), filePath);
if (error) {
TRACE("loadModel error=%s", error);
@@ -191,32 +188,10 @@ const char* loadModel(char* filename, bool alarms)
applyDefaultTemplate();
storageCheck(true);
postModelLoad(false);
return error;
}
postModelLoad(alarms);
return nullptr;
}
const char* loadModelTemplate(const char* fileName, const char* filePath)
{
preModelLoad();
// Assuming that the template is located in current working directory
const char* error = readModel(fileName, (uint8_t*)&g_model, sizeof(g_model), filePath);
if (error) {
TRACE("loadModel error=%s", error);
// just get some clean memory state in "g_model" so the mixer can run safely
memset(&g_model, 0, sizeof(g_model));
applyDefaultTemplate();
storageCheck(true);
postModelLoad(false);
return error;
}
postModelLoad(false);
return nullptr;
postModelLoad(error ? false : alarms);
return error;
}
void storageReadAll()
@@ -288,4 +263,3 @@ void checkModelIdUnique(uint8_t index, uint8_t module)
//TODO
}
#endif
+1 -2
View File
@@ -36,8 +36,7 @@ const char* writeFileYaml(const char* path, const YamlNode* root_node, uint8_t*
void getModelPath(char * path, const char * filename, const char* pathName = MODELS_PATH);
const char * readModel(const char * filename, uint8_t * buffer, uint32_t size, const char* pathName = MODELS_PATH);
const char * loadModel(char * filename, bool alarms=true);
const char * loadModelTemplate(const char* fileName, const char* filePath);
const char * loadModel(const char * filename, bool alarms = true, const char* filePath = MODELS_PATH);
const char * createModel();
const char * writeModel();
+1 -7
View File
@@ -73,9 +73,6 @@ void preModelLoad()
}
stopTrainer();
#if defined(COLORLCD)
LayoutFactory::deleteCustomScreens(true);
#endif
if (needDelay) {
sleep_ms(200);
@@ -305,10 +302,7 @@ if(g_model.rssiSource) {
referenceModelAudioFiles();
#if defined(COLORLCD)
LayoutFactory::loadCustomScreens();
ViewMain::instance()->show(true);
#else
#if !defined(COLORLCD)
LOAD_MODEL_BITMAP();
#endif