Skip to content

Commit

Permalink
Add support for junction deviation (bigtreetech#1192)
Browse files Browse the repository at this point in the history
* Add support for junction deviation
Add ability to handle more precise values for floats

* Update config.ini instructions
  • Loading branch information
mak0t0san authored and Manu512 committed Nov 3, 2020
1 parent babdf17 commit a4344a2
Show file tree
Hide file tree
Showing 52 changed files with 70 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
# M115_GEOMETRY_REPORT (in Configuration_adv.h)
# REPORT_FAN_CHANGE (in Configuration_adv.h)
# EMERGENCY_PARSER (in Configuration_adv.h)
# SERIAL_FLOAT_PRECISION 4 (in Configuration_adv.h)

#--------------------------------------------------------------------
# General Settings
Expand Down
1 change: 1 addition & 0 deletions Copy to SD Card root directory to update/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
# M115_GEOMETRY_REPORT (in Configuration_adv.h)
# REPORT_FAN_CHANGE (in Configuration_adv.h)
# EMERGENCY_PARSER (in Configuration_adv.h)
# SERIAL_FLOAT_PRECISION 4 (in Configuration_adv.h)

#--------------------------------------------------------------------
# General Settings
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/Language.inc
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ X_WORD (MAXFEEDRATE)
X_WORD (MAXACCELERATION)
X_WORD (ACCELERATION)
X_WORD (JERK)
X_WORD (JUNCTION_DEVIATION)
X_WORD (PRINT_ACCELERATION)
X_WORD (RETRACT_ACCELERATION)
X_WORD (TRAVEL_ACCELERATION)
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_am.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Retract Acceleration"
#define STRING_TRAVEL_ACCELERATION "Travel Acceleration"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC bump sensitivity"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_ca.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Acceleració Retracció"
#define STRING_TRAVEL_ACCELERATION "Acceleració Viatge"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "Sensibilitat al topall TMC"
#define STRING_FWRETRACT "Retracció de FW"
#define STRING_FWRECOVER "Recuperació de Retracció de FW"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_cn.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "回抽加速度"
#define STRING_TRAVEL_ACCELERATION "空载加速度"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC堵转检测灵敏度"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_cz.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Zrychlení retrakcí"
#define STRING_TRAVEL_ACCELERATION "Zrychlení při přesunu"
#define STRING_JERK "Jerk-trhnutí"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "Citlivost nárazu TMC"
#define STRING_FWRETRACT "FW Zatažení"
#define STRING_FWRECOVER "FW Obnovení"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_de.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Retract Acceleration"
#define STRING_TRAVEL_ACCELERATION "Travel Acceleration"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC bump sensitivity"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_du.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Retract Acceleratie"
#define STRING_TRAVEL_ACCELERATION "Travel Acceleratie"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC bump sensitiviteit"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_en.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Retract Acceleration"
#define STRING_TRAVEL_ACCELERATION "Travel Acceleration"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC bump sensitivity"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_es.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Retract Acceleration"
#define STRING_TRAVEL_ACCELERATION "Travel Acceleration"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC bump sensitivity"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_fr.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Rétraction"
#define STRING_TRAVEL_ACCELERATION "Déplacements"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "Sensibilité TMC"
#define STRING_FWRETRACT "Rétraction FW"
#define STRING_FWRECOVER "Récupération FW"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_gr.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Eπιτάχυνση ανάκλησης"
#define STRING_TRAVEL_ACCELERATION "Επιτάχυνση ταξιδιού"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC ευαισθησία χτυπήματος"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_hu.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Adagoló Gyorsulása"
#define STRING_TRAVEL_ACCELERATION "Utazási Gyorsulás"
#define STRING_JERK "Rántás"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC ütközés érzékenység"
#define STRING_FWRETRACT "FW Visszahúzás"
#define STRING_FWRECOVER "FW Visszahúzás helyreáll."
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_it.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Accel. Ritrazione"
#define STRING_TRAVEL_ACCELERATION "Accel. Spostamenti"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC bump sensitivity"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_jp.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "引き戻し加速度"
#define STRING_TRAVEL_ACCELERATION "空振り加速度"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC バンプ感度"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_keywords.h
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ extern "C" {
#define LANG_KEY_RETRACT_ACCELERATION "label_retract_acceleration:"
#define LANG_KEY_TRAVEL_ACCELERATION "label_travel_acceleration:"
#define LANG_KEY_JERK "label_jerk:"
#define LANG_KEY_JUNCTION_DEVIATION "label_junction_deviation:"
#define LANG_KEY_BUMP_SENSITIVITY "label_bump_sensitivity:"
#define LANG_KEY_FWRETRACT "label_fwretract:"
#define LANG_KEY_FWRECOVER "label_fwrecover:"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_pl.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Retract Acceleration"
#define STRING_TRAVEL_ACCELERATION "Travel Acceleration"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC bump sensitivity"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_pt.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Retract Acceleration"
#define STRING_TRAVEL_ACCELERATION "Travel Acceleration"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC bump sensitivity"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_ru.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Ретракта"
#define STRING_TRAVEL_ACCELERATION "Перемещения"
#define STRING_JERK "Рывок"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC чувствительность удара"
#define STRING_FWRETRACT "M207 ретракт"
#define STRING_FWRECOVER "M208 восстановление ретракта"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_sk.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Akcelerácia retrakcie"
#define STRING_TRAVEL_ACCELERATION "Akcelerácia presunu"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC bump citlivosť"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_sl.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Pospešek privleka fil."
#define STRING_TRAVEL_ACCELERATION "Pospešek pomika"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC občutljivost trka"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_tc.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "回抽加速度"
#define STRING_TRAVEL_ACCELERATION "空跑加速度"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "堵料檢測靈敏度"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/Language/language_tr.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
#define STRING_RETRACT_ACCELERATION "Geriçekme İvmelenmesi"
#define STRING_TRAVEL_ACCELERATION "Gezinti İvmelenmesi"
#define STRING_JERK "Jerk"
#define STRING_JUNCTION_DEVIATION "Junction Deviation"
#define STRING_BUMP_SENSITIVITY "TMC çarpma hassasiyeti"
#define STRING_FWRETRACT "FW Retraction"
#define STRING_FWRECOVER "FW Retraction Recover"
Expand Down
17 changes: 12 additions & 5 deletions TFT/src/User/API/MachineParameters.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PARAMETERS infoParameters;

const u8 parameter_element_count[PARAMETERS_COUNT] = {5, 5, 5, 5, 3, 4, 3, 3, 4, 4, 1, 2, 2, 3, 5};
const u8 parameter_element_count[PARAMETERS_COUNT] = {5, 5, 5, 5, 3, 4, 1, 3, 3, 4, 4, 1, 2, 2, 3, 5};

const char *const parameter_Cmd[PARAMETERS_COUNT][STEPPER_COUNT] = {
{"M92 X%.2f\n", "M92 Y%.2f\n", "M92 Z%.2f\n", "M92 T0 E%.2f\n", "M92 T1 E%.2f\nM503 S0\n"}, //Steps/mm
Expand All @@ -12,6 +12,7 @@ const char *const parameter_Cmd[PARAMETERS_COUNT][STEPPER_COUNT] = {
{"M201 X%.0f\n", "M201 Y%.0f\n", "M201 Z%.0f\n", "M201 T0 E%.0f\n", "M201 T1 E%.0f\nM503 S0\n"}, //MaxAcceleration
{"M204 P%.0f\n", "M204 R%.0f\n", "M204 T%.0f\n", NULL, NULL}, //Acceleration
{"M205 X%.0f\n", "M205 Y%.0f\n", "M205 Z%.2f\n", "M205 E%.2f\n", NULL}, //Jerk
{"M205 J%.3f\n", NULL, NULL, NULL, NULL}, //Junction Deviation
{"M851 X%.2f\n", "M851 Y%.2f\n", "M851 Z%.2f\n", NULL, NULL}, //Probe offset
{"M914 X%.0f\n", "M914 Y%.0f\n", "M914 Z%.0f\n", NULL, NULL}, //bump Sensitivity
{"M207 S%.2f\n", "M207 W%.2f\n", "M207 F%.2f\n", "M207 Z%.2f\n", NULL}, //FW retract
Expand All @@ -30,12 +31,13 @@ const VAL_TYPE parameter_val_type[PARAMETERS_COUNT][STEPPER_COUNT] = {
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT}, //MaxAcceleration
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT}, //Acceleration
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, //Jerk
{VAL_TYPE_FLOAT}, //Junction Deviation
{VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT}, //Probe offset
{VAL_TYPE_NEG_INT, VAL_TYPE_NEG_INT, VAL_TYPE_NEG_INT}, //bump Sensitivity
{VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_INT, VAL_TYPE_FLOAT}, //FW retract
{VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_INT, VAL_TYPE_INT}, //FW retract recover
{VAL_TYPE_INT}, //Set auto FW retract
{VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, //Linear Advance
{VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, //Linear Advance
{VAL_TYPE_INT, VAL_TYPE_FLOAT}, //ABL State + Z Fade
{VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT}, //Offset Tools
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT}, //TMC Hybrid Threshold Speed
Expand All @@ -57,7 +59,7 @@ const LABEL accel_disp_ID[] = {LABEL_PRINT_ACCELERATION, LABEL_RETRACT_ACCELERAT
const LABEL retract_disp_ID[] = {LABEL_RETRACT_LENGTH, LABEL_RETRACT_SWAP_LENGTH, LABEL_RETRACT_FEEDRATE, LABEL_RETRACT_Z_LIFT};
const LABEL recover_disp_ID[] = {LABEL_RECOVER_LENGTH, LABEL_SWAP_RECOVER_LENGTH, LABEL_RECOVER_FEEDRATE, LABEL_SWAP_RECOVER_FEEDRATE};
const LABEL retract_auto_ID[] = {LABEL_RETRACT_AUTO};

const LABEL junction_deviation_disp_ID[] = {LABEL_JUNCTION_DEVIATION};

float getParameter(PARAMETER_NAME name, u8 index)
{
Expand All @@ -76,6 +78,8 @@ float getParameter(PARAMETER_NAME name, u8 index)
return infoParameters.Acceleration[index];
case P_JERK:
return infoParameters.Jerk[index];
case P_JUNCTION_DEVIATION:
return infoParameters.JunctionDeviation[index];
case P_PROBE_OFFSET:
return infoParameters.ProbeOffset[index];
case P_BUMPSENSITIVITY:
Expand All @@ -93,7 +97,7 @@ float getParameter(PARAMETER_NAME name, u8 index)
case P_OFFSET_TOOL:
return infoParameters.OffsetTool[index];
case P_HYBRID_THRESHOLD:
return infoParameters.HybridThreshold[index];
return infoParameters.HybridThreshold[index];
default:
return 0.0f;
}
Expand Down Expand Up @@ -122,6 +126,9 @@ void setParameter(PARAMETER_NAME name, u8 index, float val)
case P_JERK:
infoParameters.Jerk[index] = val;
break;
case P_JUNCTION_DEVIATION:
infoParameters.JunctionDeviation[index] = val;
break;
case P_PROBE_OFFSET:
infoParameters.ProbeOffset[index] = val;
break;
Expand Down Expand Up @@ -183,7 +190,7 @@ void sendParameterCmd(PARAMETER_NAME para, u8 stepper_index, float Value)
storeCmd(dualStepperParameter_cmd[0][stepper_index], Value);
if(para == P_BUMPSENSITIVITY)
storeCmd(dualStepperParameter_cmd[1][stepper_index], Value);
if(para == P_HYBRID_THRESHOLD)
if(para == P_HYBRID_THRESHOLD)
storeCmd(dualStepperParameter_cmd[2][stepper_index], Value);
}
}
Expand Down
3 changes: 3 additions & 0 deletions TFT/src/User/API/MachineParameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ P_MAX_FEED_RATE,
P_MAX_ACCELERATION,
P_ACCELERATION,
P_JERK,
P_JUNCTION_DEVIATION,
P_PROBE_OFFSET,
P_BUMPSENSITIVITY,
P_FWRETRACT,
Expand Down Expand Up @@ -60,6 +61,7 @@ float MaxFeedRate[STEPPER_COUNT];
float MaxAcceleration[STEPPER_COUNT];
float Acceleration[3];
float Jerk[4];
float JunctionDeviation[1];
float ProbeOffset[3];
float BumpSensitivity[3];
float FwRetract[4];
Expand All @@ -78,6 +80,7 @@ extern const LABEL accel_disp_ID[];
extern const LABEL retract_disp_ID[];
extern const LABEL recover_disp_ID[];
extern const LABEL retract_auto_ID[];
extern const LABEL junction_deviation_disp_ID[];

float getParameter(PARAMETER_NAME name, uint8_t index);
void setParameter(PARAMETER_NAME name, uint8_t index, float val);
Expand Down
2 changes: 1 addition & 1 deletion TFT/src/User/API/UI/Numpad.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ float numPadFloat(u8* title, float old_val, float reset_val, bool negative)
setLargeFont(true);
u8 nowIndex = 0, lastIndex = 0;
char ParameterBuf[FLOAT_BUFLONG + 1] = {0};
u8 prec = (old_val == 0) ? 0 : 2;
u8 prec = (old_val == 0) ? 0 : 3;
sprintf(ParameterBuf,"%.*f", prec, old_val);
nowIndex = strlen(ParameterBuf);

Expand Down
4 changes: 3 additions & 1 deletion TFT/src/User/API/UI/list_item.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,9 @@ char * getDynamicTextValue(uint8_t i){

// save dynamic value (upto 7 digits) ( i : index of the value position, value:float value)
void setDynamicValue(uint8_t i,float value){
if (value < 1000.0f)
if(value < 1.0f)
sprintf(dynamic_text_value[i], "%.3f", value);
else if (value < 1000.0f)
sprintf(dynamic_text_value[i], "%.2f", value);
else
sprintf(dynamic_text_value[i], "%.1f", value);
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/interfaceCmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ void sendQueueCmd(void)
if(cmd_seen('Y')) setParameter(P_JERK, Y_AXIS, cmd_float());
if(cmd_seen('Z')) setParameter(P_JERK, Z_AXIS, cmd_float());
if(cmd_seen('E')) setParameter(P_JERK, E_AXIS, cmd_float());
if(cmd_seen('J')) setParameter(P_JUNCTION_DEVIATION, 0, cmd_float());
break;
case 207: //M207 FW Retract
if(cmd_seen('S')) setParameter(P_FWRETRACT, 0, cmd_float());
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/API/parseACK.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ void parseACK(void)
if(ack_seen("Y")) setParameter(P_JERK, Y_STEPPER, ack_value());
if(ack_seen("Z")) setParameter(P_JERK, Z_STEPPER, ack_value());
if(ack_seen("E")) setParameter(P_JERK, E_STEPPER, ack_value());
if(ack_seen("J")) setParameter(P_JUNCTION_DEVIATION, 0, ack_value());
}
//parse and store FW retraction values
else if(ack_seen("M207 S")){
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/Language Packs/language_am.ini
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ label_print_acceleration:Print Acceleration
label_retract_acceleration:Retract Acceleration
label_travel_acceleration:Travel Acceleration
label_jerk:Jerk
label_junction_deviation:Junction Deviation
label_bump_sensitivity:TMC bump sensitivity
label_fwretract:FW Retraction
label_fwrecover:FW Retraction Recover
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/Language Packs/language_ca.ini
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ label_print_acceleration:Acceleració Impressió
label_retract_acceleration:Acceleració Retracció
label_travel_acceleration:Acceleració Viatge
label_jerk:Jerk
label_junction_deviation:Junction Deviation
label_bump_sensitivity:Sensibilitat al topall TMC
label_fwretract:Retracció de FW
label_fwrecover:Recuperació de Retracció de FW
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/Language Packs/language_cn.ini
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ label_print_acceleration:打印加速度
label_retract_acceleration:回抽加速度
label_travel_acceleration:空载加速度
label_jerk:Jerk
label_junction_deviation:Junction Deviation
label_bump_sensitivity:TMC堵转检测灵敏度
label_fwretract:FW Retraction
label_fwrecover:FW Retraction Recover
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/Language Packs/language_cz.ini
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ label_print_acceleration:Zrychlení při tisku
label_retract_acceleration:Zrychlení retrakcí
label_travel_acceleration:Zrychlení při přesunu
label_jerk:Jerk-trhnutí
label_junction_deviation:Junction Deviation
label_bump_sensitivity:Citlivost nárazu TMC
label_fwretract:FW Zatažení
label_fwrecover:FW Obnovení
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/Language Packs/language_de.ini
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ label_print_acceleration:Print Acceleration
label_retract_acceleration:Retract Acceleration
label_travel_acceleration:Travel Acceleration
label_jerk:Jerk
label_junction_deviation:Junction Deviation
label_bump_sensitivity:TMC bump sensitivity
label_fwretract:FW Retraction
label_fwrecover:FW Retraction Recover
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/Language Packs/language_du.ini
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ label_print_acceleration:Afdruk Acceleratie
label_retract_acceleration:Retract Acceleratie
label_travel_acceleration:Travel Acceleratie
label_jerk:Jerk
label_junction_deviation:Junction Deviation
label_bump_sensitivity:TMC bump sensitiviteit
label_fwretract:FW Retraction
label_fwrecover:FW Retraction Recover
Expand Down
Loading

0 comments on commit a4344a2

Please sign in to comment.