Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 0 additions & 17 deletions HexFile/Read.me

This file was deleted.

6,613 changes: 0 additions & 6,613 deletions HexFile/V1.0.15/TL-D2P-2208-M-TJC.hex

This file was deleted.

6,613 changes: 0 additions & 6,613 deletions HexFile/V1.0.15/TL-D2P-2208-O-TJC.hex

This file was deleted.

6,612 changes: 0 additions & 6,612 deletions HexFile/V1.0.15/TL-D2P-4988-M-TJC.hex

This file was deleted.

6,612 changes: 0 additions & 6,612 deletions HexFile/V1.0.15/TL-D2P-4988-O-TJC.hex

This file was deleted.

6,780 changes: 0 additions & 6,780 deletions HexFile/V1.0.15/TL-D2P-DWN.hex

This file was deleted.

6,613 changes: 0 additions & 6,613 deletions HexFile/V1.0.15/TL-D3P-2208-M-TJC.hex

This file was deleted.

6,613 changes: 0 additions & 6,613 deletions HexFile/V1.0.15/TL-D3P-2208-O-TJC.hex

This file was deleted.

6,611 changes: 0 additions & 6,611 deletions HexFile/V1.0.15/TL-D3P-4988-M-TJC.hex

This file was deleted.

6,612 changes: 0 additions & 6,612 deletions HexFile/V1.0.15/TL-D3P-4988-O-TJC.hex

This file was deleted.

6,780 changes: 0 additions & 6,780 deletions HexFile/V1.0.15/TL-D3P-DWN.hex

This file was deleted.

6,611 changes: 0 additions & 6,611 deletions HexFile/V1.0.15/TL-D3S-4988-M-TJC.hex

This file was deleted.

6,613 changes: 0 additions & 6,613 deletions HexFile/V1.0.15/TL-D4P-2208-O-TJC.hex

This file was deleted.

6,611 changes: 0 additions & 6,611 deletions HexFile/V1.0.15/TL-D4P-4988-M-TJC.hex

This file was deleted.

6,612 changes: 0 additions & 6,612 deletions HexFile/V1.0.15/TL-D4P-4988-O-TJC.hex

This file was deleted.

6,780 changes: 0 additions & 6,780 deletions HexFile/V1.0.15/TL-D4P-DWN.hex

This file was deleted.

6,613 changes: 0 additions & 6,613 deletions HexFile/V1.0.15/TL-D5P-2208-M-TJC.hex

This file was deleted.

6,613 changes: 0 additions & 6,613 deletions HexFile/V1.0.15/TL-D5P-2208-O-TJC.hex

This file was deleted.

6,611 changes: 0 additions & 6,611 deletions HexFile/V1.0.15/TL-D5P-4988-M-TJC.hex

This file was deleted.

6,612 changes: 0 additions & 6,612 deletions HexFile/V1.0.15/TL-D5P-4988-O-TJC.hex

This file was deleted.

6,780 changes: 0 additions & 6,780 deletions HexFile/V1.0.15/TL-D5P-DWN.hex

This file was deleted.

6,613 changes: 0 additions & 6,613 deletions HexFile/V1.0.15/TL-D6P-2208-M-TJC.hex

This file was deleted.

6,613 changes: 0 additions & 6,613 deletions HexFile/V1.0.15/TL-D6P-2208-O-TJC.hex

This file was deleted.

6,611 changes: 0 additions & 6,611 deletions HexFile/V1.0.15/TL-D6P-4988-M-TJC.hex

This file was deleted.

6,612 changes: 0 additions & 6,612 deletions HexFile/V1.0.15/TL-D6P-4988-O-TJC.hex

This file was deleted.

6,780 changes: 0 additions & 6,780 deletions HexFile/V1.0.15/TL-D6P-DWN.hex

This file was deleted.

6,781 changes: 0 additions & 6,781 deletions HexFile/V1.0.15/TL-H2P-DWN.hex

This file was deleted.

6,610 changes: 0 additions & 6,610 deletions HexFile/V1.0.16/TL-D2P-2208-M-TJC.hex

This file was deleted.

6,610 changes: 0 additions & 6,610 deletions HexFile/V1.0.16/TL-D2P-2208-O-TJC.hex

This file was deleted.

6,609 changes: 0 additions & 6,609 deletions HexFile/V1.0.16/TL-D2P-4988-M-TJC.hex

This file was deleted.

6,609 changes: 0 additions & 6,609 deletions HexFile/V1.0.16/TL-D2P-4988-O-TJC.hex

This file was deleted.

6,876 changes: 0 additions & 6,876 deletions HexFile/V1.0.16/TL-D2P-DWN.hex

This file was deleted.

