piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Horus] Model selection screen refactoring

Browse Source
This commit is contained in:
Bertrand Songis
2016-03-09 07:06:51 +01:00
parent 797b4d9f1e
commit f75fedcb0d
23 changed files with 375 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/sdcard_raw.cpp
+2 -223
View File
@@ -133,9 +133,6 @@ const char * loadModel(const char * filename)
return error;
}
const char RADIO_SETTINGS_PATH[] = RADIO_PATH "/radio.bin";
const char RADIO_MODELSLIST_PATH[] = RADIO_PATH "/models.txt";
const char * loadGeneralSettings()
{
const char * error = loadFile(RADIO_SETTINGS_PATH, (uint8_t *)&g_eeGeneral, sizeof(g_eeGeneral));
@@ -212,224 +209,7 @@ void storageFormat()
storageCreateModelsList();
}
const char * storageOpenModelsList(StorageModelsList * storage)
{
FRESULT result = f_open(&storage->file, RADIO_MODELSLIST_PATH, FA_OPEN_EXISTING | FA_READ);
if (result != FR_OK) {
return SDCARD_ERROR(result);
}
return NULL;
}
bool storageReadNextLine(StorageModelsList * storage, char * line, int maxlen)
{
char c;
unsigned int read;
int len=0;
while (1) {
FRESULT result = f_read(&storage->file, (uint8_t *)&c, 1, &read);
if (result != FR_OK || read != 1) {
line[len] = '\0';
return false;
}
if (c == '\n') {
if (len > 0) {
// we skip empty lines
line[len] = '\0';
return true;
}
}
else if (c != '\r' && len < maxlen) {
line[len++] = c;
}
}
}
int storageGetCategoryLength(const char * line)
{
int len = strlen(line);
if (len > 2 && line[0] == '[' && line[len-1] == ']') {
return len-2;
}
else {
return 0;
}
}
bool storageReadNextCategory(StorageModelsList * storage, char * line, int maxlen)
{
bool result = true;
while (result) {
result = storageReadNextLine(storage, line, maxlen);
int len = storageGetCategoryLength(line);
if (len > 0) {
memmove(line, &line[1], len);
line[len] = '\0';
return result;
}
}
line[0] = '\0';
return false;
}
bool storageSeekCategory(StorageModelsList * storage, int category)
{
f_lseek(&storage->file, 0);
char line[256] = "";
int result = true;
for (int i=0; result && i<=category; i++) {
result = storageReadNextCategory(storage, line, sizeof(line)-1);
}
return line[0] != '\0';
}
bool storageReadNextModel(StorageModelsList * storage, char * line, int maxlen)
{
bool result = true;
while (result) {
result = storageReadNextLine(storage, line, maxlen);
if (line[0] == '[')
return false;
else if (line[0] != '\0')
return result;
}
line[0] = '\0';
return false;
}
enum StorageOperation {
STORAGE_INSERT_MODEL,
STORAGE_REMOVE_MODEL,
STORAGE_RENAME_MODEL,
STORAGE_INSERT_CATEGORY,
STORAGE_RENAME_CATEGORY,
STORAGE_REMOVE_CATEGORY
};
const char * storageModifyLine(unsigned int operation, int category, int position, const char * name="")
{
StorageModelsList storage;
FIL file;
const char * error = storageOpenModelsList(&storage);
if (error) {
return error;
}
{
FRESULT result = f_open(&file, RADIO_PATH "/models.tmp", FA_CREATE_ALWAYS | FA_WRITE);
if (result != FR_OK) {
return SDCARD_ERROR(result);
}
}
bool operationdone = false;
bool result = true;
int categoryindex = -1;
int modelindex = 0;
while (result) {
char line[256];
result = storageReadNextLine(&storage, line, sizeof(line)-1);
if (!operationdone) {
int len = storageGetCategoryLength(line);
if (len > 0) {
if (category >= 0) {
if (categoryindex == category && operation == STORAGE_INSERT_MODEL) {
f_puts(name, &file);
f_putc('\n', &file);
operationdone = true;
}
categoryindex++;
if (categoryindex == category) {
if (operation == STORAGE_RENAME_CATEGORY) {
f_puts("[", &file);
f_puts(name, &file);
f_puts("]", &file);
f_putc('\n', &file);
operationdone = true;
continue;
}
else if (operation == STORAGE_REMOVE_CATEGORY) {
operationdone = true;
continue;
}
}
}
}
else if (categoryindex == category) {
if (modelindex++ == position) {
operationdone = true;
if (operation == STORAGE_INSERT_MODEL) {
f_puts(name, &file);
f_putc('\n', &file);
}
else if (operation == STORAGE_RENAME_MODEL) {
f_puts(name, &file);
f_putc('\n', &file);
continue;
}
else if (operation == STORAGE_REMOVE_MODEL) {
TRACE("skip %s", line);
continue;
}
}
}
}
f_puts(line, &file);
f_putc('\n', &file);
}
if (!operationdone) {
if (categoryindex>=0 && operation==STORAGE_INSERT_MODEL) {
f_puts(name, &file);
f_putc('\n', &file);
}
else if (operation==STORAGE_INSERT_CATEGORY) {
f_puts("[", &file);
f_puts(name, &file);
f_puts("]", &file);
f_putc('\n', &file);
}
}
f_close(&file);
f_unlink(RADIO_PATH "/models.old");
f_rename(RADIO_MODELSLIST_PATH, RADIO_PATH "/models.old");
f_rename(RADIO_PATH "/models.tmp", RADIO_MODELSLIST_PATH);
return NULL;
}
const char * storageInsertCategory(const char * name, int position)
{
return storageModifyLine(STORAGE_INSERT_CATEGORY, position, -1, name);
}
const char * storageRenameCategory(int category, const char * name)
{
return storageModifyLine(STORAGE_RENAME_CATEGORY, category, -1, name);
}
const char * storageRemoveCategory(int category)
{
return storageModifyLine(STORAGE_REMOVE_CATEGORY, category, -1);
}
const char * storageInsertModel(const char * name, int category, int position)
{
return storageModifyLine(STORAGE_INSERT_MODEL, category, position, name);
}
const char * storageRemoveModel(int category, int position)
{
return storageModifyLine(STORAGE_REMOVE_MODEL, category, position);
}
const char * storageRenameModel(const char * name, int category, int position)
{
return storageModifyLine(STORAGE_RENAME_MODEL, category, position, name);
}
const char * createModel(int category)
const char * createModel()
{
preModelLoad();
@@ -444,11 +224,10 @@ const char * createModel(int category)
storageDirty(EE_GENERAL);
storageDirty(EE_MODEL);
storageCheck(true);
storageInsertModel(filename, category, -1);
}
postModelLoad(true);
return NULL;
return g_eeGeneral.currModelFilename;
}
void storageEraseAll(bool warn)