|
@@ -46,11 +46,7 @@ public:
|
46
|
46
|
#ifdef SDCARD_SORT_ALPHA
|
47
|
47
|
void presort();
|
48
|
48
|
void flush_presort();
|
49
|
|
-<<<<<<< HEAD
|
50
|
49
|
void getfilename_sorted(const uint16_t nr);
|
51
|
|
-=======
|
52
|
|
- void getfilename_sorted(const uint8_t nr);
|
53
|
|
->>>>>>> SD Card Alpha Sorting
|
54
|
50
|
#endif
|
55
|
51
|
|
56
|
52
|
|
|
@@ -64,37 +60,22 @@ public:
|
64
|
60
|
public:
|
65
|
61
|
bool saving;
|
66
|
62
|
bool logging;
|
67
|
|
-<<<<<<< HEAD
|
68
|
63
|
bool sdprinting;
|
69
|
64
|
bool cardOK;
|
70
|
65
|
char filename[FILENAME_LENGTH];
|
71
|
66
|
char longFilename[LONG_FILENAME_LENGTH];
|
72
|
|
-=======
|
73
|
|
- bool sdprinting ;
|
74
|
|
- bool cardOK;
|
75
|
|
- char filename[FILENAME_LENGTH];
|
76
|
|
- char diveFilename[LONG_FILENAME_LENGTH];
|
77
|
|
->>>>>>> SD Card Alpha Sorting
|
78
|
67
|
bool filenameIsDir;
|
79
|
68
|
int lastnr; //last number of the autostart;
|
80
|
69
|
private:
|
81
|
70
|
SdFile root,*curDir,workDir,workDirParents[MAX_DIR_DEPTH];
|
82
|
71
|
uint16_t workDirDepth;
|
83
|
72
|
#ifdef SDCARD_SORT_ALPHA
|
84
|
|
-<<<<<<< HEAD
|
85
|
73
|
uint16_t sort_count;
|
86
|
74
|
uint8_t *sort_order;
|
87
|
75
|
#if SORT_USES_MORE_RAM
|
88
|
76
|
char **sortshort;
|
89
|
77
|
char **sortnames;
|
90
|
78
|
uint8_t *isDir;
|
91
|
|
-=======
|
92
|
|
- #if SORT_USES_MORE_RAM
|
93
|
|
- uint16_t sort_count;
|
94
|
|
- char **sortnames;
|
95
|
|
- #else
|
96
|
|
- uint8_t sort_order[SORT_LIMIT];
|
97
|
|
->>>>>>> SD Card Alpha Sorting
|
98
|
79
|
#endif
|
99
|
80
|
#endif
|
100
|
81
|
Sd2Card card;
|