From f171656f8e0f72ae0294220e4e1086db5b8c38e5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 2 Mar 2015 07:06:01 -0800
Subject: [PATCH 1/2] Cleanup of cardreader.*
- Apply standards to cardreader.*
- Fix minor issues with cardreader.cpp
- Apply standards to some other stale regions
---
Marlin/BlinkM.cpp | 9 +-
Marlin/BlinkM.h | 7 +-
Marlin/ConfigurationStore.h | 6 +-
Marlin/cardreader.cpp | 626 ++++++++++++++----------------------
Marlin/cardreader.h | 64 ++--
Marlin/digipot_mcp4451.cpp | 73 +++--
6 files changed, 323 insertions(+), 462 deletions(-)
diff --git a/Marlin/BlinkM.cpp b/Marlin/BlinkM.cpp
index de604ecd35..b340f968c0 100644
--- a/Marlin/BlinkM.cpp
+++ b/Marlin/BlinkM.cpp
@@ -5,16 +5,9 @@
#include "Marlin.h"
#ifdef BLINKM
-#if (ARDUINO >= 100)
- # include "Arduino.h"
-#else
- # include "WProgram.h"
-#endif
-
#include "BlinkM.h"
-void SendColors(byte red, byte grn, byte blu)
-{
+void SendColors(byte red, byte grn, byte blu) {
Wire.begin();
Wire.beginTransmission(0x09);
Wire.write('o'); //to disable ongoing script, only needs to be used once
diff --git a/Marlin/BlinkM.h b/Marlin/BlinkM.h
index 5136828782..5b802b718b 100644
--- a/Marlin/BlinkM.h
+++ b/Marlin/BlinkM.h
@@ -2,13 +2,12 @@
BlinkM.h
Library header file for BlinkM library
*/
-#if (ARDUINO >= 100)
- # include "Arduino.h"
+#if ARDUINO >= 100
+ #include "Arduino.h"
#else
- # include "WProgram.h"
+ #include "WProgram.h"
#endif
#include "Wire.h"
void SendColors(byte red, byte grn, byte blu);
-
diff --git a/Marlin/ConfigurationStore.h b/Marlin/ConfigurationStore.h
index d117d37fb2..3dc4a92cfd 100644
--- a/Marlin/ConfigurationStore.h
+++ b/Marlin/ConfigurationStore.h
@@ -1,5 +1,5 @@
-#ifndef CONFIG_STORE_H
-#define CONFIG_STORE_H
+#ifndef CONFIGURATIONSTORE_H
+#define CONFIGURATIONSTORE_H
#include "Configuration.h"
@@ -19,4 +19,4 @@ void Config_ResetDefault();
FORCE_INLINE void Config_RetrieveSettings() { Config_ResetDefault(); Config_PrintSettings(); }
#endif
-#endif // __CONFIG_STORE_H
+#endif //CONFIGURATIONSTORE_H
diff --git a/Marlin/cardreader.cpp b/Marlin/cardreader.cpp
index a2dd67831b..ad79892b59 100644
--- a/Marlin/cardreader.cpp
+++ b/Marlin/cardreader.cpp
@@ -7,91 +7,69 @@
#ifdef SDSUPPORT
+CardReader::CardReader() {
+ filesize = 0;
+ sdpos = 0;
+ sdprinting = false;
+ cardOK = false;
+ saving = false;
+ logging = false;
+ workDirDepth = 0;
+ file_subcall_ctr = 0;
+ memset(workDirParents, 0, sizeof(workDirParents));
-
-CardReader::CardReader()
-{
- filesize = 0;
- sdpos = 0;
- sdprinting = false;
- cardOK = false;
- saving = false;
- logging = false;
- autostart_atmillis=0;
- workDirDepth = 0;
- file_subcall_ctr=0;
- memset(workDirParents, 0, sizeof(workDirParents));
-
- autostart_stilltocheck=true; //the SD start is delayed, because otherwise the serial cannot answer fast enough to make contact with the host software.
- autostart_index=0;
+ autostart_stilltocheck = true; //the SD start is delayed, because otherwise the serial cannot answer fast enough to make contact with the host software.
+ autostart_index = 0;
//power to SD reader
#if SDPOWER > -1
- SET_OUTPUT(SDPOWER);
- WRITE(SDPOWER,HIGH);
+ SET_OUTPUT(SDPOWER);
+ WRITE(SDPOWER, HIGH);
#endif //SDPOWER
-
- autostart_atmillis=millis()+5000;
+
+ autostart_atmillis = millis() + 5000;
}
-char *createFilename(char *buffer,const dir_t &p) //buffer>12characters
-{
- char *pos=buffer;
- for (uint8_t i = 0; i < 11; i++)
- {
- if (p.name[i] == ' ')continue;
- if (i == 8)
- {
- *pos++='.';
- }
- *pos++=p.name[i];
+char *createFilename(char *buffer, const dir_t &p) { //buffer > 12characters
+ char *pos = buffer;
+ for (uint8_t i = 0; i < 11; i++) {
+ if (p.name[i] == ' ') continue;
+ if (i == 8) *pos++ = '.';
+ *pos++ = p.name[i];
}
- *pos++=0;
+ *pos++ = 0;
return buffer;
}
-
-void CardReader::lsDive(const char *prepend, SdFile parent, const char * const match/*=NULL*/)
-{
+void CardReader::lsDive(const char *prepend, SdFile parent, const char * const match/*=NULL*/) {
dir_t p;
- uint8_t cnt=0;
-
- while (parent.readDir(p, longFilename) > 0)
- {
- if( DIR_IS_SUBDIR(&p) && lsAction!=LS_Count && lsAction!=LS_GetFilename) // hence LS_SerialPrint
- {
+ uint8_t cnt = 0;
+ while (parent.readDir(p, longFilename) > 0) {
+ if (DIR_IS_SUBDIR(&p) && lsAction != LS_Count && lsAction != LS_GetFilename) { // hence LS_SerialPrint
char path[FILENAME_LENGTH*2];
char lfilename[FILENAME_LENGTH];
- createFilename(lfilename,p);
-
- path[0]=0;
- if(prepend[0]==0) //avoid leading / if already in prepend
- {
- strcat(path,"/");
- }
- strcat(path,prepend);
- strcat(path,lfilename);
- strcat(path,"/");
-
+ createFilename(lfilename, p);
+
+ path[0] = 0;
+ if (prepend[0] == 0) strcat(path, "/"); //avoid leading / if already in prepend
+ strcat(path, prepend);
+ strcat(path, lfilename);
+ strcat(path, "/");
+
//Serial.print(path);
-
+
SdFile dir;
- if(!dir.open(parent,lfilename, O_READ))
- {
- if(lsAction==LS_SerialPrint)
- {
+ if (!dir.open(parent, lfilename, O_READ)) {
+ if (lsAction == LS_SerialPrint) {
SERIAL_ECHO_START;
SERIAL_ECHOLN(MSG_SD_CANT_OPEN_SUBDIR);
SERIAL_ECHOLN(lfilename);
}
}
- lsDive(path,dir);
+ lsDive(path, dir);
//close done automatically by destructor of SdFile
-
-
}
- else
- {
+ else {
char pn0 = p.name[0];
if (pn0 == DIR_NAME_FREE) break;
if (pn0 == DIR_NAME_DELETED || pn0 == '.' || pn0 == '_') continue;
@@ -99,384 +77,313 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
if (lf0 == '.' || lf0 == '_') continue;
if (!DIR_IS_FILE_OR_SUBDIR(&p)) continue;
- filenameIsDir=DIR_IS_SUBDIR(&p);
-
-
- if(!filenameIsDir)
- {
- if(p.name[8]!='G') continue;
- if(p.name[9]=='~') continue;
- }
- //if(cnt++!=nr) continue;
- createFilename(filename,p);
- if(lsAction==LS_SerialPrint)
- {
+
+ filenameIsDir = DIR_IS_SUBDIR(&p);
+
+ if (!filenameIsDir && (p.name[8] != 'G' || p.name[9] == '~')) continue;
+
+ //if (cnt++ != nr) continue;
+ createFilename(filename, p);
+ if (lsAction == LS_SerialPrint) {
SERIAL_PROTOCOL(prepend);
SERIAL_PROTOCOLLN(filename);
}
- else if(lsAction==LS_Count)
- {
+ else if (lsAction == LS_Count) {
nrFiles++;
- }
- else if(lsAction==LS_GetFilename)
- {
+ }
+ else if (lsAction == LS_GetFilename) {
if (match != NULL) {
if (strcasecmp(match, filename) == 0) return;
}
else if (cnt == nrFiles) return;
cnt++;
-
}
}
}
}
-void CardReader::ls()
-{
- lsAction=LS_SerialPrint;
- if(lsAction==LS_Count)
- nrFiles=0;
-
+void CardReader::ls() {
+ lsAction = LS_SerialPrint;
root.rewind();
- lsDive("",root);
+ lsDive("", root);
}
-
-void CardReader::initsd()
-{
+void CardReader::initsd() {
cardOK = false;
- if(root.isOpen())
- root.close();
-#ifdef SDSLOW
- if (!card.init(SPI_HALF_SPEED,SDSS)
- #if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
- && !card.init(SPI_HALF_SPEED,LCD_SDSS)
+ if (root.isOpen()) root.close();
+
+ #ifdef SDSLOW
+ #define SPI_SPEED SPI_HALF_SPEED
+ #else
+ #define SPI_SPEED SPI_FULL_SPEED
#endif
- )
-#else
- if (!card.init(SPI_FULL_SPEED,SDSS)
- #if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
- && !card.init(SPI_FULL_SPEED,LCD_SDSS)
- #endif
- )
-#endif
- {
+
+ if (!card.init(SPI_SPEED,SDSS)
+ #if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
+ && !card.init(SPI_SPEED, LCD_SDSS)
+ #endif
+ ) {
//if (!card.init(SPI_HALF_SPEED,SDSS))
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM(MSG_SD_INIT_FAIL);
}
- else if (!volume.init(&card))
- {
+ else if (!volume.init(&card)) {
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_SD_VOL_INIT_FAIL);
}
- else if (!root.openRoot(&volume))
- {
+ else if (!root.openRoot(&volume)) {
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_SD_OPENROOT_FAIL);
}
- else
- {
+ else {
cardOK = true;
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM(MSG_SD_CARD_OK);
}
- workDir=root;
- curDir=&root;
+ workDir = root;
+ curDir = &root;
/*
- if(!workDir.openRoot(&volume))
- {
+ if (!workDir.openRoot(&volume)) {
SERIAL_ECHOLNPGM(MSG_SD_WORKDIR_FAIL);
}
*/
-
}
-void CardReader::setroot()
-{
- /*if(!workDir.openRoot(&volume))
- {
+void CardReader::setroot() {
+ /*if (!workDir.openRoot(&volume)) {
SERIAL_ECHOLNPGM(MSG_SD_WORKDIR_FAIL);
}*/
- workDir=root;
-
- curDir=&workDir;
+ workDir = root;
+ curDir = &workDir;
}
-void CardReader::release()
-{
+
+void CardReader::release() {
sdprinting = false;
cardOK = false;
}
-void CardReader::startFileprint()
-{
- if(cardOK)
- {
+void CardReader::startFileprint() {
+ if (cardOK) {
sdprinting = true;
}
}
-void CardReader::pauseSDPrint()
-{
- if(sdprinting)
- {
- sdprinting = false;
- }
+void CardReader::pauseSDPrint() {
+ if (sdprinting) sdprinting = false;
}
-
-void CardReader::openLogFile(char* name)
-{
+void CardReader::openLogFile(char* name) {
logging = true;
openFile(name, false);
}
-void CardReader::getAbsFilename(char *t)
-{
- uint8_t cnt=0;
- *t='/';t++;cnt++;
- for(uint8_t i=0;i<workDirDepth;i++)
- {
+void CardReader::getAbsFilename(char *t) {
+ uint8_t cnt = 0;
+ *t = '/'; t++; cnt++;
+ for (uint8_t i = 0; i < workDirDepth; i++) {
workDirParents[i].getFilename(t); //SDBaseFile.getfilename!
- while(*t!=0 && cnt< MAXPATHNAMELENGTH)
- {t++;cnt++;} //crawl counter forward.
+ while(*t && cnt < MAXPATHNAMELENGTH) { t++; cnt++; } //crawl counter forward.
}
- if(cnt<MAXPATHNAMELENGTH-FILENAME_LENGTH)
+ if (cnt < MAXPATHNAMELENGTH - FILENAME_LENGTH)
file.getFilename(t);
else
- t[0]=0;
+ t[0] = 0;
}
-void CardReader::openFile(char* name,bool read, bool replace_current/*=true*/)
-{
- if(!cardOK)
- return;
- if(file.isOpen()) //replacing current file by new file, or subfile call
- {
- if(!replace_current)
- {
- if((int)file_subcall_ctr>(int)SD_PROCEDURE_DEPTH-1)
- {
+void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/) {
+ if (!cardOK) return;
+ if (file.isOpen()) { //replacing current file by new file, or subfile call
+ if (!replace_current) {
+ if (file_subcall_ctr > SD_PROCEDURE_DEPTH - 1) {
SERIAL_ERROR_START;
SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:");
SERIAL_ERRORLN(SD_PROCEDURE_DEPTH);
kill();
return;
}
-
+
SERIAL_ECHO_START;
SERIAL_ECHOPGM("SUBROUTINE CALL target:\"");
SERIAL_ECHO(name);
SERIAL_ECHOPGM("\" parent:\"");
-
+
//store current filename and position
getAbsFilename(filenames[file_subcall_ctr]);
-
+
SERIAL_ECHO(filenames[file_subcall_ctr]);
SERIAL_ECHOPGM("\" pos");
SERIAL_ECHOLN(sdpos);
- filespos[file_subcall_ctr]=sdpos;
+ filespos[file_subcall_ctr] = sdpos;
file_subcall_ctr++;
}
- else
- {
+ else {
SERIAL_ECHO_START;
SERIAL_ECHOPGM("Now doing file: ");
SERIAL_ECHOLN(name);
}
file.close();
}
- else //opening fresh file
- {
- file_subcall_ctr=0; //resetting procedure depth in case user cancels print while in procedure
+ else { //opening fresh file
+ file_subcall_ctr = 0; //resetting procedure depth in case user cancels print while in procedure
SERIAL_ECHO_START;
SERIAL_ECHOPGM("Now fresh file: ");
SERIAL_ECHOLN(name);
}
sdprinting = false;
-
-
+
SdFile myDir;
- curDir=&root;
- char *fname=name;
-
- char *dirname_start,*dirname_end;
- if(name[0]=='/')
- {
- dirname_start=strchr(name,'/')+1;
- while(dirname_start>0)
- {
- dirname_end=strchr(dirname_start,'/');
- //SERIAL_ECHO("start:");SERIAL_ECHOLN((int)(dirname_start-name));
- //SERIAL_ECHO("end :");SERIAL_ECHOLN((int)(dirname_end-name));
- if(dirname_end>0 && dirname_end>dirname_start)
- {
+ curDir = &root;
+ char *fname = name;
+
+ char *dirname_start, *dirname_end;
+ if (name[0] == '/') {
+ dirname_start = &name[1];
+ while(dirname_start > 0) {
+ dirname_end = strchr(dirname_start, '/');
+ //SERIAL_ECHO("start:");SERIAL_ECHOLN((int)(dirname_start - name));
+ //SERIAL_ECHO("end :");SERIAL_ECHOLN((int)(dirname_end - name));
+ if (dirname_end > 0 && dirname_end > dirname_start) {
char subdirname[FILENAME_LENGTH];
- strncpy(subdirname, dirname_start, dirname_end-dirname_start);
- subdirname[dirname_end-dirname_start]=0;
+ strncpy(subdirname, dirname_start, dirname_end - dirname_start);
+ subdirname[dirname_end - dirname_start] = 0;
SERIAL_ECHOLN(subdirname);
- if(!myDir.open(curDir,subdirname,O_READ))
- {
+ if (!myDir.open(curDir, subdirname, O_READ)) {
SERIAL_PROTOCOLPGM(MSG_SD_OPEN_FILE_FAIL);
SERIAL_PROTOCOL(subdirname);
SERIAL_PROTOCOLLNPGM(".");
return;
}
- else
- {
+ else {
//SERIAL_ECHOLN("dive ok");
}
-
- curDir=&myDir;
- dirname_start=dirname_end+1;
+
+ curDir = &myDir;
+ dirname_start = dirname_end + 1;
}
- else // the reminder after all /fsa/fdsa/ is the filename
- {
- fname=dirname_start;
- //SERIAL_ECHOLN("remaider");
+ else { // the remainder after all /fsa/fdsa/ is the filename
+ fname = dirname_start;
+ //SERIAL_ECHOLN("remainder");
//SERIAL_ECHOLN(fname);
break;
}
-
}
}
- else //relative path
- {
- curDir=&workDir;
+ else { //relative path
+ curDir = &workDir;
}
- if(read)
- {
- if (file.open(curDir, fname, O_READ))
- {
+
+ if (read) {
+ if (file.open(curDir, fname, O_READ)) {
filesize = file.fileSize();
SERIAL_PROTOCOLPGM(MSG_SD_FILE_OPENED);
SERIAL_PROTOCOL(fname);
SERIAL_PROTOCOLPGM(MSG_SD_SIZE);
SERIAL_PROTOCOLLN(filesize);
sdpos = 0;
-
+
SERIAL_PROTOCOLLNPGM(MSG_SD_FILE_SELECTED);
getfilename(0, fname);
lcd_setstatus(longFilename[0] ? longFilename : fname);
}
- else
- {
+ else {
SERIAL_PROTOCOLPGM(MSG_SD_OPEN_FILE_FAIL);
SERIAL_PROTOCOL(fname);
SERIAL_PROTOCOLLNPGM(".");
}
}
- else
- { //write
- if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC))
- {
+ else { //write
+ if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
SERIAL_PROTOCOLPGM(MSG_SD_OPEN_FILE_FAIL);
SERIAL_PROTOCOL(fname);
SERIAL_PROTOCOLLNPGM(".");
}
- else
- {
+ else {
saving = true;
SERIAL_PROTOCOLPGM(MSG_SD_WRITE_TO_FILE);
SERIAL_PROTOCOLLN(name);
lcd_setstatus(fname);
}
}
-
}
-void CardReader::removeFile(char* name)
-{
- if(!cardOK)
- return;
+void CardReader::removeFile(char* name) {
+ if (!cardOK) return;
+
file.close();
sdprinting = false;
-
-
+
SdFile myDir;
- curDir=&root;
- char *fname=name;
-
- char *dirname_start,*dirname_end;
- if(name[0]=='/')
- {
- dirname_start=strchr(name,'/')+1;
- while(dirname_start>0)
- {
- dirname_end=strchr(dirname_start,'/');
- //SERIAL_ECHO("start:");SERIAL_ECHOLN((int)(dirname_start-name));
- //SERIAL_ECHO("end :");SERIAL_ECHOLN((int)(dirname_end-name));
- if(dirname_end>0 && dirname_end>dirname_start)
- {
+ curDir = &root;
+ char *fname = name;
+
+ char *dirname_start, *dirname_end;
+ if (name[0] == '/') {
+ dirname_start = strchr(name, '/') + 1;
+ while (dirname_start > 0) {
+ dirname_end = strchr(dirname_start, '/');
+ //SERIAL_ECHO("start:");SERIAL_ECHOLN((int)(dirname_start - name));
+ //SERIAL_ECHO("end :");SERIAL_ECHOLN((int)(dirname_end - name));
+ if (dirname_end > 0 && dirname_end > dirname_start) {
char subdirname[FILENAME_LENGTH];
- strncpy(subdirname, dirname_start, dirname_end-dirname_start);
- subdirname[dirname_end-dirname_start]=0;
+ strncpy(subdirname, dirname_start, dirname_end - dirname_start);
+ subdirname[dirname_end - dirname_start] = 0;
SERIAL_ECHOLN(subdirname);
- if(!myDir.open(curDir,subdirname,O_READ))
- {
+ if (!myDir.open(curDir, subdirname, O_READ)) {
SERIAL_PROTOCOLPGM("open failed, File: ");
SERIAL_PROTOCOL(subdirname);
SERIAL_PROTOCOLLNPGM(".");
return;
}
- else
- {
+ else {
//SERIAL_ECHOLN("dive ok");
}
-
- curDir=&myDir;
- dirname_start=dirname_end+1;
+
+ curDir = &myDir;
+ dirname_start = dirname_end + 1;
}
- else // the reminder after all /fsa/fdsa/ is the filename
- {
- fname=dirname_start;
- //SERIAL_ECHOLN("remaider");
+ else { // the remainder after all /fsa/fdsa/ is the filename
+ fname = dirname_start;
+ //SERIAL_ECHOLN("remainder");
//SERIAL_ECHOLN(fname);
break;
}
-
}
}
- else //relative path
- {
- curDir=&workDir;
+ else { // relative path
+ curDir = &workDir;
+ }
+
+ if (file.remove(curDir, fname)) {
+ SERIAL_PROTOCOLPGM("File deleted:");
+ SERIAL_PROTOCOLLN(fname);
+ sdpos = 0;
+ }
+ else {
+ SERIAL_PROTOCOLPGM("Deletion failed, File: ");
+ SERIAL_PROTOCOL(fname);
+ SERIAL_PROTOCOLLNPGM(".");
}
- if (file.remove(curDir, fname))
- {
- SERIAL_PROTOCOLPGM("File deleted:");
- SERIAL_PROTOCOLLN(fname);
- sdpos = 0;
- }
- else
- {
- SERIAL_PROTOCOLPGM("Deletion failed, File: ");
- SERIAL_PROTOCOL(fname);
- SERIAL_PROTOCOLLNPGM(".");
- }
-
}
-void CardReader::getStatus()
-{
- if(cardOK){
+void CardReader::getStatus() {
+ if (cardOK) {
SERIAL_PROTOCOLPGM(MSG_SD_PRINTING_BYTE);
SERIAL_PROTOCOL(sdpos);
SERIAL_PROTOCOLPGM("/");
SERIAL_PROTOCOLLN(filesize);
}
- else{
+ else {
SERIAL_PROTOCOLLNPGM(MSG_SD_NOT_PRINTING);
}
}
-void CardReader::write_command(char *buf)
-{
+
+void CardReader::write_command(char *buf) {
char* begin = buf;
char* npos = 0;
char* end = buf + strlen(buf) - 1;
file.writeError = false;
- if((npos = strchr(buf, 'N')) != NULL)
- {
+ if ((npos = strchr(buf, 'N')) != NULL) {
begin = strchr(npos, ' ') + 1;
end = strchr(npos, '*') - 1;
}
@@ -484,162 +391,129 @@ void CardReader::write_command(char *buf)
end[2] = '\n';
end[3] = '\0';
file.write(begin);
- if (file.writeError)
- {
+ if (file.writeError) {
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_SD_ERR_WRITE_TO_FILE);
}
}
+void CardReader::checkautostart(bool force) {
+ if (!force && (!autostart_stilltocheck || autostart_atmillis < millis()))
+ return;
-void CardReader::checkautostart(bool force)
-{
- if(!force)
- {
- if(!autostart_stilltocheck)
- return;
- if(autostart_atmillis<millis())
- return;
- }
- autostart_stilltocheck=false;
- if(!cardOK)
- {
+ autostart_stilltocheck = false;
+
+ if (!cardOK) {
initsd();
- if(!cardOK) //fail
- return;
+ if (!cardOK) return; // fail
}
-
+
char autoname[30];
sprintf_P(autoname, PSTR("auto%i.g"), autostart_index);
- for(int8_t i=0;i<(int8_t)strlen(autoname);i++)
- autoname[i]=tolower(autoname[i]);
+ for (int8_t i = 0; i < (int8_t)strlen(autoname); i++) autoname[i] = tolower(autoname[i]);
+
dir_t p;
root.rewind();
-
- bool found=false;
- while (root.readDir(p, NULL) > 0)
- {
- for(int8_t i=0;i<(int8_t)strlen((char*)p.name);i++)
- p.name[i]=tolower(p.name[i]);
- //Serial.print((char*)p.name);
- //Serial.print(" ");
- //Serial.println(autoname);
- if(p.name[9]!='~') //skip safety copies
- if(strncmp((char*)p.name,autoname,5)==0)
- {
- char cmd[30];
+ bool found = false;
+ while (root.readDir(p, NULL) > 0) {
+ for (int8_t i = 0; i < (int8_t)strlen((char*)p.name); i++) p.name[i] = tolower(p.name[i]);
+ if (p.name[9] != '~' && strncmp((char*)p.name, autoname, 5) == 0) {
+ char cmd[30];
sprintf_P(cmd, PSTR("M23 %s"), autoname);
enquecommand(cmd);
enquecommands_P(PSTR("M24"));
- found=true;
+ found = true;
}
}
- if(!found)
- autostart_index=-1;
+ if (!found)
+ autostart_index = -1;
else
autostart_index++;
}
-void CardReader::closefile(bool store_location)
-{
+void CardReader::closefile(bool store_location) {
file.sync();
file.close();
- saving = false;
- logging = false;
-
- if(store_location)
- {
+ saving = logging = false;
+
+ if (store_location) {
//future: store printer state, filename and position for continuing a stopped print
// so one can unplug the printer and continue printing the next day.
-
}
-
-
}
-void CardReader::getfilename(uint16_t nr, const char * const match/*=NULL*/)
-{
- curDir=&workDir;
- lsAction=LS_GetFilename;
- nrFiles=nr;
+/**
+ * Get the name of a file in the current directory by index
+ */
+void CardReader::getfilename(uint16_t nr, const char * const match/*=NULL*/) {
+ curDir = &workDir;
+ lsAction = LS_GetFilename;
+ nrFiles = nr;
curDir->rewind();
- lsDive("",*curDir,match);
-
+ lsDive("", *curDir, match);
}
-uint16_t CardReader::getnrfilenames()
-{
- curDir=&workDir;
- lsAction=LS_Count;
- nrFiles=0;
+uint16_t CardReader::getnrfilenames() {
+ curDir = &workDir;
+ lsAction = LS_Count;
+ nrFiles = 0;
curDir->rewind();
- lsDive("",*curDir);
+ lsDive("", *curDir);
//SERIAL_ECHOLN(nrFiles);
return nrFiles;
}
-void CardReader::chdir(const char * relpath)
-{
+void CardReader::chdir(const char * relpath) {
SdFile newfile;
- SdFile *parent=&root;
-
- if(workDir.isOpen())
- parent=&workDir;
-
- if(!newfile.open(*parent,relpath, O_READ))
- {
- SERIAL_ECHO_START;
- SERIAL_ECHOPGM(MSG_SD_CANT_ENTER_SUBDIR);
- SERIAL_ECHOLN(relpath);
+ SdFile *parent = &root;
+
+ if (workDir.isOpen()) parent = &workDir;
+
+ if (!newfile.open(*parent, relpath, O_READ)) {
+ SERIAL_ECHO_START;
+ SERIAL_ECHOPGM(MSG_SD_CANT_ENTER_SUBDIR);
+ SERIAL_ECHOLN(relpath);
}
- else
- {
+ else {
if (workDirDepth < MAX_DIR_DEPTH) {
- for (int d = ++workDirDepth; d--;)
- workDirParents[d+1] = workDirParents[d];
- workDirParents[0]=*parent;
+ ++workDirDepth;
+ for (int d = workDirDepth; d--;) workDirParents[d + 1] = workDirParents[d];
+ workDirParents[0] = *parent;
}
- workDir=newfile;
+ workDir = newfile;
}
}
-void CardReader::updir()
-{
- if(workDirDepth > 0)
- {
+void CardReader::updir() {
+ if (workDirDepth > 0) {
--workDirDepth;
workDir = workDirParents[0];
- int d;
for (int d = 0; d < workDirDepth; d++)
workDirParents[d] = workDirParents[d+1];
}
}
-
-void CardReader::printingHasFinished()
-{
- st_synchronize();
- if(file_subcall_ctr>0) //heading up to a parent file that called current as a procedure.
- {
- file.close();
- file_subcall_ctr--;
- openFile(filenames[file_subcall_ctr],true,true);
- setIndex(filespos[file_subcall_ctr]);
- startFileprint();
- }
- else
- {
- quickStop();
- file.close();
- sdprinting = false;
- if(SD_FINISHED_STEPPERRELEASE)
- {
- //finishAndDisableSteppers();
- enquecommands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
- }
- autotempShutdown();
+void CardReader::printingHasFinished() {
+ st_synchronize();
+ if (file_subcall_ctr > 0) { // Heading up to a parent file that called current as a procedure.
+ file.close();
+ file_subcall_ctr--;
+ openFile(filenames[file_subcall_ctr], true, true);
+ setIndex(filespos[file_subcall_ctr]);
+ startFileprint();
+ }
+ else {
+ quickStop();
+ file.close();
+ sdprinting = false;
+ if (SD_FINISHED_STEPPERRELEASE) {
+ //finishAndDisableSteppers();
+ enquecommands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
}
+ autotempShutdown();
+ }
}
+
#endif //SDSUPPORT
diff --git a/Marlin/cardreader.h b/Marlin/cardreader.h
index a1da3d64a3..b55d09a65a 100644
--- a/Marlin/cardreader.h
+++ b/Marlin/cardreader.h
@@ -3,21 +3,21 @@
#ifdef SDSUPPORT
-#define MAX_DIR_DEPTH 10
+#define MAX_DIR_DEPTH 10 // Maximum folder depth
#include "SdFile.h"
-enum LsAction {LS_SerialPrint,LS_Count,LS_GetFilename};
-class CardReader
-{
+enum LsAction { LS_SerialPrint, LS_Count, LS_GetFilename };
+
+class CardReader {
public:
CardReader();
-
+
void initsd();
void write_command(char *buf);
//files auto[0-9].g on the sd card are performed in a row
//this is to delay autostart and hence the initialisaiton of the sd card to some seconds after the normal init, so the device is available quick after a reset
- void checkautostart(bool x);
+ void checkautostart(bool x);
void openFile(char* name,bool read,bool replace_current=true);
void openLogFile(char* name);
void removeFile(char* name);
@@ -30,9 +30,8 @@ public:
void getfilename(uint16_t nr, const char* const match=NULL);
uint16_t getnrfilenames();
-
+
void getAbsFilename(char *t);
-
void ls();
void chdir(const char * relpath);
@@ -41,56 +40,52 @@ public:
FORCE_INLINE bool isFileOpen() { return file.isOpen(); }
- FORCE_INLINE bool eof() { return sdpos>=filesize ;};
- FORCE_INLINE int16_t get() { sdpos = file.curPosition();return (int16_t)file.read();};
- FORCE_INLINE void setIndex(long index) {sdpos = index;file.seekSet(index);};
- FORCE_INLINE uint8_t percentDone(){if(!isFileOpen()) return 0; if(filesize) return sdpos/((filesize+99)/100); else return 0;};
- FORCE_INLINE char* getWorkDirName(){workDir.getFilename(filename);return filename;};
+ FORCE_INLINE bool eof() { return sdpos >= filesize; }
+ FORCE_INLINE int16_t get() { sdpos = file.curPosition(); return (int16_t)file.read(); }
+ FORCE_INLINE void setIndex(long index) { sdpos = index; file.seekSet(index); }
+ FORCE_INLINE uint8_t percentDone() { return (isFileOpen() && filesize) ? sdpos / ((filesize + 99) / 100) : 0; }
+ FORCE_INLINE char* getWorkDirName() { workDir.getFilename(filename); return filename; }
public:
- bool saving;
- bool logging;
- bool sdprinting;
- bool cardOK;
- char filename[FILENAME_LENGTH];
- char longFilename[LONG_FILENAME_LENGTH];
- bool filenameIsDir;
+ bool saving, logging, sdprinting, cardOK, filenameIsDir;
+ char filename[FILENAME_LENGTH], longFilename[LONG_FILENAME_LENGTH];
int autostart_index;
private:
- SdFile root,*curDir,workDir,workDirParents[MAX_DIR_DEPTH];
+ SdFile root, *curDir, workDir, workDirParents[MAX_DIR_DEPTH];
uint16_t workDirDepth;
Sd2Card card;
SdVolume volume;
SdFile file;
#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;
uint32_t filespos[SD_PROCEDURE_DEPTH];
char filenames[SD_PROCEDURE_DEPTH][MAXPATHNAMELENGTH];
uint32_t filesize;
- //int16_t n;
unsigned long autostart_atmillis;
- uint32_t sdpos ;
+ uint32_t sdpos;
bool autostart_stilltocheck; //the sd start is delayed, because otherwise the serial cannot answer fast enought to make contact with the hostsoftware.
-
+
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.
+ uint16_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;
void lsDive(const char *prepend, SdFile parent, const char * const match=NULL);
};
+
extern CardReader card;
+
#define IS_SD_PRINTING (card.sdprinting)
#if (SDCARDDETECT > -1)
-# ifdef SDCARDDETECTINVERTED
-# define IS_SD_INSERTED (READ(SDCARDDETECT)!=0)
-# else
-# define IS_SD_INSERTED (READ(SDCARDDETECT)==0)
-# endif //SDCARDTETECTINVERTED
+ #ifdef SDCARDDETECTINVERTED
+ #define IS_SD_INSERTED (READ(SDCARDDETECT) != 0)
+ #else
+ #define IS_SD_INSERTED (READ(SDCARDDETECT) == 0)
+ #endif
#else
-//If we don't have a card detect line, aways asume the card is inserted
-# define IS_SD_INSERTED true
+ //No card detect line? Assume the card is inserted.
+ #define IS_SD_INSERTED true
#endif
#else
@@ -98,4 +93,5 @@ extern CardReader card;
#define IS_SD_PRINTING (false)
#endif //SDSUPPORT
-#endif
+
+#endif //__CARDREADER_H
diff --git a/Marlin/digipot_mcp4451.cpp b/Marlin/digipot_mcp4451.cpp
index 0ced287aa0..22d2700253 100644
--- a/Marlin/digipot_mcp4451.cpp
+++ b/Marlin/digipot_mcp4451.cpp
@@ -1,59 +1,58 @@
#include "Configuration.h"
#ifdef DIGIPOT_I2C
+
#include "Stream.h"
#include "utility/twi.h"
#include "Wire.h"
// Settings for the I2C based DIGIPOT (MCP4451) on Azteeg X3 Pro
#if MB(5DPRINT)
-#define DIGIPOT_I2C_FACTOR 117.96
-#define DIGIPOT_I2C_MAX_CURRENT 1.736
+ #define DIGIPOT_I2C_FACTOR 117.96
+ #define DIGIPOT_I2C_MAX_CURRENT 1.736
#else
-#define DIGIPOT_I2C_FACTOR 106.7
-#define DIGIPOT_I2C_MAX_CURRENT 2.5
+ #define DIGIPOT_I2C_FACTOR 106.7
+ #define DIGIPOT_I2C_MAX_CURRENT 2.5
#endif
-static byte current_to_wiper( float current ){
- return byte(ceil(float((DIGIPOT_I2C_FACTOR*current))));
+static byte current_to_wiper(float current) {
+ return byte(ceil(float((DIGIPOT_I2C_FACTOR*current))));
}
-static void i2c_send(byte addr, byte a, byte b)
-{
- Wire.beginTransmission(addr);
- Wire.write(a);
- Wire.write(b);
- Wire.endTransmission();
+static void i2c_send(byte addr, byte a, byte b) {
+ Wire.beginTransmission(addr);
+ Wire.write(a);
+ Wire.write(b);
+ Wire.endTransmission();
}
// This is for the MCP4451 I2C based digipot
-void digipot_i2c_set_current( int channel, float current )
-{
- current = min( (float) max( current, 0.0f ), DIGIPOT_I2C_MAX_CURRENT);
- // these addresses are specific to Azteeg X3 Pro, can be set to others,
- // In this case first digipot is at address A0=0, A1= 0, second one is at A0=0, A1= 1
- byte addr= 0x2C; // channel 0-3
- if(channel >= 4) {
- addr= 0x2E; // channel 4-7
- channel-= 4;
- }
+void digipot_i2c_set_current(int channel, float current) {
+ current = min( (float) max( current, 0.0f ), DIGIPOT_I2C_MAX_CURRENT);
+ // these addresses are specific to Azteeg X3 Pro, can be set to others,
+ // In this case first digipot is at address A0=0, A1= 0, second one is at A0=0, A1= 1
+ byte addr = 0x2C; // channel 0-3
+ if (channel >= 4) {
+ addr = 0x2E; // channel 4-7
+ channel -= 4;
+ }
- // Initial setup
- i2c_send( addr, 0x40, 0xff );
- i2c_send( addr, 0xA0, 0xff );
+ // Initial setup
+ i2c_send(addr, 0x40, 0xff);
+ i2c_send(addr, 0xA0, 0xff);
- // Set actual wiper value
- byte addresses[4] = { 0x00, 0x10, 0x60, 0x70 };
- i2c_send( addr, addresses[channel], current_to_wiper(current) );
+ // Set actual wiper value
+ byte addresses[4] = { 0x00, 0x10, 0x60, 0x70 };
+ i2c_send(addr, addresses[channel], current_to_wiper(current));
}
-void digipot_i2c_init()
-{
- const float digipot_motor_current[] = DIGIPOT_I2C_MOTOR_CURRENTS;
- Wire.begin();
- // setup initial currents as defined in Configuration_adv.h
- for(int i=0;i<=sizeof(digipot_motor_current)/sizeof(float);i++) {
- digipot_i2c_set_current(i, digipot_motor_current[i]);
- }
+void digipot_i2c_init() {
+ const float digipot_motor_current[] = DIGIPOT_I2C_MOTOR_CURRENTS;
+ Wire.begin();
+ // setup initial currents as defined in Configuration_adv.h
+ for(int i = 0; i <= sizeof(digipot_motor_current) / sizeof(float); i++) {
+ digipot_i2c_set_current(i, digipot_motor_current[i]);
+ }
}
-#endif
+
+#endif //DIGIPOT_I2C
From 20e59dc61e3bdcf30d08576f7b3183a7537021cc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 2 Mar 2015 07:56:11 -0800
Subject: [PATCH 2/2] Don't skip files starting with underscores
---
Marlin/cardreader.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/cardreader.cpp b/Marlin/cardreader.cpp
index ad79892b59..7ee7df40ba 100644
--- a/Marlin/cardreader.cpp
+++ b/Marlin/cardreader.cpp
@@ -72,9 +72,9 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
else {
char pn0 = p.name[0];
if (pn0 == DIR_NAME_FREE) break;
- if (pn0 == DIR_NAME_DELETED || pn0 == '.' || pn0 == '_') continue;
+ if (pn0 == DIR_NAME_DELETED || pn0 == '.') continue;
char lf0 = longFilename[0];
- if (lf0 == '.' || lf0 == '_') continue;
+ if (lf0 == '.') continue;
if (!DIR_IS_FILE_OR_SUBDIR(&p)) continue;