Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
b97aff98
Commit
b97aff98
authored
Aug 09, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
ca17a689
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
93 additions
and
106 deletions
+93
-106
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+84
-96
cardreader.cpp
MarlinKimbra/cardreader.cpp
+8
-9
dogm_bitmaps.h
MarlinKimbra/dogm_bitmaps.h
+1
-1
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
b97aff98
This diff is collapsed.
Click to expand it.
MarlinKimbra/cardreader.cpp
View file @
b97aff98
...
@@ -56,22 +56,21 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
...
@@ -56,22 +56,21 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
// If the entry is a directory and the action is LS_SerialPrint
// If the entry is a directory and the action is LS_SerialPrint
if
(
DIR_IS_SUBDIR
(
&
p
)
&&
lsAction
!=
LS_Count
&&
lsAction
!=
LS_GetFilename
)
{
if
(
DIR_IS_SUBDIR
(
&
p
)
&&
lsAction
!=
LS_Count
&&
lsAction
!=
LS_GetFilename
)
{
// Allocate enough stack space for the full path to a folder
int
len
=
strlen
(
prepend
)
+
FILENAME_LENGTH
+
1
;
char
path
[
len
];
// Get the short name for the item, which we know is a folder
// Get the short name for the item, which we know is a folder
char
lfilename
[
FILENAME_LENGTH
];
char
lfilename
[
FILENAME_LENGTH
];
createFilename
(
lfilename
,
p
);
createFilename
(
lfilename
,
p
);
// Allocate enough stack space for the full path to a folder, trailing slash, and nul
boolean
prepend_is_empty
=
(
prepend
[
0
]
==
'\0'
);
int
len
=
(
prepend_is_empty
?
1
:
strlen
(
prepend
))
+
strlen
(
lfilename
)
+
1
+
1
;
char
path
[
len
];
// Append the FOLDERNAME12/ to the passed string.
// Append the FOLDERNAME12/ to the passed string.
// It contains the full path to the "parent" argument.
// It contains the full path to the "parent" argument.
// We now have the full path to the item in this folder.
// We now have the full path to the item in this folder.
path
[
0
]
=
'\0'
;
strcpy
(
path
,
prepend_is_empty
?
"/"
:
prepend
);
// root slash if prepend is empty
if
(
prepend
[
0
]
==
'\0'
)
strcat
(
path
,
"/"
);
// a root slash if prepend is empty
strcat
(
path
,
lfilename
);
// FILENAME_LENGTH-1 characters maximum
strcat
(
path
,
prepend
);
strcat
(
path
,
"/"
);
// 1 character
strcat
(
path
,
lfilename
);
strcat
(
path
,
"/"
);
// Serial.print(path);
// Serial.print(path);
...
...
MarlinKimbra/dogm_bitmaps.h
View file @
b97aff98
// BitMap for splashscreen
// BitMap for splashscreen
// Generated with: http://www.digole.com/tools/PicturetoC_Hex_converter.php
// Generated with: http://www.digole.com/tools/PicturetoC_Hex_converter.php
// Please note that using the high-res version takes 402Bytes of PROGMEM.
// Please note that using the high-res version takes 402Bytes of PROGMEM.
//
#define START_BMPHIGH
#define START_BMPHIGH
#if ENABLED(START_BMPHIGH)
#if ENABLED(START_BMPHIGH)
#define START_BMPWIDTH 112
#define START_BMPWIDTH 112
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment