Porting ui.cpp and ui.h and fix 1.0 Clean Nozzle
Porting ui.cpp and ui.h and fix 1.0 Clean Nozzle COMPILATION OK BUT NO TEST YETpull/8/head
rodzic
b0fc75d824
commit
12068ed4b9
|
@ -173,7 +173,9 @@ void Printer::cleanNozzle(bool restoreposition)
|
|||
{//put proper position in case position has been manualy changed no need to home Z as cannot be manualy changed and in case of something on plate it could be catastrophic
|
||||
Printer::homeAxis(true,true,false);
|
||||
}
|
||||
|
||||
// move Z to zMin + 15 if under this position to be sure nozzle do not touch metal holder
|
||||
if (currentPosition[Z_AXIS] < zMin+15) moveToReal(IGNORE_COORDINATE,IGNORE_COORDINATE,zMin+15,IGNORE_COORDINATE,homingFeedrate[0]);
|
||||
Commands::waitUntilEndOfAllMoves();
|
||||
UI_STATUS_UPD_RAM(UI_TEXT_CLEANING_NOZZLE);
|
||||
#if DAVINCI ==1
|
||||
//first step noze
|
||||
|
@ -201,9 +203,6 @@ void Printer::cleanNozzle(bool restoreposition)
|
|||
//sixth step Z probe
|
||||
moveToReal(xMin,yMin-ENDSTOP_Y_BACK_ON_HOME,IGNORE_COORDINATE,IGNORE_COORDINATE,homingFeedrate[0]);
|
||||
#else
|
||||
// move Z to zMin + 15 if under this position to be sure nozzle do not touch metal holder
|
||||
if (currentPosition[Z_AXIS] < zMin+15) moveToReal(IGNORE_COORDINATE,IGNORE_COORDINATE,zMin+15,IGNORE_COORDINATE,homingFeedrate[0]);
|
||||
Commands::waitUntilEndOfAllMoves();
|
||||
//first step
|
||||
moveToReal(xMin + CLEAN_X-ENDSTOP_X_BACK_ON_HOME,yMin + CLEAN_Y-ENDSTOP_Y_BACK_ON_HOME,IGNORE_COORDINATE,IGNORE_COORDINATE,homingFeedrate[0]);
|
||||
//second step
|
||||
|
|
Plik diff jest za duży
Load Diff
|
@ -1399,6 +1399,7 @@ class UIDisplay {
|
|||
inline void setOutputMaskBits(unsigned int bits) {outputMask |= bits;}
|
||||
inline void unsetOutputMaskBits(unsigned int bits) {outputMask &= ~bits;}
|
||||
void updateSDFileCount();
|
||||
void sdrefresh(uint16_t &r,char cache[UI_ROWS][MAX_COLS+1]);
|
||||
void goDir(char *name);
|
||||
bool isDirname(char *name);
|
||||
char cwd[SD_MAX_FOLDER_DEPTH*LONG_FILENAME_LENGTH+2];
|
||||
|
|
Ładowanie…
Reference in New Issue