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
fecbb554
Commit
fecbb554
authored
Sep 14, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix IS_SD_PRINTING
parent
6d57efa8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
14 deletions
+7
-14
Configuration_Feature.h
MarlinKimbra/Configuration_Feature.h
+1
-0
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+1
-3
cardreader.cpp
MarlinKimbra/cardreader.cpp
+3
-1
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+2
-10
No files found.
MarlinKimbra/Configuration_Feature.h
View file @
fecbb554
...
@@ -980,6 +980,7 @@
...
@@ -980,6 +980,7 @@
****************************************************************************************/
****************************************************************************************/
//#define SDSUPPORT // Enable SD Card Support in Hardware Console
//#define SDSUPPORT // Enable SD Card Support in Hardware Console
//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
//#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
//#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
...
...
MarlinKimbra/Marlin_main.cpp
View file @
fecbb554
...
@@ -45,9 +45,7 @@
...
@@ -45,9 +45,7 @@
#endif
#endif
#include "stepper.h"
#include "stepper.h"
#include "temperature.h"
#include "temperature.h"
#if ENABLED(SDSUPPORT)
#include "cardreader.h"
#include "cardreader.h"
#endif
#include "configuration_store.h"
#include "configuration_store.h"
#if ENABLED(USE_WATCHDOG)
#if ENABLED(USE_WATCHDOG)
...
...
MarlinKimbra/cardreader.cpp
View file @
fecbb554
...
@@ -196,7 +196,9 @@ void CardReader::initsd() {
...
@@ -196,7 +196,9 @@ void CardReader::initsd() {
cardOK
=
false
;
cardOK
=
false
;
if
(
root
.
isOpen
())
root
.
close
();
if
(
root
.
isOpen
())
root
.
close
();
#if ENABLED(SDSLOW)
#if ENABLED(SDEXTRASLOW)
#define SPI_SPEED SPI_QUARTER_SPEED
#elif ENABLED(SDSLOW)
#define SPI_SPEED SPI_HALF_SPEED
#define SPI_SPEED SPI_HALF_SPEED
#else
#else
#define SPI_SPEED SPI_FULL_SPEED
#define SPI_SPEED SPI_FULL_SPEED
...
...
MarlinKimbra/ultralcd.cpp
View file @
fecbb554
...
@@ -4,11 +4,7 @@
...
@@ -4,11 +4,7 @@
#if ENABLED(ULTRA_LCD)
#if ENABLED(ULTRA_LCD)
#include "Marlin_main.h"
#include "Marlin_main.h"
#include "cardreader.h"
#if ENABLED(SDSUPPORT)
#include "cardreader.h"
#endif
#include "temperature.h"
#include "temperature.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
...
@@ -2382,11 +2378,7 @@ char *ftostr52(const float &x) {
...
@@ -2382,11 +2378,7 @@ char *ftostr52(const float &x) {
#elif ENABLED(NEXTION)
#elif ENABLED(NEXTION)
#include "Marlin_main.h"
#include "Marlin_main.h"
#include "cardreader.h"
#if ENABLED(SDSUPPORT)
#include "cardreader.h"
#endif
#include "temperature.h"
#include "temperature.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
...
...
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