Use simple scheme with direct model slot to model filename
This commit is contained in:
+15
-4
@@ -1188,12 +1188,23 @@ bool zexist(const char *str, uint8_t size);
|
||||
unsigned int effectiveLen(const char * str, unsigned int size);
|
||||
char * strcat_zchar(char *dest, const char *name, uint8_t size, const char spaceSym = 0, const char *defaultName=nullptr, uint8_t defaultNameSize=0, uint8_t defaultIdx=0);
|
||||
#define strcatFlightmodeName(dest, idx) strcat_zchar(dest, g_model.flightModeData[idx].name, LEN_FLIGHT_MODE_NAME, 0, STR_FM, PSIZE(TR_FM), idx+1)
|
||||
#if defined(EEPROM)
|
||||
#define strcat_modelname(dest, idx) strcat_zchar(dest, modelHeaders[idx].name, LEN_MODEL_NAME, 0, STR_MODEL, PSIZE(TR_MODEL), idx+1)
|
||||
#define strcat_currentmodelname(dest, foo) strcat_modelname(dest, g_eeGeneral.currModel)
|
||||
|
||||
#if !defined(STORAGE_MODELSLIST)
|
||||
|
||||
#define strcat_modelname(dest, idx) \
|
||||
strcat_zchar(dest, modelHeaders[idx].name, LEN_MODEL_NAME, 0, STR_MODEL, \
|
||||
PSIZE(TR_MODEL), idx + 1)
|
||||
|
||||
#define strcat_currentmodelname(dest, foo) \
|
||||
strcat_modelname(dest, g_eeGeneral.currModel)
|
||||
|
||||
#else
|
||||
#define strcat_currentmodelname(dest, spaceSym) strcat_zchar(dest, g_model.header.name, LEN_MODEL_NAME, spaceSym)
|
||||
|
||||
#define strcat_currentmodelname(dest, spaceSym) \
|
||||
strcat_zchar(dest, g_model.header.name, LEN_MODEL_NAME, spaceSym)
|
||||
|
||||
#endif
|
||||
|
||||
#define ZLEN(s) zlen(s, sizeof(s))
|
||||
#define ZEXIST(s) zexist(s, sizeof(s))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user