3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge commit 'baddf38dbc2c72ab095deaf9b3e251ea2faeb699' into fix_compiler_warnings

Browse source
This commit is contained in:
Marek Bel 2018-08-01 16:44:17 +02:00
commit 665a885a21
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View file

@ -7775,7 +7775,7 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_
int ix = 0; int ix = 0;
int iy = 0; int iy = 0;
char* filename_wldsd = "wldsd.txt"; const char* filename_wldsd = "wldsd.txt";
char data_wldsd[70]; char data_wldsd[70];
char numb_wldsd[10]; char numb_wldsd[10];

10
Firmware/cardreader.cpp
View file

@ -258,7 +258,7 @@ void CardReader::pauseSDPrint()
} }
void CardReader::openLogFile(char* name) void CardReader::openLogFile(const char* name)
{ {
logging = true; logging = true;
openFile(name, false); openFile(name, false);
@ -289,7 +289,7 @@ void CardReader::getAbsFilename(char *t)
t[0]=0; t[0]=0;
} }
void CardReader::openFile(char* name,bool read, bool replace_current/*=true*/) void CardReader::openFile(const char* name,bool read, bool replace_current/*=true*/)
{ {
if(!cardOK) if(!cardOK)
return; return;
@ -341,7 +341,7 @@ void CardReader::openFile(char* name,bool read, bool replace_current/*=true*/)
SdFile myDir; SdFile myDir;
curDir=&root; curDir=&root;
char *fname=name; const char *fname=name;
char *dirname_start,*dirname_end; char *dirname_start,*dirname_end;
if(name[0]=='/') if(name[0]=='/')
@ -429,7 +429,7 @@ void CardReader::openFile(char* name,bool read, bool replace_current/*=true*/)
} }
void CardReader::removeFile(char* name) void CardReader::removeFile(const char* name)
{ {
if(!cardOK) if(!cardOK)
return; return;
@ -439,7 +439,7 @@ void CardReader::removeFile(char* name)
SdFile myDir; SdFile myDir;
curDir=&root; curDir=&root;
char *fname=name; const char *fname=name;
char *dirname_start,*dirname_end; char *dirname_start,*dirname_end;
if(name[0]=='/') if(name[0]=='/')

6
Firmware/cardreader.h
View file

@ -19,9 +19,9 @@ public:
//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 //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 openFile(const char* name,bool read,bool replace_current=true);
void openLogFile(char* name); void openLogFile(const char* name);
void removeFile(char* name); void removeFile(const char* name);
void closefile(bool store_location=false); void closefile(bool store_location=false);
void release(); void release();
void startFileprint(); void startFileprint();