Skip to content

Commit

Permalink
add third tool parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
bigtreetech committed Apr 22, 2024
1 parent 87b6fb3 commit f4acb38
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions TFT/src/User/API/MachineParameters.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

static const uint8_t parameterElementCount[PARAMETERS_COUNT] = {
AXIS_INDEX_COUNT, // Steps/mm (X, Y, Z, E0, E1)
3, // Filament Diameter (Enable, E0, E1)
4, // Filament Diameter (Enable, E0, E1, E2)
AXIS_INDEX_COUNT, // MaxAcceleration (X, Y, Z, E0, E1)
AXIS_INDEX_COUNT, // MaxFeedrate (X, Y, Z, E0, E1)
3, // Acceleration (Print, Retract, Travel)
Expand All @@ -26,7 +26,7 @@ static const uint8_t parameterElementCount[PARAMETERS_COUNT] = {
3, // Delta Diagonal Rod Trim
3, // Delta Endstop Adjustments
(AXIS_INDEX_COUNT - 2), // Probe offset (X, Y, Z)
2, // Linear Advance (E0, E1)
3, // Linear Advance (E0, E1, E2)
STEPPER_INDEX_COUNT, // Stepper Motor Current (X, X2, Y, Y2, Z, Z2, Z3, Z4, E0, E1)
STEPPER_INDEX_COUNT, // TMC Hybrid Threshold Speed (X, X2, Y, Y2, Z, Z2, Z3, Z4, E0, E1)
(STEPPER_INDEX_COUNT - 2), // TMC Bump Sensitivity (X, X2, Y, Y2, Z, Z2, Z3, Z4)
Expand Down Expand Up @@ -65,7 +65,7 @@ static const char * const parameterCode[PARAMETERS_COUNT] = {

static const char * const parameterCmd[PARAMETERS_COUNT][MAX_ELEMENT_COUNT] = {
{"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)
{"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)
{"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)
{"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)
{"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)
{"P%.0f\n", "R%.0f\n", "T%.0f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Acceleration (Print, Retract, Travel)
Expand All @@ -86,7 +86,7 @@ static const char * const parameterCmd[PARAMETERS_COUNT][MAX_ELEMENT_COUNT] = {
{"A%.4f\n", "B%.4f\n", "C%.4f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Delta Diagonal Rod Trim (Dx, Dy, Dz)
{"X%.4f\n", "Y%.4f\n", "Z%.4f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Delta Endstop Adjustments (Ex, Ey, Ez)
{"X%.2f\n", "Y%.2f\n", "Z%.2f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Probe offset (X, Y, Z)
{"T0 K%.3f\n", "T1 K%.3f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Linear Advance (E0, E1)
{"T0 K%.3f\n", "T1 K%.3f\n", "T2 K%.3f\n", NULL, NULL, NULL, NULL, NULL, NULL, NULL}, // Linear Advance (E0, E1)
{"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)
{"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)
{"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)
Expand All @@ -95,7 +95,7 @@ static const char * const parameterCmd[PARAMETERS_COUNT][MAX_ELEMENT_COUNT] = {

static const VAL_TYPE parameterValType[PARAMETERS_COUNT][MAX_ELEMENT_COUNT] = {
{VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, // Steps/mm (X, Y, Z, E0, E1)
{VAL_TYPE_INT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, // Filament Diameter (Enable, E0, E1)
{VAL_TYPE_INT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, // Filament Diameter (Enable, E0, E1, E2)
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT}, // MaxAcceleration (X, Y, Z, E0, E1)
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT}, // MaxFeedrate (X, Y, Z, E0, E1)
{VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT}, // Acceleration (Print, Retract, Travel)
Expand All @@ -117,7 +117,7 @@ static const VAL_TYPE parameterValType[PARAMETERS_COUNT][MAX_ELEMENT_COUNT] = {
{VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT}, // Delta Diagonal Rod Trim (Dx, Dy, Dz)
{VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT}, // Delta Endstop Adjustments (Ex, Ey, Ez)
{VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT}, // Probe offset (X, Y, Z)
{VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, // Linear Advance (E0, E1)
{VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, // Linear Advance (E0, E1, E2)
{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)
VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT, VAL_TYPE_INT},
{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)
Expand All @@ -139,7 +139,7 @@ char * const stepperDisplayID[STEPPER_INDEX_COUNT] = STEPPER_DISPLAY_ID;
#define ONOFF_DISPLAY_ID "1=ON 0=OFF"

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

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

0 comments on commit f4acb38

Please sign in to comment.