Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
5ad1d193
Commit
5ad1d193
authored
Nov 19, 2011
by
Bernhard Kubicek
Browse files
Options
Downloads
Patches
Plain Diff
make it compile without sd_support
parent
7a2d1f5a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/cardreader.h
+7
-7
7 additions, 7 deletions
Marlin/cardreader.h
Marlin/cardreader.pde
+1
-5
1 addition, 5 deletions
Marlin/cardreader.pde
with
8 additions
and
12 deletions
Marlin/cardreader.h
+
7
−
7
View file @
5ad1d193
...
@@ -20,17 +20,15 @@ public:
...
@@ -20,17 +20,15 @@ public:
void
closefile
();
void
closefile
();
void
release
();
void
release
();
void
startFileprint
();
void
startFileprint
();
//void startFilewrite(char *name);
void
pauseSDPrint
();
void
pauseSDPrint
();
void
getStatus
();
void
getStatus
();
void
cd
(
char
*
absolutPath
);
//void selectFile(char* name);
void
getfilename
(
const
uint8_t
nr
);
void
getfilename
(
const
uint8_t
nr
);
uint16_t
getnrfilenames
();
uint16_t
getnrfilenames
();
void
ls
();
void
ls
();
void
lsDive
(
char
*
prepend
,
SdFile
parent
);
inline
bool
eof
()
{
return
sdpos
>=
filesize
;};
inline
bool
eof
()
{
return
sdpos
>=
filesize
;};
inline
int16_t
get
()
{
sdpos
=
file
.
curPosition
();
return
(
int16_t
)
file
.
read
();};
inline
int16_t
get
()
{
sdpos
=
file
.
curPosition
();
return
(
int16_t
)
file
.
read
();};
...
@@ -57,10 +55,13 @@ private:
...
@@ -57,10 +55,13 @@ private:
LsAction
lsAction
;
//stored for recursion.
LsAction
lsAction
;
//stored for recursion.
int16_t
nrFiles
;
//counter for the files in the current directory and recycled as position counter for getting the nrFiles'th name in the directory.
int16_t
nrFiles
;
//counter for the files in the current directory and recycled as position counter for getting the nrFiles'th name in the directory.
char
*
diveDirName
;
char
*
diveDirName
;
void
lsDive
(
char
*
prepend
,
SdFile
parent
);
};
};
#else
#else
#define dir_t bool
class
CardReader
class
CardReader
{
{
public:
public:
...
@@ -71,6 +72,7 @@ public:
...
@@ -71,6 +72,7 @@ public:
inline
static
void
checkautostart
(
bool
x
)
{};
inline
static
void
checkautostart
(
bool
x
)
{};
inline
static
void
openFile
(
char
*
name
,
bool
read
){};
inline
static
void
closefile
()
{};
inline
static
void
closefile
()
{};
inline
static
void
release
(){};
inline
static
void
release
(){};
inline
static
void
startFileprint
(){};
inline
static
void
startFileprint
(){};
...
@@ -87,9 +89,7 @@ public:
...
@@ -87,9 +89,7 @@ public:
inline
static
bool
eof
()
{
return
true
;};
inline
static
bool
eof
()
{
return
true
;};
inline
static
char
get
()
{
return
0
;};
inline
static
char
get
()
{
return
0
;};
inline
static
void
setIndex
(){};
inline
static
void
setIndex
(){};
inline
uint8_t
percentDone
(){
return
0
;};
};
};
#endif //SDSUPPORT
#endif //SDSUPPORT
#endif
#endif
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Marlin/cardreader.pde
+
1
−
5
View file @
5ad1d193
#ifdef SDSUPPORT
#include
"cardreader.h"
#include
"cardreader.h"
#ifdef SDSUPPORT
CardReader
::
CardReader
()
CardReader
::
CardReader
()
{
{
...
@@ -378,9 +378,5 @@ uint16_t CardReader::getnrfilenames()
...
@@ -378,9 +378,5 @@ uint16_t CardReader::getnrfilenames()
return
nrFiles
;
return
nrFiles
;
}
}
void
CardReader
::
cd
(
char
*
absolutPath
)
{
}
#endif //SDSUPPORT
#endif //SDSUPPORT
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment