Skip to content

Commit f4acb38

Browse files
author
bigtreetech
committed
add third tool parameter
1 parent 87b6fb3 commit f4acb38

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

‎TFT/src/User/API/MachineParameters.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
static const uint8_t parameterElementCount[PARAMETERS_COUNT] = {
77
AXIS_INDEX_COUNT, // Steps/mm (X, Y, Z, E0, E1)
8-
3, // Filament Diameter (Enable, E0, E1)
8+
4, // Filament Diameter (Enable, E0, E1, E2)
99
AXIS_INDEX_COUNT, // MaxAcceleration (X, Y, Z, E0, E1)
1010
AXIS_INDEX_COUNT, // MaxFeedrate (X, Y, Z, E0, E1)
1111
3, // Acceleration (Print, Retract, Travel)
@@ -26,7 +26,7 @@ static const uint8_t parameterElementCount[PARAMETERS_COUNT] = {
2626
3, // Delta Diagonal Rod Trim
2727
3, // Delta Endstop Adjustments
2828
(AXIS_INDEX_COUNT - 2), // Probe offset (X, Y, Z)
29-
2, // Linear Advance (E0, E1)
29+
3, // Linear Advance (E0, E1, E2)
3030
STEPPER_INDEX_COUNT, // Stepper Motor Current (X, X2, Y, Y2, Z, Z2, Z3, Z4, E0, E1)
3131
STEPPER_INDEX_COUNT, // TMC Hybrid Threshold Speed (X, X2, Y, Y2, Z, Z2, Z3, Z4, E0, E1)
3232
(STEPPER_INDEX_COUNT - 2), // TMC Bump Sensitivity (X, X2, Y, Y2, Z, Z2, Z3, Z4)
@@ -65,7 +65,7 @@ static const char * const parameterCode[PARAMETERS_COUNT] = {
6565

6666
static const char * const parameterCmd[PARAMETERS_COUNT][MAX_ELEMENT_COUNT] = {
6767
{"X%.4f\n", "Y%.4f\n", "Z%.2f\n", "T0 E%.2f\n", "T1 E%.2f\n", NULL, NULL, NULL, NULL, NULL}, // Steps/mm (X, Y, Z, E0, E1)
68-
{"S%.0f\n", "S1 T0 D%.2f\n", "S1 T1 D%.2f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Filament Diameter (Enable, E0, E1)
68+
{"S%.0f\n", "S1 T0 D%.2f\n", "S1 T1 D%.2f\n", "S1 T2 D%.2f\n",NULL, NULL, NULL, NULL, NULL, NULL}, // Filament Diameter (Enable, E0, E1)
6969
{"X%.0f\n", "Y%.0f\n", "Z%.0f\n", "T0 E%.0f\n", "T1 E%.0f\n", NULL, NULL, NULL, NULL, NULL}, // MaxAcceleration (X, Y, Z, E0, E1)
7070
{"X%.0f\n", "Y%.0f\n", "Z%.0f\n", "T0 E%.0f\n", "T1 E%.0f\n", NULL, NULL, NULL, NULL, NULL}, // MaxFeedrate (X, Y, Z, E0, E1)
7171
{"P%.0f\n", "R%.0f\n", "T%.0f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Acceleration (Print, Retract, Travel)
@@ -86,7 +86,7 @@ static const char * const parameterCmd[PARAMETERS_COUNT][MAX_ELEMENT_COUNT] = {
8686
{"A%.4f\n", "B%.4f\n", "C%.4f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Delta Diagonal Rod Trim (Dx, Dy, Dz)
8787
{"X%.4f\n", "Y%.4f\n", "Z%.4f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Delta Endstop Adjustments (Ex, Ey, Ez)
8888
{"X%.2f\n", "Y%.2f\n", "Z%.2f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Probe offset (X, Y, Z)
89-
{"T0 K%.3f\n", "T1 K%.3f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Linear Advance (E0, E1)
89+
{"T0 K%.3f\n", "T1 K%.3f\n", "T2 K%.3f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Linear Advance (E0, E1)
9090
{"I0 X%.0f\n", "I1 X%.0f\n", "I0 Y%.0f\n", "I1 Y%.0f\n", "I0 Z%.0f\n", "I1 Z%.0f\n", "I2 Z%.0f\n", "I3 Z%.0f\n", "T0 E%.0f\n", "T1 E%.0f\n"}, // Stepper Motor Current (X, X2, Y, Y2, Z, Z2, Z3, Z4, E0, E1)
9191
{"I1 X%.0f\n", "I2 X%.0f\n", "I1 Y%.0f\n", "I2 Y%.0f\n", "I1 Z%.0f\n", "I2 Z%.0f\n", "I3 Z%.0f\n", "I4 Z%.0f\n", "T0 E%.0f\n", "T1 E%.0f\n"}, // TMC Hybrid Threshold Speed (X, X2, Y, Y2, Z, Z2, Z3, Z4, E0, E1)
9292
{"I1 X%.0f\n", "I2 X%.0f\n", "I1 Y%.0f\n", "I2 Y%.0f\n", "I1 Z%.0f\n", "I2 Z%.0f\n", "I3 Z%.0f\n", "I4 Z%.0f\n", NULL, NULL}, // TMC Bump Sensitivity (X, X2, Y, Y2, Z, Z2, Z3, Z4)
@@ -95,7 +95,7 @@ static const char * const parameterCmd[PARAMETERS_COUNT][MAX_ELEMENT_COUNT] = {
9595

9696
static const VAL_TYPE parameterValType[PARAMETERS_COUNT][MAX_ELEMENT_COUNT] = {
9797
{VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, // Steps/mm (X, Y, Z, E0, E1)
98-
{VAL_TYPE_INT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, // Filament Diameter (Enable, E0, E1)
98+
{VAL_TYPE_INT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, // Filament Diameter (Enable, E0, E1, E2)
9999
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT}, // MaxAcceleration (X, Y, Z, E0, E1)
100100
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT}, // MaxFeedrate (X, Y, Z, E0, E1)
101101
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT}, // Acceleration (Print, Retract, Travel)
@@ -117,7 +117,7 @@ static const VAL_TYPE parameterValType[PARAMETERS_COUNT][MAX_ELEMENT_COUNT] = {
117117
{VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT}, // Delta Diagonal Rod Trim (Dx, Dy, Dz)
118118
{VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT}, // Delta Endstop Adjustments (Ex, Ey, Ez)
119119
{VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT}, // Probe offset (X, Y, Z)
120-
{VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, // Linear Advance (E0, E1)
120+
{VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, // Linear Advance (E0, E1, E2)
121121
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, // Stepper Motor Current (X, X2, Y, Y2, Z, Z2, Z3, Z4, E0, E1)
122122
VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT},
123123
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, // TMC Hybrid Threshold Speed (X, X2, Y, Y2, Z, Z2, Z3, Z4, E0, E1)
@@ -139,7 +139,7 @@ char * const stepperDisplayID[STEPPER_INDEX_COUNT] = STEPPER_DISPLAY_ID;
139139
#define ONOFF_DISPLAY_ID "1=ON 0=OFF"
140140

141141
// param attributes hard coded labels
142-
char * const filamentDiaDisplayID[] = {"S " ONOFF_DISPLAY_ID, "T0 Ø Filament", "T1 Ø Filament"};
142+
char * const filamentDiaDisplayID[] = {"S " ONOFF_DISPLAY_ID, "T0 Ø Filament", "T1 Ø Filament", "T2 Ø Filament"};
143143
char * const autoRetractDisplayID[] = {"S " ONOFF_DISPLAY_ID};
144144
char * const hotendPidDisplayID[] = {"Kp", "Ki", "Kd"};
145145
char * const bedPidDisplayID[] = {"Kp", "Ki", "Kd"};
@@ -152,7 +152,7 @@ char * const deltaConfigurationDisplayID[] = {"Height", "Segment/sec.", "Radius"
152152
char * const deltaTowerAngleDisplayID[] = {"Tx", "Ty", "Tz"};
153153
char * const deltaDiagonalRodDisplayID[] = {"Dx", "Dy", "Dz"};
154154
char * const deltaEndstopDisplayID[] = {"Ex", "Ey", "Ez"};
155-
char * const linAdvDisplayID[] = {"K-Factor E0", "K-Factor E1"};
155+
char * const linAdvDisplayID[] = {"K-Factor E0", "K-Factor E1", "K-Factor E2"};
156156

157157
// param attributes configurable labels
158158
const LABEL accelDisplayID[] = {LABEL_PRINT_ACCELERATION, LABEL_RETRACT_ACCELERATION, LABEL_TRAVEL_ACCELERATION};

0 commit comments

Comments
 (0)