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
372f93cc
Commit
372f93cc
authored
Mar 29, 2016
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Rename "filenames" to "proc_filenames"
parent
6b01cf07
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/cardreader.cpp
+3
-4
3 additions, 4 deletions
Marlin/cardreader.cpp
Marlin/cardreader.h
+2
-1
2 additions, 1 deletion
Marlin/cardreader.h
with
5 additions
and
5 deletions
Marlin/cardreader.cpp
+
3
−
4
View file @
372f93cc
...
@@ -318,9 +318,9 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/)
...
@@ -318,9 +318,9 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/)
SERIAL_ECHOPGM
(
"
\"
parent:
\"
"
);
SERIAL_ECHOPGM
(
"
\"
parent:
\"
"
);
//store current filename and position
//store current filename and position
getAbsFilename
(
filenames
[
file_subcall_ctr
]);
getAbsFilename
(
proc_
filenames
[
file_subcall_ctr
]);
SERIAL_ECHO
(
filenames
[
file_subcall_ctr
]);
SERIAL_ECHO
(
proc_
filenames
[
file_subcall_ctr
]);
SERIAL_ECHOPGM
(
"
\"
pos"
);
SERIAL_ECHOPGM
(
"
\"
pos"
);
SERIAL_ECHOLN
(
sdpos
);
SERIAL_ECHOLN
(
sdpos
);
filespos
[
file_subcall_ctr
]
=
sdpos
;
filespos
[
file_subcall_ctr
]
=
sdpos
;
...
@@ -607,7 +607,7 @@ void CardReader::printingHasFinished() {
...
@@ -607,7 +607,7 @@ void CardReader::printingHasFinished() {
if
(
file_subcall_ctr
>
0
)
{
// Heading up to a parent file that called current as a procedure.
if
(
file_subcall_ctr
>
0
)
{
// Heading up to a parent file that called current as a procedure.
file
.
close
();
file
.
close
();
file_subcall_ctr
--
;
file_subcall_ctr
--
;
openFile
(
filenames
[
file_subcall_ctr
],
true
,
true
);
openFile
(
proc_
filenames
[
file_subcall_ctr
],
true
,
true
);
setIndex
(
filespos
[
file_subcall_ctr
]);
setIndex
(
filespos
[
file_subcall_ctr
]);
startFileprint
();
startFileprint
();
}
}
...
@@ -617,7 +617,6 @@ void CardReader::printingHasFinished() {
...
@@ -617,7 +617,6 @@ void CardReader::printingHasFinished() {
if
(
SD_FINISHED_STEPPERRELEASE
)
{
if
(
SD_FINISHED_STEPPERRELEASE
)
{
//finishAndDisableSteppers();
//finishAndDisableSteppers();
enqueue_and_echo_commands_P
(
PSTR
(
SD_FINISHED_RELEASECOMMAND
));
enqueue_and_echo_commands_P
(
PSTR
(
SD_FINISHED_RELEASECOMMAND
));
}
autotempShutdown
();
autotempShutdown
();
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Marlin/cardreader.h
+
2
−
1
View file @
372f93cc
...
@@ -83,11 +83,12 @@ private:
...
@@ -83,11 +83,12 @@ private:
Sd2Card
card
;
Sd2Card
card
;
SdVolume
volume
;
SdVolume
volume
;
SdFile
file
;
SdFile
file
;
#define SD_PROCEDURE_DEPTH 1
#define SD_PROCEDURE_DEPTH 1
#define MAXPATHNAMELENGTH (FILENAME_LENGTH*MAX_DIR_DEPTH + MAX_DIR_DEPTH + 1)
#define MAXPATHNAMELENGTH (FILENAME_LENGTH*MAX_DIR_DEPTH + MAX_DIR_DEPTH + 1)
uint8_t
file_subcall_ctr
;
uint8_t
file_subcall_ctr
;
uint32_t
filespos
[
SD_PROCEDURE_DEPTH
];
uint32_t
filespos
[
SD_PROCEDURE_DEPTH
];
char
filenames
[
SD_PROCEDURE_DEPTH
][
MAXPATHNAMELENGTH
];
char
proc_
filenames
[
SD_PROCEDURE_DEPTH
][
MAXPATHNAMELENGTH
];
uint32_t
filesize
;
uint32_t
filesize
;
millis_t
next_autostart_ms
;
millis_t
next_autostart_ms
;
uint32_t
sdpos
;
uint32_t
sdpos
;
...
...
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