Skip to content

Bug Fix for USB Printing #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
levelfifty wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug Fix for USB Printing #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Marlin/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ void setup()
if(languageID==0)
strMessage="Power loss detected, Resume print " + sFileName + "?";
else
strMessage="��⵽�ϵ磬�ָ���ӡ" + sFileName + "��";
strMessage="检测到断电，恢复打印" + sFileName + "？";
strMessage = "msgbox.tMessage.txt=\"" + strMessage + "\"";
const char* str0 = strMessage.c_str();
TenlogScreen_println(str0);
Expand Down Expand Up @@ -1200,7 +1200,7 @@ void get_command()
if(card.saving)
break;
#endif //SDSUPPORT
SERIAL_PROTOCOLLNPGM(MSG_OK);
// SERIAL_PROTOCOLLNPGM(MSG_OK); // Bug fix for USB Printing - levelfifty
}
else {
SERIAL_ERRORLNPGM(MSG_ERR_STOPPED);
Expand Down Expand Up @@ -1257,13 +1257,13 @@ void get_command()
if(languageID==0)
strMessage="Print finished, " + String(hours) + " hours and " + String(minutes) + " minutes. ";
else
strMessage="��ӡ��ɣ�������" + String(hours) + "ʱ" + String(minutes) + "�֡�";
strMessage="打印完成！共用了" + String(hours) + "时" + String(minutes) + "分。";
#ifdef POWER_LOSS_TRIGGER_BY_PIN
if(zyf_AUTO_OFF == 1){
if(languageID==0)
strMessage = strMessage + "Power off in 10 seconds.";
else
strMessage = strMessage + "10���ػ�";
strMessage = strMessage + "10秒后关机";
bAutoOff = true;
}
#endif
Expand Down Expand Up @@ -1913,7 +1913,7 @@ void check_filament_fail(){
if(languageID==0)
strMessage="Filament runout!";
else
strMessage="�IJ��þ���";
strMessage="耗材用尽！";
strMessage = "msgbox.tMessage.txt=\"" + strMessage + "\"";
const char* str0 = strMessage.c_str();
TenlogScreen_println(str0);
Expand Down Expand Up @@ -3780,10 +3780,10 @@ void get_coordinates(float XValue=-99999.0,float YValue=-99999.0,float ZValue=-9
float fRate=1.0;
int iMode=0;
#ifdef TENLOG_CONTROLLER
if(code_seen('R')) { //����
if(code_seen('R')) { //倍率
fRate=(float)code_value();
}
if(code_seen('M')) { //�������꣬�������
if(code_seen('M')) { //绝对坐标，相对坐标
iMode=(int)code_value();
}
#endif
Expand Down