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

Merge branch 'next' into bsongis/Issue713_more_custom_functions

Browse Source
This commit is contained in:
Bertrand Songis
2014-02-19 15:24:51 +01:00
parent 271fe6804d 3340a18461
commit 5a7fda2f81
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -1,2 +1,2 @@
/.project
/.*project
/.settings
radio/src/gui/menus.cpp
+2 -2
View File
@@ -778,7 +778,7 @@ bool check(check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t
vertpos_t realPgOfs = s_pgOfs;
vertpos_t realMaxrow = maxrow;
for (vertpos_t i=1; i<=maxrow; i++) {
if (horTab[i] == HIDDEN_ROW) {
if (MAXCOL_RAW(i) == HIDDEN_ROW) {
realMaxrow--;
if (i < l_posVert)
realPosVert--;
@@ -790,7 +790,7 @@ bool check(check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t
else if (realPosVert<1+realPgOfs) realPgOfs = realPosVert-1;
s_pgOfs = realPgOfs;
for (vertpos_t i=1; i<=realPgOfs; i++) {
if (horTab[i] == HIDDEN_ROW) {
if (MAXCOL_RAW(i) == HIDDEN_ROW) {
s_pgOfs++;
}
}
radio/src/simpgmspace.cpp
+5 -2
View File
@@ -551,9 +551,11 @@ FRESULT f_readdir (DIR * rep, FILINFO * fil)
fil->fattrib = (ent->d_type == DT_DIR ? AM_DIR : 0);
#else
if (ent->d_type == simu::DT_UNKNOWN) {
fil->fattrib = 0;
struct stat buf;
lstat(ent->d_name, &buf);
fil->fattrib = (S_ISDIR(buf.st_mode) ? AM_DIR : 0);
if (stat(ent->d_name, &buf) == 0) {
fil->fattrib = (S_ISDIR(buf.st_mode) ? AM_DIR : 0);
}
}
else {
fil->fattrib = (ent->d_type == simu::DT_DIR ? AM_DIR : 0);
@@ -564,6 +566,7 @@ FRESULT f_readdir (DIR * rep, FILINFO * fil)
memset(fil->lfname, 0, SD_SCREEN_FILE_LENGTH);
strncpy(fil->fname, ent->d_name, 13-1);
strcpy(fil->lfname, ent->d_name);
// TRACE("f_readdir(): %s", fil->fname);
return FR_OK;
}