6,610 changes: 0 additions & 6,610 deletions HexFile/V1.0.16/TL-D3P-2208-M-TJC.hex

This file was deleted.

6,610 changes: 0 additions & 6,610 deletions HexFile/V1.0.16/TL-D3P-2208-O-TJC.hex

This file was deleted.

6,609 changes: 0 additions & 6,609 deletions HexFile/V1.0.16/TL-D3P-4988-M-TJC.hex

This file was deleted.

6,609 changes: 0 additions & 6,609 deletions HexFile/V1.0.16/TL-D3P-4988-O-TJC.hex

This file was deleted.

6,876 changes: 0 additions & 6,876 deletions HexFile/V1.0.16/TL-D3P-DWN.hex

This file was deleted.

6,609 changes: 0 additions & 6,609 deletions HexFile/V1.0.16/TL-D3S-4988-M-TJC.hex

This file was deleted.

6,610 changes: 0 additions & 6,610 deletions HexFile/V1.0.16/TL-D4P-2208-O-TJC.hex

This file was deleted.

6,609 changes: 0 additions & 6,609 deletions HexFile/V1.0.16/TL-D4P-4988-M-TJC.hex

This file was deleted.

6,609 changes: 0 additions & 6,609 deletions HexFile/V1.0.16/TL-D4P-4988-O-TJC.hex

This file was deleted.

6,876 changes: 0 additions & 6,876 deletions HexFile/V1.0.16/TL-D4P-DWN.hex

This file was deleted.

6,610 changes: 0 additions & 6,610 deletions HexFile/V1.0.16/TL-D5P-2208-M-TJC.hex

This file was deleted.

6,610 changes: 0 additions & 6,610 deletions HexFile/V1.0.16/TL-D5P-2208-O-TJC.hex

This file was deleted.

6,609 changes: 0 additions & 6,609 deletions HexFile/V1.0.16/TL-D5P-4988-M-TJC.hex

This file was deleted.

6,609 changes: 0 additions & 6,609 deletions HexFile/V1.0.16/TL-D5P-4988-O-TJC.hex

This file was deleted.

6,876 changes: 0 additions & 6,876 deletions HexFile/V1.0.16/TL-D5P-DWN.hex

This file was deleted.

6,610 changes: 0 additions & 6,610 deletions HexFile/V1.0.16/TL-D6P-2208-M-TJC.hex

This file was deleted.

6,610 changes: 0 additions & 6,610 deletions HexFile/V1.0.16/TL-D6P-2208-O-TJC.hex

This file was deleted.

6,609 changes: 0 additions & 6,609 deletions HexFile/V1.0.16/TL-D6P-4988-M-TJC.hex

This file was deleted.

6,609 changes: 0 additions & 6,609 deletions HexFile/V1.0.16/TL-D6P-4988-O-TJC.hex

This file was deleted.

6,876 changes: 0 additions & 6,876 deletions HexFile/V1.0.16/TL-D6P-DWN.hex

This file was deleted.

6,876 changes: 0 additions & 6,876 deletions HexFile/V1.0.16/TL-H2P-DWN.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-D3P-2208-M-TJC.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-D3P-2208-O-TJC.hex

This file was deleted.

6,606 changes: 0 additions & 6,606 deletions HexFile/V1.0.18/TL-D3P-4988-M-TJC.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-D3P-4988-O-TJC.hex

This file was deleted.

7,042 changes: 0 additions & 7,042 deletions HexFile/V1.0.18/TL-D3P-DWN.hex

This file was deleted.

6,606 changes: 0 additions & 6,606 deletions HexFile/V1.0.18/TL-D3S-4988-M-TJC.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-D4P-2208-O-TJC.hex

This file was deleted.

6,606 changes: 0 additions & 6,606 deletions HexFile/V1.0.18/TL-D4P-4988-M-TJC.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-D4P-4988-O-TJC.hex

This file was deleted.

7,042 changes: 0 additions & 7,042 deletions HexFile/V1.0.18/TL-D4P-DWN.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-D5P-2208-M-TJC.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-D5P-2208-O-TJC.hex

This file was deleted.

6,606 changes: 0 additions & 6,606 deletions HexFile/V1.0.18/TL-D5P-4988-M-TJC.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-D5P-4988-O-TJC.hex

This file was deleted.

7,042 changes: 0 additions & 7,042 deletions HexFile/V1.0.18/TL-D5P-DWN.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-D6P-2208-M-TJC.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-D6P-2208-O-TJC.hex

This file was deleted.

6,606 changes: 0 additions & 6,606 deletions HexFile/V1.0.18/TL-D6P-4988-M-TJC.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-D6P-4988-O-TJC.hex

This file was deleted.

