Removed on-the-fly model conversions

This makes no sense for YAML model files, only for BIN models (when YAML is not the format of choice).
This commit is contained in:
Raphael Coeffic
2021-11-10 11:07:03 +01:00
parent 88a9b1c6d9
commit 4a5a0be38c
6 changed files with 57 additions and 34 deletions
+14 -3
View File
@@ -59,7 +59,9 @@ class ModelButton : public Button
void load()
{
#if defined(SDCARD_RAW)
uint8_t version;
#endif
PACK(struct {
ModelHeader header;
@@ -71,17 +73,25 @@ class ModelButton : public Button
if (strncmp(modelCell->modelFilename, g_eeGeneral.currModelFilename,
LEN_MODEL_FILENAME) == 0) {
memcpy(&partialModel.header, &g_model.header, sizeof(partialModel));
#if defined(SDCARD_RAW)
version = EEPROM_VER;
#endif
} else {
#if defined(SDCARD_RAW)
error =
readModel(modelCell->modelFilename, (uint8_t *)&partialModel.header,
sizeof(partialModel), &version);
readModelBin(modelCell->modelFilename, (uint8_t *)&partialModel.header,
sizeof(partialModel), &version);
#else
error = readModel(modelCell->modelFilename,
(uint8_t *)&partialModel.header, sizeof(partialModel));
#endif
}
if (!error) {
if (modelCell->modelName[0] == '\0' &&
partialModel.header.name[0] != '\0') {
#if defined(SDCARD_RAW)
if (version == 219) {
int len = (int)sizeof(partialModel.header.name);
char* str = partialModel.header.name;
@@ -94,6 +104,7 @@ class ModelButton : public Button
str[--len] = '\0';
}
}
#endif
modelCell->setModelName(partialModel.header.name);
}
}