Browse Source

Small code spacing adjustments

Scott Lahteine 8 years ago
parent
commit
70d1d4de5f
2 changed files with 2 additions and 4 deletions
  1. 1
    2
      Marlin/cardreader.cpp
  2. 1
    2
      Marlin/cardreader.h

+ 1
- 2
Marlin/cardreader.cpp View File

607
   else {
607
   else {
608
     file.close();
608
     file.close();
609
     sdprinting = false;
609
     sdprinting = false;
610
-    if (SD_FINISHED_STEPPERRELEASE) {
611
-      //finishAndDisableSteppers();
610
+    if (SD_FINISHED_STEPPERRELEASE)
612
       enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
611
       enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
613
     autotempShutdown();
612
     autotempShutdown();
614
   }
613
   }

+ 1
- 2
Marlin/cardreader.h View File

65
   void updir();
65
   void updir();
66
   void setroot();
66
   void setroot();
67
 
67
 
68
-
69
   FORCE_INLINE bool isFileOpen() { return file.isOpen(); }
68
   FORCE_INLINE bool isFileOpen() { return file.isOpen(); }
70
   FORCE_INLINE bool eof() { return sdpos >= filesize; }
69
   FORCE_INLINE bool eof() { return sdpos >= filesize; }
71
   FORCE_INLINE int16_t get() { sdpos = file.curPosition(); return (int16_t)file.read(); }
70
   FORCE_INLINE int16_t get() { sdpos = file.curPosition(); return (int16_t)file.read(); }
90
   uint32_t filespos[SD_PROCEDURE_DEPTH];
89
   uint32_t filespos[SD_PROCEDURE_DEPTH];
91
   char proc_filenames[SD_PROCEDURE_DEPTH][MAXPATHNAMELENGTH];
90
   char proc_filenames[SD_PROCEDURE_DEPTH][MAXPATHNAMELENGTH];
92
   uint32_t filesize;
91
   uint32_t filesize;
93
-  millis_t next_autostart_ms;
94
   uint32_t sdpos;
92
   uint32_t sdpos;
95
 
93
 
94
+  millis_t next_autostart_ms;
96
   bool autostart_stilltocheck; //the sd start is delayed, because otherwise the serial cannot answer fast enought to make contact with the hostsoftware.
95
   bool autostart_stilltocheck; //the sd start is delayed, because otherwise the serial cannot answer fast enought to make contact with the hostsoftware.
97
 
96
 
98
   LsAction lsAction; //stored for recursion.
97
   LsAction lsAction; //stored for recursion.

Loading…
Cancel
Save