7,042 changes: 0 additions & 7,042 deletions HexFile/V1.0.18/TL-D6P-DWN.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-H2-2208-M-TJC.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-H2-2208-O-TJC.hex

This file was deleted.

6,606 changes: 0 additions & 6,606 deletions HexFile/V1.0.18/TL-H2-4988-M-TJC.hex

This file was deleted.

6,607 changes: 0 additions & 6,607 deletions HexFile/V1.0.18/TL-H2-4988-O-TJC.hex

This file was deleted.

7,042 changes: 0 additions & 7,042 deletions HexFile/V1.0.18/TL-H2-DWN.hex

This file was deleted.

7,042 changes: 0 additions & 7,042 deletions HexFile/V1.0.18/TL-H2P-DWN.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D3P-2208-M-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D3P-2208-O-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D3P-4988-M-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D3P-4988-O-TJC.hex

This file was deleted.

7,057 changes: 0 additions & 7,057 deletions HexFile/V1.0.19/TL-D3P-DWN.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D3P-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D3S-4988-M-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D4P-2208-O-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D4P-4988-M-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D4P-4988-O-TJC.hex

This file was deleted.

7,057 changes: 0 additions & 7,057 deletions HexFile/V1.0.19/TL-D4P-DWN.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D5P-2208-M-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D5P-2208-O-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D5P-4988-M-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D5P-4988-O-TJC.hex

This file was deleted.

7,057 changes: 0 additions & 7,057 deletions HexFile/V1.0.19/TL-D5P-DWN.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D6P-2208-M-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D6P-2208-O-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D6P-4988-M-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-D6P-4988-O-TJC.hex

This file was deleted.

7,057 changes: 0 additions & 7,057 deletions HexFile/V1.0.19/TL-D6P-DWN.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-H2-2208-M-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-H2-2208-O-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-H2-4988-M-TJC.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-H2-4988-O-TJC.hex

This file was deleted.

7,057 changes: 0 additions & 7,057 deletions HexFile/V1.0.19/TL-H2-DWN.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-H2-TJC.hex

This file was deleted.

7,057 changes: 0 additions & 7,057 deletions HexFile/V1.0.19/TL-H2P-DWN.hex

This file was deleted.

6,659 changes: 0 additions & 6,659 deletions HexFile/V1.0.19/TL-H2P-TJC.hex

This file was deleted.

4 changes: 2 additions & 2 deletions Marlin/Configuration_tenlog.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ BOF UPDATE LOG
EOF UPDATE LOG
*/

#define VERSION_STRING "1.0.19"
#define VERSION_STRING "1.0.19M"
//#define TL_DEBUG

//#define TL_TJC_CONTROLLER
Expand Down Expand Up @@ -280,4 +280,4 @@ const bool Y_ENDSTOPS_INVERTING = true; //Y Optical switch
#define ENGRAVE_PIN 37
#endif

#endif //CONFIGURATION_TL_H
#endif //CONFIGURATION_TL_H
14 changes: 7 additions & 7 deletions Marlin/Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1709,7 +1709,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("sleep=0");
Expand Down Expand Up @@ -1887,7 +1887,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("msgbox.vaFromPageID.val=1");
Expand Down Expand Up @@ -2342,7 +2342,7 @@ void get_command()
if (languageID == 0)
strPLR = "Power off in 5 seconds.";
else
strPLR = "5���ػ�";
strPLR = "5秒后关机";
bAutoOff = true;
}
}
Expand All @@ -2352,7 +2352,7 @@ void get_command()
if (languageID == 0)
strMessage = "Print finished, " + String(hours) + " hours and " + String(minutes) + " minutes.\r\n";
else
strMessage = "��ӡ��ɣ�������" + String(hours) + "ʱ" + String(minutes) + "�֡�";
strMessage = "打印完成!共用了" + String(hours) + "" + String(minutes) + "分。";
strMessage = "msgbox.tMessage.txt=\"" + strMessage + strPLR + "\"";
const char* str0 = strMessage.c_str();
TenlogScreen_println("sleep=0");
Expand Down Expand Up @@ -2757,7 +2757,7 @@ void command_G28(int XHome = 0, int YHome = 0, int ZHome = 0) { //By zyf
current_position[Z_AXIS] = 0;
current_position[Y_AXIS] = 0;

int Y_step_per_unit = axis_steps_per_unit[Y_AXIS];
float Y_step_per_unit = axis_steps_per_unit[Y_AXIS];
axis_steps_per_unit[Y_AXIS] = axis_steps_per_unit[Z_AXIS];

plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
Expand Down Expand Up @@ -5380,10 +5380,10 @@ void get_coordinates(float XValue = -99999.0, float YValue = -99999.0, float ZVa

float fRate = 1.0;
#ifdef TL_TJC_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