|
|
@@ -495,14 +495,19 @@ static void lcd_tune_menu() {
|
|
495
|
495
|
|
|
496
|
496
|
//
|
|
497
|
497
|
// Nozzle:
|
|
|
498
|
+ // Nozzle 1:
|
|
498
|
499
|
// Nozzle 2:
|
|
499
|
500
|
// Nozzle 3:
|
|
500
|
501
|
// Nozzle 4:
|
|
501
|
502
|
//
|
|
502
|
|
- #if TEMP_SENSOR_0 != 0
|
|
503
|
|
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
|
|
504
|
|
- #endif
|
|
505
|
|
- #if EXTRUDERS > 1
|
|
|
503
|
+ #if EXTRUDERS == 1
|
|
|
504
|
+ #if TEMP_SENSOR_0 != 0
|
|
|
505
|
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
|
|
|
506
|
+ #endif
|
|
|
507
|
+ #else //EXTRUDERS > 1
|
|
|
508
|
+ #if TEMP_SENSOR_0 != 0
|
|
|
509
|
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N1, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
|
|
|
510
|
+ #endif
|
|
506
|
511
|
#if TEMP_SENSOR_1 != 0
|
|
507
|
512
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
|
|
508
|
513
|
#endif
|
|
|
@@ -536,18 +541,21 @@ static void lcd_tune_menu() {
|
|
536
|
541
|
MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[active_extruder], 10, 999);
|
|
537
|
542
|
|
|
538
|
543
|
//
|
|
539
|
|
- // Flow 0:
|
|
|
544
|
+ // Flow:
|
|
540
|
545
|
// Flow 1:
|
|
541
|
546
|
// Flow 2:
|
|
542
|
547
|
// Flow 3:
|
|
|
548
|
+ // Flow 4:
|
|
543
|
549
|
//
|
|
544
|
|
- MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N0, &extruder_multiplier[0], 10, 999);
|
|
545
|
|
- #if EXTRUDERS > 1
|
|
546
|
|
- MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiplier[1], 10, 999);
|
|
|
550
|
+ #if EXTRUDERS == 1
|
|
|
551
|
+ MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[0], 10, 999);
|
|
|
552
|
+ #else // EXTRUDERS > 1
|
|
|
553
|
+ MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiplier[0], 10, 999);
|
|
|
554
|
+ MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiplier[1], 10, 999);
|
|
547
|
555
|
#if EXTRUDERS > 2
|
|
548
|
|
- MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiplier[2], 10, 999);
|
|
|
556
|
+ MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N3, &extruder_multiplier[2], 10, 999);
|
|
549
|
557
|
#if EXTRUDERS > 3
|
|
550
|
|
- MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N3, &extruder_multiplier[3], 10, 999);
|
|
|
558
|
+ MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N4, &extruder_multiplier[3], 10, 999);
|
|
551
|
559
|
#endif //EXTRUDERS > 3
|
|
552
|
560
|
#endif //EXTRUDERS > 2
|
|
553
|
561
|
#endif //EXTRUDERS > 1
|
|
|
@@ -809,9 +817,9 @@ static void lcd_move_x() { _lcd_move(PSTR(MSG_MOVE_X), X_AXIS, X_MIN_POS, X_MAX_
|
|
809
|
817
|
static void lcd_move_y() { _lcd_move(PSTR(MSG_MOVE_Y), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
|
|
810
|
818
|
static void lcd_move_z() { _lcd_move(PSTR(MSG_MOVE_Z), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
|
|
811
|
819
|
static void lcd_move_e(
|
|
812
|
|
-#if EXTRUDERS > 1
|
|
813
|
|
- uint8_t e = 0
|
|
814
|
|
-#endif
|
|
|
820
|
+ #if EXTRUDERS > 1
|
|
|
821
|
+ uint8_t e
|
|
|
822
|
+ #endif
|
|
815
|
823
|
) {
|
|
816
|
824
|
#if EXTRUDERS > 1
|
|
817
|
825
|
unsigned short original_active_extruder = active_extruder;
|
|
|
@@ -823,7 +831,24 @@ static void lcd_move_e(
|
|
823
|
831
|
line_to_current(E_AXIS);
|
|
824
|
832
|
lcdDrawUpdate = 1;
|
|
825
|
833
|
}
|
|
826
|
|
- if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_MOVE_E), ftostr31(current_position[E_AXIS]));
|
|
|
834
|
+ if (lcdDrawUpdate) {
|
|
|
835
|
+ PGM_P pos_label;
|
|
|
836
|
+ #if EXTRUDERS == 1
|
|
|
837
|
+ pos_label = PSTR(MSG_MOVE_E);
|
|
|
838
|
+ #else
|
|
|
839
|
+ switch (e) {
|
|
|
840
|
+ case 0: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E1); break;
|
|
|
841
|
+ case 1: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E2); break;
|
|
|
842
|
+ #if EXTRUDERS > 2
|
|
|
843
|
+ case 2: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E3); break;
|
|
|
844
|
+ #if EXTRUDERS > 3
|
|
|
845
|
+ case 3: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E4); break;
|
|
|
846
|
+ #endif //EXTRUDERS > 3
|
|
|
847
|
+ #endif //EXTRUDERS > 2
|
|
|
848
|
+ }
|
|
|
849
|
+ #endif //EXTRUDERS > 1
|
|
|
850
|
+ lcd_implementation_drawedit(pos_label, ftostr31(current_position[E_AXIS]));
|
|
|
851
|
+ }
|
|
827
|
852
|
if (LCD_CLICKED) lcd_goto_menu(lcd_move_menu_axis);
|
|
828
|
853
|
#if EXTRUDERS > 1
|
|
829
|
854
|
active_extruder = original_active_extruder;
|
|
|
@@ -831,6 +856,7 @@ static void lcd_move_e(
|
|
831
|
856
|
}
|
|
832
|
857
|
|
|
833
|
858
|
#if EXTRUDERS > 1
|
|
|
859
|
+ static void lcd_move_e0() { lcd_move_e(0); }
|
|
834
|
860
|
static void lcd_move_e1() { lcd_move_e(1); }
|
|
835
|
861
|
#if EXTRUDERS > 2
|
|
836
|
862
|
static void lcd_move_e2() { lcd_move_e(2); }
|
|
|
@@ -853,13 +879,15 @@ static void lcd_move_menu_axis() {
|
|
853
|
879
|
MENU_ITEM(submenu, MSG_MOVE_Y, lcd_move_y);
|
|
854
|
880
|
if (move_menu_scale < 10.0) {
|
|
855
|
881
|
MENU_ITEM(submenu, MSG_MOVE_Z, lcd_move_z);
|
|
856
|
|
- MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
|
|
857
|
|
- #if EXTRUDERS > 1
|
|
858
|
|
- MENU_ITEM(submenu, MSG_MOVE_E1, lcd_move_e1);
|
|
|
882
|
+ #if EXTRUDERS == 1
|
|
|
883
|
+ MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
|
|
|
884
|
+ #else
|
|
|
885
|
+ MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E1, lcd_move_e0);
|
|
|
886
|
+ MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E2, lcd_move_e1);
|
|
859
|
887
|
#if EXTRUDERS > 2
|
|
860
|
|
- MENU_ITEM(submenu, MSG_MOVE_E2, lcd_move_e2);
|
|
|
888
|
+ MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E3, lcd_move_e2);
|
|
861
|
889
|
#if EXTRUDERS > 3
|
|
862
|
|
- MENU_ITEM(submenu, MSG_MOVE_E3, lcd_move_e3);
|
|
|
890
|
+ MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E4, lcd_move_e3);
|
|
863
|
891
|
#endif
|
|
864
|
892
|
#endif
|
|
865
|
893
|
#endif // EXTRUDERS > 1
|
|
|
@@ -942,18 +970,18 @@ static void lcd_control_menu() {
|
|
942
|
970
|
PID_PARAM(Kd, e) = scalePID_d(raw_Kd);
|
|
943
|
971
|
updatePID();
|
|
944
|
972
|
}
|
|
945
|
|
- void copy_and_scalePID_i_E1() { copy_and_scalePID_i(0); }
|
|
946
|
|
- void copy_and_scalePID_d_E1() { copy_and_scalePID_d(0); }
|
|
|
973
|
+ #define COPY_AND_SCALE(eindex) \
|
|
|
974
|
+ void copy_and_scalePID_i_E ## eindex() { copy_and_scalePID_i(eindex); } \
|
|
|
975
|
+ void copy_and_scalePID_d_E ## eindex() { copy_and_scalePID_d(eindex); }
|
|
|
976
|
+
|
|
|
977
|
+ COPY_AND_SCALE(0);
|
|
947
|
978
|
#if ENABLED(PID_PARAMS_PER_EXTRUDER)
|
|
948
|
979
|
#if EXTRUDERS > 1
|
|
949
|
|
- void copy_and_scalePID_i_E2() { copy_and_scalePID_i(1); }
|
|
950
|
|
- void copy_and_scalePID_d_E2() { copy_and_scalePID_d(1); }
|
|
|
980
|
+ COPY_AND_SCALE(1);
|
|
951
|
981
|
#if EXTRUDERS > 2
|
|
952
|
|
- void copy_and_scalePID_i_E3() { copy_and_scalePID_i(2); }
|
|
953
|
|
- void copy_and_scalePID_d_E3() { copy_and_scalePID_d(2); }
|
|
|
982
|
+ COPY_AND_SCALE(2);
|
|
954
|
983
|
#if EXTRUDERS > 3
|
|
955
|
|
- void copy_and_scalePID_i_E4() { copy_and_scalePID_i(3); }
|
|
956
|
|
- void copy_and_scalePID_d_E4() { copy_and_scalePID_d(3); }
|
|
|
984
|
+ COPY_AND_SCALE(3);
|
|
957
|
985
|
#endif //EXTRUDERS > 3
|
|
958
|
986
|
#endif //EXTRUDERS > 2
|
|
959
|
987
|
#endif //EXTRUDERS > 1
|
|
|
@@ -975,12 +1003,17 @@ static void lcd_control_temperature_menu() {
|
|
975
|
1003
|
MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
|
|
976
|
1004
|
|
|
977
|
1005
|
//
|
|
978
|
|
- // Nozzle, Nozzle 2, Nozzle 3, Nozzle 4
|
|
|
1006
|
+ // Nozzle
|
|
|
1007
|
+ // Nozzle 1, Nozzle 2, Nozzle 3, Nozzle 4
|
|
979
|
1008
|
//
|
|
980
|
|
- #if TEMP_SENSOR_0 != 0
|
|
981
|
|
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
|
|
982
|
|
- #endif
|
|
983
|
|
- #if EXTRUDERS > 1
|
|
|
1009
|
+ #if EXTRUDERS == 1
|
|
|
1010
|
+ #if TEMP_SENSOR_0 != 0
|
|
|
1011
|
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
|
|
|
1012
|
+ #endif
|
|
|
1013
|
+ #else //EXTRUDERS > 1
|
|
|
1014
|
+ #if TEMP_SENSOR_0 != 0
|
|
|
1015
|
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N1, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
|
|
|
1016
|
+ #endif
|
|
984
|
1017
|
#if TEMP_SENSOR_1 != 0
|
|
985
|
1018
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
|
|
986
|
1019
|
#endif
|
|
|
@@ -1020,59 +1053,42 @@ static void lcd_control_temperature_menu() {
|
|
1020
|
1053
|
|
|
1021
|
1054
|
//
|
|
1022
|
1055
|
// PID-P, PID-I, PID-D, PID-C
|
|
|
1056
|
+ // PID-P E1, PID-I E1, PID-D E1, PID-C E1
|
|
|
1057
|
+ // PID-P E2, PID-I E2, PID-D E2, PID-C E2
|
|
|
1058
|
+ // PID-P E3, PID-I E3, PID-D E3, PID-C E3
|
|
|
1059
|
+ // PID-P E4, PID-I E4, PID-D E4, PID-C E4
|
|
1023
|
1060
|
//
|
|
1024
|
1061
|
#if ENABLED(PIDTEMP)
|
|
1025
|
|
- // set up temp variables - undo the default scaling
|
|
1026
|
|
- raw_Ki = unscalePID_i(PID_PARAM(Ki,0));
|
|
1027
|
|
- raw_Kd = unscalePID_d(PID_PARAM(Kd,0));
|
|
1028
|
|
- MENU_ITEM_EDIT(float52, MSG_PID_P, &PID_PARAM(Kp,0), 1, 9990);
|
|
1029
|
|
- // i is typically a small value so allows values below 1
|
|
1030
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E1);
|
|
1031
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D, &raw_Kd, 1, 9990, copy_and_scalePID_d_E1);
|
|
|
1062
|
+
|
|
|
1063
|
+ #define _PID_MENU_ITEMS(ELABEL, eindex) \
|
|
|
1064
|
+ raw_Ki = unscalePID_i(PID_PARAM(Ki, eindex)); \
|
|
|
1065
|
+ raw_Kd = unscalePID_d(PID_PARAM(Kd, eindex)); \
|
|
|
1066
|
+ MENU_ITEM_EDIT(float52, MSG_PID_P ELABEL, &PID_PARAM(Kp, eindex), 1, 9990); \
|
|
|
1067
|
+ MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I ELABEL, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E ## eindex); \
|
|
|
1068
|
+ MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D ELABEL, &raw_Kd, 1, 9990, copy_and_scalePID_d_E ## eindex)
|
|
|
1069
|
+
|
|
1032
|
1070
|
#if ENABLED(PID_ADD_EXTRUSION_RATE)
|
|
1033
|
|
- MENU_ITEM_EDIT(float3, MSG_PID_C, &PID_PARAM(Kc,0), 1, 9990);
|
|
1034
|
|
- #endif//PID_ADD_EXTRUSION_RATE
|
|
1035
|
|
- #if ENABLED(PID_PARAMS_PER_EXTRUDER)
|
|
1036
|
|
- #if EXTRUDERS > 1
|
|
1037
|
|
- // set up temp variables - undo the default scaling
|
|
1038
|
|
- raw_Ki = unscalePID_i(PID_PARAM(Ki,1));
|
|
1039
|
|
- raw_Kd = unscalePID_d(PID_PARAM(Kd,1));
|
|
1040
|
|
- MENU_ITEM_EDIT(float52, MSG_PID_P MSG_E2, &PID_PARAM(Kp,1), 1, 9990);
|
|
1041
|
|
- // i is typically a small value so allows values below 1
|
|
1042
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I MSG_E2, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E2);
|
|
1043
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D MSG_E2, &raw_Kd, 1, 9990, copy_and_scalePID_d_E2);
|
|
1044
|
|
- #if ENABLED(PID_ADD_EXTRUSION_RATE)
|
|
1045
|
|
- MENU_ITEM_EDIT(float3, MSG_PID_C MSG_E2, &PID_PARAM(Kc,1), 1, 9990);
|
|
1046
|
|
- #endif//PID_ADD_EXTRUSION_RATE
|
|
|
1071
|
+ #define PID_MENU_ITEMS(ELABEL, eindex) \
|
|
|
1072
|
+ _PID_MENU_ITEMS(ELABEL, eindex); \
|
|
|
1073
|
+ MENU_ITEM_EDIT(float3, MSG_PID_C ELABEL, &PID_PARAM(Kc, eindex), 1, 9990)
|
|
|
1074
|
+ #else
|
|
|
1075
|
+ #define PID_MENU_ITEMS(ELABEL, eindex) _PID_MENU_ITEMS(ELABEL, eindex)
|
|
|
1076
|
+ #endif
|
|
1047
|
1077
|
|
|
1048
|
|
- #if EXTRUDERS > 2
|
|
1049
|
|
- // set up temp variables - undo the default scaling
|
|
1050
|
|
- raw_Ki = unscalePID_i(PID_PARAM(Ki,2));
|
|
1051
|
|
- raw_Kd = unscalePID_d(PID_PARAM(Kd,2));
|
|
1052
|
|
- MENU_ITEM_EDIT(float52, MSG_PID_P MSG_E3, &PID_PARAM(Kp,2), 1, 9990);
|
|
1053
|
|
- // i is typically a small value so allows values below 1
|
|
1054
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I MSG_E3, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E3);
|
|
1055
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D MSG_E3, &raw_Kd, 1, 9990, copy_and_scalePID_d_E3);
|
|
1056
|
|
- #if ENABLED(PID_ADD_EXTRUSION_RATE)
|
|
1057
|
|
- MENU_ITEM_EDIT(float3, MSG_PID_C MSG_E3, &PID_PARAM(Kc,2), 1, 9990);
|
|
1058
|
|
- #endif//PID_ADD_EXTRUSION_RATE
|
|
|
1078
|
+ #if ENABLED(PID_PARAMS_PER_EXTRUDER) && EXTRUDERS > 1
|
|
|
1079
|
+ PID_MENU_ITEMS(MSG_E1, 0);
|
|
|
1080
|
+ PID_MENU_ITEMS(MSG_E2, 1);
|
|
|
1081
|
+ #if EXTRUDERS > 2
|
|
|
1082
|
+ PID_MENU_ITEMS(MSG_E3, 2);
|
|
|
1083
|
+ #if EXTRUDERS > 3
|
|
|
1084
|
+ PID_MENU_ITEMS(MSG_E4, 3);
|
|
|
1085
|
+ #endif //EXTRUDERS > 3
|
|
|
1086
|
+ #endif //EXTRUDERS > 2
|
|
|
1087
|
+ #else //!PID_PARAMS_PER_EXTRUDER || EXTRUDERS == 1
|
|
|
1088
|
+ PID_MENU_ITEMS("", 0);
|
|
|
1089
|
+ #endif //!PID_PARAMS_PER_EXTRUDER || EXTRUDERS == 1
|
|
1059
|
1090
|
|
|
1060
|
|
- #if EXTRUDERS > 3
|
|
1061
|
|
- // set up temp variables - undo the default scaling
|
|
1062
|
|
- raw_Ki = unscalePID_i(PID_PARAM(Ki,3));
|
|
1063
|
|
- raw_Kd = unscalePID_d(PID_PARAM(Kd,3));
|
|
1064
|
|
- MENU_ITEM_EDIT(float52, MSG_PID_P MSG_E4, &PID_PARAM(Kp,3), 1, 9990);
|
|
1065
|
|
- // i is typically a small value so allows values below 1
|
|
1066
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I MSG_E4, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E4);
|
|
1067
|
|
- MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D MSG_E4, &raw_Kd, 1, 9990, copy_and_scalePID_d_E4);
|
|
1068
|
|
- #if ENABLED(PID_ADD_EXTRUSION_RATE)
|
|
1069
|
|
- MENU_ITEM_EDIT(float3, MSG_PID_C MSG_E4, &PID_PARAM(Kc,3), 1, 9990);
|
|
1070
|
|
- #endif//PID_ADD_EXTRUSION_RATE
|
|
1071
|
|
- #endif//EXTRUDERS > 3
|
|
1072
|
|
- #endif//EXTRUDERS > 2
|
|
1073
|
|
- #endif//EXTRUDERS > 1
|
|
1074
|
|
- #endif //PID_PARAMS_PER_EXTRUDER
|
|
1075
|
|
- #endif//PIDTEMP
|
|
|
1091
|
+ #endif //PIDTEMP
|
|
1076
|
1092
|
|
|
1077
|
1093
|
//
|
|
1078
|
1094
|
// Preheat PLA conf
|
|
|
@@ -1181,13 +1197,15 @@ static void lcd_control_volumetric_menu() {
|
|
1181
|
1197
|
MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled, calculate_volumetric_multipliers);
|
|
1182
|
1198
|
|
|
1183
|
1199
|
if (volumetric_enabled) {
|
|
1184
|
|
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_0, &filament_size[0], 1.5, 3.25, calculate_volumetric_multipliers);
|
|
1185
|
|
- #if EXTRUDERS > 1
|
|
1186
|
|
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_1, &filament_size[1], 1.5, 3.25, calculate_volumetric_multipliers);
|
|
|
1200
|
+ #if EXTRUDERS == 1
|
|
|
1201
|
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM, &filament_size[0], 1.5, 3.25, calculate_volumetric_multipliers);
|
|
|
1202
|
+ #else //EXTRUDERS > 1
|
|
|
1203
|
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E1, &filament_size[0], 1.5, 3.25, calculate_volumetric_multipliers);
|
|
|
1204
|
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E2, &filament_size[1], 1.5, 3.25, calculate_volumetric_multipliers);
|
|
1187
|
1205
|
#if EXTRUDERS > 2
|
|
1188
|
|
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_2, &filament_size[2], 1.5, 3.25, calculate_volumetric_multipliers);
|
|
|
1206
|
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E3, &filament_size[2], 1.5, 3.25, calculate_volumetric_multipliers);
|
|
1189
|
1207
|
#if EXTRUDERS > 3
|
|
1190
|
|
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_3, &filament_size[3], 1.5, 3.25, calculate_volumetric_multipliers);
|
|
|
1208
|
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E4, &filament_size[3], 1.5, 3.25, calculate_volumetric_multipliers);
|
|
1191
|
1209
|
#endif //EXTRUDERS > 3
|
|
1192
|
1210
|
#endif //EXTRUDERS > 2
|
|
1193
|
1211
|
#endif //EXTRUDERS > 1
|
Richard Wackerbarth
10 years ago