Bladeren bron

Tweak lambdas

Scott Lahteine 5 jaren geleden
bovenliggende
commit
23d21dd81c

+ 14
- 14
Marlin/src/lcd/menu/menu_advanced.cpp Bestand weergeven

@@ -61,7 +61,7 @@ void menu_cancelobject();
61 61
     LOOP_XYZE(i) driverPercent[i] = dac_current_get_percent((AxisEnum)i);
62 62
     START_MENU();
63 63
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
64
-    #define EDIT_DAC_PERCENT(A) EDIT_ITEM(uint8, MSG_##A " " MSG_DAC_PERCENT, &driverPercent[_AXIS(A)], 0, 100, [](){ dac_current_set_percents(driverPercent); })
64
+    #define EDIT_DAC_PERCENT(A) EDIT_ITEM(uint8, MSG_##A " " MSG_DAC_PERCENT, &driverPercent[_AXIS(A)], 0, 100, []{ dac_current_set_percents(driverPercent); })
65 65
     EDIT_DAC_PERCENT(X);
66 66
     EDIT_DAC_PERCENT(Y);
67 67
     EDIT_DAC_PERCENT(Z);
@@ -348,8 +348,8 @@ void menu_cancelobject();
348 348
         raw_Ki = unscalePID_i(PID_PARAM(Ki, N)); \
349 349
         raw_Kd = unscalePID_d(PID_PARAM(Kd, N)); \
350 350
         EDIT_ITEM(float52sign, PID_LABEL(MSG_PID_P,N), &PID_PARAM(Kp, N), 1, 9990); \
351
-        EDIT_ITEM(float52sign, PID_LABEL(MSG_PID_I,N), &raw_Ki, 0.01f, 9990, [](){ copy_and_scalePID_i(N); }); \
352
-        EDIT_ITEM(float52sign, PID_LABEL(MSG_PID_D,N), &raw_Kd, 1, 9990, [](){ copy_and_scalePID_d(N); })
351
+        EDIT_ITEM(float52sign, PID_LABEL(MSG_PID_I,N), &raw_Ki, 0.01f, 9990, []{ copy_and_scalePID_i(N); }); \
352
+        EDIT_ITEM(float52sign, PID_LABEL(MSG_PID_D,N), &raw_Kd, 1, 9990, []{ copy_and_scalePID_d(N); })
353 353
 
354 354
       #if ENABLED(PID_EXTRUSION_SCALING)
355 355
         #define _PID_EDIT_MENU_ITEMS(N) \
@@ -368,7 +368,7 @@ void menu_cancelobject();
368 368
     #if ENABLED(PID_AUTOTUNE_MENU)
369 369
       #define PID_EDIT_MENU_ITEMS(N) \
370 370
         _PID_EDIT_MENU_ITEMS(N); \
371
-        EDIT_ITEM_FAST(int3, PID_LABEL(MSG_AUTOTUNE_PID,N), &autotune_temp[N], 150, heater_maxtemp[N] - 15, [](){ _lcd_autotune(N); })
371
+        EDIT_ITEM_FAST(int3, PID_LABEL(MSG_AUTOTUNE_PID,N), &autotune_temp[N], 150, heater_maxtemp[N] - 15, []{ _lcd_autotune(N); })
372 372
     #else
373 373
       #define PID_EDIT_MENU_ITEMS(N) _PID_EDIT_MENU_ITEMS(N)
374 374
     #endif
@@ -493,15 +493,15 @@ void menu_cancelobject();
493 493
       const xyze_ulong_t &max_accel_edit_scaled = max_accel_edit;
494 494
     #endif
495 495
 
496
-    #define EDIT_AMAX(Q,L) EDIT_ITEM_FAST(long5_25, MSG_AMAX_##Q, &planner.settings.max_acceleration_mm_per_s2[_AXIS(Q)], L, max_accel_edit_scaled[_AXIS(Q)], [](){ planner.reset_acceleration_rates(); })
496
+    #define EDIT_AMAX(Q,L) EDIT_ITEM_FAST(long5_25, MSG_AMAX_##Q, &planner.settings.max_acceleration_mm_per_s2[_AXIS(Q)], L, max_accel_edit_scaled[_AXIS(Q)], []{ planner.reset_acceleration_rates(); })
497 497
 
498 498
     EDIT_AMAX(A,100);
499 499
     EDIT_AMAX(B,100);
500 500
     EDIT_AMAX(C, 10);
501 501
 
502 502
     #if ENABLED(DISTINCT_E_FACTORS)
503
-      #define EDIT_AMAX_E(N) EDIT_ITEM_FAST(long5_25, MSG_AMAX_E##N, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(N)], 100, max_accel_edit_scaled.e, [](){ _reset_e_acceleration_rate(N); })
504
-      EDIT_ITEM_FAST(long5_25, MSG_AMAX_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)], 100, max_accel_edit_scaled.e, [](){ planner.reset_acceleration_rates(); });
503
+      #define EDIT_AMAX_E(N) EDIT_ITEM_FAST(long5_25, MSG_AMAX_E##N, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(N)], 100, max_accel_edit_scaled.e, []{ _reset_e_acceleration_rate(N); })
504
+      EDIT_ITEM_FAST(long5_25, MSG_AMAX_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)], 100, max_accel_edit_scaled.e, []{ planner.reset_acceleration_rates(); });
505 505
       EDIT_AMAX_E(0);
506 506
       EDIT_AMAX_E(1);
507 507
       #if E_STEPPERS > 2
@@ -517,7 +517,7 @@ void menu_cancelobject();
517 517
         #endif // E_STEPPERS > 3
518 518
       #endif // E_STEPPERS > 2
519 519
     #elif E_STEPPERS
520
-      EDIT_ITEM_FAST(long5_25, MSG_AMAX_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS], 100, max_accel_edit_scaled.e, [](){ planner.reset_acceleration_rates(); });
520
+      EDIT_ITEM_FAST(long5_25, MSG_AMAX_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS], 100, max_accel_edit_scaled.e, []{ planner.reset_acceleration_rates(); });
521 521
     #endif
522 522
 
523 523
     END_MENU();
@@ -566,14 +566,14 @@ void menu_cancelobject();
566 566
     START_MENU();
567 567
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
568 568
 
569
-    #define EDIT_QSTEPS(Q) EDIT_ITEM_FAST(float51, MSG_##Q##_STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, [](){ planner.refresh_positioning(); })
569
+    #define EDIT_QSTEPS(Q) EDIT_ITEM_FAST(float51, MSG_##Q##_STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, []{ planner.refresh_positioning(); })
570 570
     EDIT_QSTEPS(A);
571 571
     EDIT_QSTEPS(B);
572 572
     EDIT_QSTEPS(C);
573 573
 
574 574
     #if ENABLED(DISTINCT_E_FACTORS)
575
-      #define EDIT_ESTEPS(N) EDIT_ITEM_FAST(float51, MSG_E##N##_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(N)], 5, 9999, [](){ _planner_refresh_e_positioning(N); })
576
-      EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(active_extruder)], 5, 9999, [](){ planner.refresh_positioning(); });
575
+      #define EDIT_ESTEPS(N) EDIT_ITEM_FAST(float51, MSG_E##N##_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(N)], 5, 9999, []{ _planner_refresh_e_positioning(N); })
576
+      EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(active_extruder)], 5, 9999, []{ planner.refresh_positioning(); });
577 577
       EDIT_ESTEPS(0);
578 578
       EDIT_ESTEPS(1);
579 579
       #if E_STEPPERS > 2
@@ -589,7 +589,7 @@ void menu_cancelobject();
589 589
         #endif // E_STEPPERS > 3
590 590
       #endif // E_STEPPERS > 2
591 591
     #elif E_STEPPERS
592
-      EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, [](){ planner.refresh_positioning(); });
592
+      EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
593 593
     #endif
594 594
 
595 595
     END_MENU();
@@ -631,7 +631,7 @@ void menu_advanced_settings() {
631 631
       //
632 632
       // Set Home Offsets
633 633
       //
634
-      ACTION_ITEM(MSG_SET_HOME_OFFSETS, [](){ queue.inject_P(PSTR("M428")); ui.return_to_status(); });
634
+      ACTION_ITEM(MSG_SET_HOME_OFFSETS, []{ queue.inject_P(PSTR("M428")); ui.return_to_status(); });
635 635
     #endif
636 636
 
637 637
     // M203 / M205 - Feedrate items
@@ -654,7 +654,7 @@ void menu_advanced_settings() {
654 654
   #endif
655 655
 
656 656
   #if ENABLED(CANCEL_OBJECTS)
657
-    SUBMENU(MSG_CANCEL_OBJECT, [](){ editable.int8 = -1; ui.goto_screen(menu_cancelobject); });
657
+    SUBMENU(MSG_CANCEL_OBJECT, []{ editable.int8 = -1; ui.goto_screen(menu_cancelobject); });
658 658
   #endif
659 659
 
660 660
   #if ENABLED(DAC_STEPPER_CURRENT)

+ 1
- 1
Marlin/src/lcd/menu/menu_bed_leveling.cpp Bestand weergeven

@@ -268,7 +268,7 @@ void menu_bed_leveling() {
268 268
   #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
269 269
     // Shadow for editing the fade height
270 270
     editable.decimal = planner.z_fade_height;
271
-    EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, [](){ set_z_fade_height(editable.decimal); });
271
+    EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, []{ set_z_fade_height(editable.decimal); });
272 272
   #endif
273 273
 
274 274
   //

+ 1
- 1
Marlin/src/lcd/menu/menu_configuration.cpp Bestand weergeven

@@ -399,7 +399,7 @@ void menu_configuration() {
399 399
   #endif
400 400
 
401 401
   if (!busy)
402
-    ACTION_ITEM(MSG_RESTORE_FAILSAFE, [](){
402
+    ACTION_ITEM(MSG_RESTORE_FAILSAFE, []{
403 403
       settings.reset();
404 404
       #if HAS_BUZZER
405 405
         ui.completion_feedback();

+ 5
- 5
Marlin/src/lcd/menu/menu_custom.cpp Bestand weergeven

@@ -51,19 +51,19 @@ void menu_user() {
51 51
   START_MENU();
52 52
   BACK_ITEM(MSG_MAIN);
53 53
   #if defined(USER_DESC_1) && defined(USER_GCODE_1)
54
-    ACTION_ITEM_P(PSTR(USER_DESC_1), [](){ _lcd_user_gcode(PSTR(USER_GCODE_1 _DONE_SCRIPT)); });
54
+    ACTION_ITEM_P(PSTR(USER_DESC_1), []{ _lcd_user_gcode(PSTR(USER_GCODE_1 _DONE_SCRIPT)); });
55 55
   #endif
56 56
   #if defined(USER_DESC_2) && defined(USER_GCODE_2)
57
-    ACTION_ITEM_P(PSTR(USER_DESC_2), [](){ _lcd_user_gcode(PSTR(USER_GCODE_2 _DONE_SCRIPT)); });
57
+    ACTION_ITEM_P(PSTR(USER_DESC_2), []{ _lcd_user_gcode(PSTR(USER_GCODE_2 _DONE_SCRIPT)); });
58 58
   #endif
59 59
   #if defined(USER_DESC_3) && defined(USER_GCODE_3)
60
-    ACTION_ITEM_P(PSTR(USER_DESC_3), [](){ _lcd_user_gcode(PSTR(USER_GCODE_3 _DONE_SCRIPT)); });
60
+    ACTION_ITEM_P(PSTR(USER_DESC_3), []{ _lcd_user_gcode(PSTR(USER_GCODE_3 _DONE_SCRIPT)); });
61 61
   #endif
62 62
   #if defined(USER_DESC_4) && defined(USER_GCODE_4)
63
-    ACTION_ITEM_P(PSTR(USER_DESC_4), [](){ _lcd_user_gcode(PSTR(USER_GCODE_4 _DONE_SCRIPT)); });
63
+    ACTION_ITEM_P(PSTR(USER_DESC_4), []{ _lcd_user_gcode(PSTR(USER_GCODE_4 _DONE_SCRIPT)); });
64 64
   #endif
65 65
   #if defined(USER_DESC_5) && defined(USER_GCODE_5)
66
-    ACTION_ITEM_P(PSTR(USER_DESC_5), [](){ _lcd_user_gcode(PSTR(USER_GCODE_5 _DONE_SCRIPT)); });
66
+    ACTION_ITEM_P(PSTR(USER_DESC_5), []{ _lcd_user_gcode(PSTR(USER_GCODE_5 _DONE_SCRIPT)); });
67 67
   #endif
68 68
   END_MENU();
69 69
 }

+ 27
- 27
Marlin/src/lcd/menu/menu_filament.cpp Bestand weergeven

@@ -84,9 +84,9 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
84 84
   START_MENU();
85 85
   if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_CENTER|SS_INVERT);
86 86
   BACK_ITEM(MSG_BACK);
87
-  ACTION_ITEM(MSG_PREHEAT_1, [](){ _change_filament_temp(ui.preheat_hotend_temp[0]); });
88
-  ACTION_ITEM(MSG_PREHEAT_2, [](){ _change_filament_temp(ui.preheat_hotend_temp[1]); });
89
-  EDIT_ITEM_FAST(int3, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[_change_filament_temp_extruder].target, EXTRUDE_MINTEMP, heater_maxtemp[extruder] - 15, [](){
87
+  ACTION_ITEM(MSG_PREHEAT_1, []{ _change_filament_temp(ui.preheat_hotend_temp[0]); });
88
+  ACTION_ITEM(MSG_PREHEAT_2, []{ _change_filament_temp(ui.preheat_hotend_temp[1]); });
89
+  EDIT_ITEM_FAST(int3, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[_change_filament_temp_extruder].target, EXTRUDE_MINTEMP, heater_maxtemp[extruder] - 15, []{
90 90
     _change_filament_temp(thermalManager.temp_hotend[_change_filament_temp_extruder].target);
91 91
   });
92 92
   END_MENU();
@@ -109,42 +109,42 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
109 109
     #if E_STEPPERS == 1
110 110
       PGM_P const msg0 = GET_TEXT(MSG_FILAMENTCHANGE);
111 111
       if (thermalManager.targetTooColdToExtrude(active_extruder))
112
-        MENU_ITEM_P(submenu, msg0, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
112
+        MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
113 113
       else
114 114
         MENU_ITEM_P(gcode, msg0, PSTR("M600 B0"));
115 115
     #else
116 116
       PGM_P const msg0 = GET_TEXT(MSG_FILAMENTCHANGE_E0);
117 117
       PGM_P const msg1 = GET_TEXT(MSG_FILAMENTCHANGE_E1);
118 118
       if (thermalManager.targetTooColdToExtrude(0))
119
-        MENU_ITEM_P(submenu, msg0, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
119
+        MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
120 120
       else
121 121
         MENU_ITEM_P(gcode, msg0, PSTR("M600 B0 T0"));
122 122
       if (thermalManager.targetTooColdToExtrude(1))
123
-        MENU_ITEM_P(submenu, msg1, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 1); });
123
+        MENU_ITEM_P(submenu, msg1, []{ _menu_temp_filament_op(PauseMode(editable.int8), 1); });
124 124
       else
125 125
         MENU_ITEM_P(gcode, msg1, PSTR("M600 B0 T1"));
126 126
       #if E_STEPPERS > 2
127 127
         PGM_P const msg2 = GET_TEXT(MSG_FILAMENTCHANGE_E2);
128 128
         if (thermalManager.targetTooColdToExtrude(2))
129
-          MENU_ITEM_P(submenu, msg2, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 2); });
129
+          MENU_ITEM_P(submenu, msg2, []{ _menu_temp_filament_op(PauseMode(editable.int8), 2); });
130 130
         else
131 131
           MENU_ITEM_P(gcode, msg2, PSTR("M600 B0 T2"));
132 132
         #if E_STEPPERS > 3
133 133
           PGM_P const msg3 = GET_TEXT(MSG_FILAMENTCHANGE_E3);
134 134
           if (thermalManager.targetTooColdToExtrude(3))
135
-            MENU_ITEM_P(submenu, msg3, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 3); });
135
+            MENU_ITEM_P(submenu, msg3, []{ _menu_temp_filament_op(PauseMode(editable.int8), 3); });
136 136
           else
137 137
             MENU_ITEM_P(gcode, msg3, PSTR("M600 B0 T3"));
138 138
           #if E_STEPPERS > 4
139 139
             PGM_P const msg4 = GET_TEXT(MSG_FILAMENTCHANGE_E4);
140 140
             if (thermalManager.targetTooColdToExtrude(4))
141
-              MENU_ITEM_P(submenu, msg4, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 4); });
141
+              MENU_ITEM_P(submenu, msg4, []{ _menu_temp_filament_op(PauseMode(editable.int8), 4); });
142 142
             else
143 143
               MENU_ITEM_P(gcode, msg4, PSTR("M600 B0 T4"));
144 144
             #if E_STEPPERS > 5
145 145
               PGM_P const msg5 = GET_TEXT(MSG_FILAMENTCHANGE_E5);
146 146
               if (thermalManager.targetTooColdToExtrude(5))
147
-                MENU_ITEM_P(submenu, msg5, [](){ _menu_temp_filament_op(PauseMode(editable.int8), 5); });
147
+                MENU_ITEM_P(submenu, msg5, []{ _menu_temp_filament_op(PauseMode(editable.int8), 5); });
148 148
               else
149 149
                 MENU_ITEM_P(gcode, msg5, PSTR("M600 B0 T5"));
150 150
             #endif // E_STEPPERS > 5
@@ -159,42 +159,42 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
159 159
         #if E_STEPPERS == 1
160 160
           PGM_P const msg0 = GET_TEXT(MSG_FILAMENTLOAD);
161 161
           if (thermalManager.targetTooColdToExtrude(active_extruder))
162
-            MENU_ITEM_P(submenu, msg0, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
162
+            MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
163 163
           else
164 164
             MENU_ITEM_P(gcode, msg0, PSTR("M701"));
165 165
         #else
166 166
           PGM_P const msg0 = GET_TEXT(MSG_FILAMENTLOAD_E0);
167 167
           PGM_P const msg1 = GET_TEXT(MSG_FILAMENTLOAD_E1);
168 168
           if (thermalManager.targetTooColdToExtrude(0))
169
-            MENU_ITEM_P(submenu, msg0, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
169
+            MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
170 170
           else
171 171
             MENU_ITEM_P(gcode, msg0, PSTR("M701 T0"));
172 172
           if (thermalManager.targetTooColdToExtrude(1))
173
-            MENU_ITEM_P(submenu, msg1, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 1); });
173
+            MENU_ITEM_P(submenu, msg1, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 1); });
174 174
           else
175 175
             MENU_ITEM_P(gcode, msg1, PSTR("M701 T1"));
176 176
           #if E_STEPPERS > 2
177 177
             PGM_P const msg2 = GET_TEXT(MSG_FILAMENTLOAD_E2);
178 178
             if (thermalManager.targetTooColdToExtrude(2))
179
-              MENU_ITEM_P(submenu, msg2, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 2); });
179
+              MENU_ITEM_P(submenu, msg2, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 2); });
180 180
             else
181 181
               MENU_ITEM_P(gcode, msg2, PSTR("M701 T2"));
182 182
             #if E_STEPPERS > 3
183 183
               PGM_P const msg3 = GET_TEXT(MSG_FILAMENTLOAD_E3);
184 184
               if (thermalManager.targetTooColdToExtrude(3))
185
-                MENU_ITEM_P(submenu, msg3, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 3); });
185
+                MENU_ITEM_P(submenu, msg3, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 3); });
186 186
               else
187 187
                 MENU_ITEM_P(gcode, msg3, PSTR("M701 T3"));
188 188
               #if E_STEPPERS > 4
189 189
                 PGM_P const msg4 = GET_TEXT(MSG_FILAMENTLOAD_E4);
190 190
                 if (thermalManager.targetTooColdToExtrude(4))
191
-                  MENU_ITEM_P(submenu, msg4, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 4); });
191
+                  MENU_ITEM_P(submenu, msg4, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 4); });
192 192
                 else
193 193
                   MENU_ITEM_P(gcode, msg4, PSTR("M701 T4"));
194 194
                 #if E_STEPPERS > 5
195 195
                   PGM_P const msg5 = GET_TEXT(MSG_FILAMENTLOAD_E5);
196 196
                   if (thermalManager.targetTooColdToExtrude(5))
197
-                    MENU_ITEM_P(submenu, msg5, [](){ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 5); });
197
+                    MENU_ITEM_P(submenu, msg5, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 5); });
198 198
                   else
199 199
                     MENU_ITEM_P(gcode, msg5, PSTR("M701 T5"));
200 200
                 #endif // E_STEPPERS > 5
@@ -208,7 +208,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
208 208
           if (thermalManager.targetHotEnoughToExtrude(active_extruder))
209 209
             GCODES_ITEM(MSG_FILAMENTUNLOAD, PSTR("M702"));
210 210
           else
211
-            SUBMENU(MSG_FILAMENTUNLOAD, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 0); });
211
+            SUBMENU(MSG_FILAMENTUNLOAD, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 0); });
212 212
         #else
213 213
           #if ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS)
214 214
             if (JOIN_N(E_STEPPERS, &&,
@@ -220,36 +220,36 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
220 220
               thermalManager.targetHotEnoughToExtrude(5))
221 221
             ) GCODES_ITEM(MSG_FILAMENTUNLOAD_ALL, PSTR("M702"));
222 222
           else
223
-            SUBMENU(MSG_FILAMENTUNLOAD_ALL, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, -1); });
223
+            SUBMENU(MSG_FILAMENTUNLOAD_ALL, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, -1); });
224 224
           #endif
225 225
           if (thermalManager.targetHotEnoughToExtrude(0))
226 226
             GCODES_ITEM(MSG_FILAMENTUNLOAD_E0, PSTR("M702 T0"));
227 227
           else
228
-            SUBMENU(MSG_FILAMENTUNLOAD_E0, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 0); });
228
+            SUBMENU(MSG_FILAMENTUNLOAD_E0, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 0); });
229 229
           if (thermalManager.targetHotEnoughToExtrude(1))
230 230
             GCODES_ITEM(MSG_FILAMENTUNLOAD_E1, PSTR("M702 T1"));
231 231
           else
232
-            SUBMENU(MSG_FILAMENTUNLOAD_E1, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 1); });
232
+            SUBMENU(MSG_FILAMENTUNLOAD_E1, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 1); });
233 233
           #if E_STEPPERS > 2
234 234
             if (thermalManager.targetHotEnoughToExtrude(2))
235 235
               GCODES_ITEM(MSG_FILAMENTUNLOAD_E2, PSTR("M702 T2"));
236 236
             else
237
-              SUBMENU(MSG_FILAMENTUNLOAD_E2, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 2); });
237
+              SUBMENU(MSG_FILAMENTUNLOAD_E2, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 2); });
238 238
             #if E_STEPPERS > 3
239 239
               if (thermalManager.targetHotEnoughToExtrude(3))
240 240
                 GCODES_ITEM(MSG_FILAMENTUNLOAD_E3, PSTR("M702 T3"));
241 241
               else
242
-                SUBMENU(MSG_FILAMENTUNLOAD_E3, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 3); });
242
+                SUBMENU(MSG_FILAMENTUNLOAD_E3, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 3); });
243 243
               #if E_STEPPERS > 4
244 244
                 if (thermalManager.targetHotEnoughToExtrude(4))
245 245
                   GCODES_ITEM(MSG_FILAMENTUNLOAD_E4, PSTR("M702 T4"));
246 246
                 else
247
-                  SUBMENU(MSG_FILAMENTUNLOAD_E4, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 4); });
247
+                  SUBMENU(MSG_FILAMENTUNLOAD_E4, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 4); });
248 248
                 #if E_STEPPERS > 5
249 249
                   if (thermalManager.targetHotEnoughToExtrude(5))
250 250
                     GCODES_ITEM(MSG_FILAMENTUNLOAD_E5, PSTR("M702 T5"));
251 251
                   else
252
-                    SUBMENU(MSG_FILAMENTUNLOAD_E5, [](){ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 5); });
252
+                    SUBMENU(MSG_FILAMENTUNLOAD_E5, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 5); });
253 253
                 #endif // E_STEPPERS > 5
254 254
               #endif // E_STEPPERS > 4
255 255
             #endif // E_STEPPERS > 3
@@ -298,13 +298,13 @@ void menu_pause_option() {
298 298
   #if LCD_HEIGHT > 2
299 299
     STATIC_ITEM(MSG_FILAMENT_CHANGE_OPTION_HEADER);
300 300
   #endif
301
-  ACTION_ITEM(MSG_FILAMENT_CHANGE_OPTION_PURGE, [](){ pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE; });
301
+  ACTION_ITEM(MSG_FILAMENT_CHANGE_OPTION_PURGE, []{ pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE; });
302 302
   #if HAS_FILAMENT_SENSOR
303 303
     if (runout.filament_ran_out)
304 304
       EDIT_ITEM(bool, MSG_RUNOUT_SENSOR, &runout.enabled, runout.reset);
305 305
     else
306 306
   #endif
307
-      ACTION_ITEM(MSG_FILAMENT_CHANGE_OPTION_RESUME, [](){ pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT; });
307
+      ACTION_ITEM(MSG_FILAMENT_CHANGE_OPTION_RESUME, []{ pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT; });
308 308
   END_MENU();
309 309
 }
310 310
 

+ 1
- 1
Marlin/src/lcd/menu/menu_main.cpp Bestand weergeven

@@ -182,7 +182,7 @@ void menu_main() {
182 182
       if (thermalManager.targetHotEnoughToExtrude(active_extruder))
183 183
         GCODES_ITEM(MSG_FILAMENTCHANGE, PSTR("M600 B0"));
184 184
       else
185
-        SUBMENU(MSG_FILAMENTCHANGE, [](){ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0); });
185
+        SUBMENU(MSG_FILAMENTCHANGE, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0); });
186 186
     #else
187 187
       SUBMENU(MSG_FILAMENTCHANGE, menu_change_filament);
188 188
     #endif

+ 1
- 1
Marlin/src/lcd/menu/menu_media.cpp Bestand weergeven

@@ -134,7 +134,7 @@ void menu_media() {
134 134
   BACK_ITEM(MSG_MAIN);
135 135
   if (card.flag.workDirIsRoot) {
136 136
     #if !PIN_EXISTS(SD_DETECT)
137
-      ACTION_ITEM(MSG_REFRESH, [](){ encoderTopLine = 0; card.mount(); });
137
+      ACTION_ITEM(MSG_REFRESH, []{ encoderTopLine = 0; card.mount(); });
138 138
     #endif
139 139
   }
140 140
   else if (card.isMounted())

+ 24
- 24
Marlin/src/lcd/menu/menu_mmu2.cpp Bestand weergeven

@@ -63,22 +63,22 @@ void menu_mmu2_load_filament() {
63 63
   START_MENU();
64 64
   BACK_ITEM(MSG_MMU2_MENU);
65 65
   ACTION_ITEM(MSG_MMU2_ALL, action_mmu2_load_all);
66
-  ACTION_ITEM(MSG_MMU2_FILAMENT0, [](){ _mmu2_load_filament(0); });
67
-  ACTION_ITEM(MSG_MMU2_FILAMENT1, [](){ _mmu2_load_filament(1); });
68
-  ACTION_ITEM(MSG_MMU2_FILAMENT2, [](){ _mmu2_load_filament(2); });
69
-  ACTION_ITEM(MSG_MMU2_FILAMENT3, [](){ _mmu2_load_filament(3); });
70
-  ACTION_ITEM(MSG_MMU2_FILAMENT4, [](){ _mmu2_load_filament(4); });
66
+  ACTION_ITEM(MSG_MMU2_FILAMENT0, []{ _mmu2_load_filament(0); });
67
+  ACTION_ITEM(MSG_MMU2_FILAMENT1, []{ _mmu2_load_filament(1); });
68
+  ACTION_ITEM(MSG_MMU2_FILAMENT2, []{ _mmu2_load_filament(2); });
69
+  ACTION_ITEM(MSG_MMU2_FILAMENT3, []{ _mmu2_load_filament(3); });
70
+  ACTION_ITEM(MSG_MMU2_FILAMENT4, []{ _mmu2_load_filament(4); });
71 71
   END_MENU();
72 72
 }
73 73
 
74 74
 void menu_mmu2_load_to_nozzle() {
75 75
   START_MENU();
76 76
   BACK_ITEM(MSG_MMU2_MENU);
77
-  ACTION_ITEM(MSG_MMU2_FILAMENT0, [](){ action_mmu2_load_filament_to_nozzle(0); });
78
-  ACTION_ITEM(MSG_MMU2_FILAMENT1, [](){ action_mmu2_load_filament_to_nozzle(1); });
79
-  ACTION_ITEM(MSG_MMU2_FILAMENT2, [](){ action_mmu2_load_filament_to_nozzle(2); });
80
-  ACTION_ITEM(MSG_MMU2_FILAMENT3, [](){ action_mmu2_load_filament_to_nozzle(3); });
81
-  ACTION_ITEM(MSG_MMU2_FILAMENT4, [](){ action_mmu2_load_filament_to_nozzle(4); });
77
+  ACTION_ITEM(MSG_MMU2_FILAMENT0, []{ action_mmu2_load_filament_to_nozzle(0); });
78
+  ACTION_ITEM(MSG_MMU2_FILAMENT1, []{ action_mmu2_load_filament_to_nozzle(1); });
79
+  ACTION_ITEM(MSG_MMU2_FILAMENT2, []{ action_mmu2_load_filament_to_nozzle(2); });
80
+  ACTION_ITEM(MSG_MMU2_FILAMENT3, []{ action_mmu2_load_filament_to_nozzle(3); });
81
+  ACTION_ITEM(MSG_MMU2_FILAMENT4, []{ action_mmu2_load_filament_to_nozzle(4); });
82 82
   END_MENU();
83 83
 }
84 84
 
@@ -104,11 +104,11 @@ void action_mmu2_unload_filament() {
104 104
 void menu_mmu2_eject_filament() {
105 105
   START_MENU();
106 106
   BACK_ITEM(MSG_MMU2_MENU);
107
-  ACTION_ITEM(MSG_MMU2_FILAMENT0, [](){ _mmu2_eject_filament(0); });
108
-  ACTION_ITEM(MSG_MMU2_FILAMENT1, [](){ _mmu2_eject_filament(1); });
109
-  ACTION_ITEM(MSG_MMU2_FILAMENT2, [](){ _mmu2_eject_filament(2); });
110
-  ACTION_ITEM(MSG_MMU2_FILAMENT3, [](){ _mmu2_eject_filament(3); });
111
-  ACTION_ITEM(MSG_MMU2_FILAMENT4, [](){ _mmu2_eject_filament(4); });
107
+  ACTION_ITEM(MSG_MMU2_FILAMENT0, []{ _mmu2_eject_filament(0); });
108
+  ACTION_ITEM(MSG_MMU2_FILAMENT1, []{ _mmu2_eject_filament(1); });
109
+  ACTION_ITEM(MSG_MMU2_FILAMENT2, []{ _mmu2_eject_filament(2); });
110
+  ACTION_ITEM(MSG_MMU2_FILAMENT3, []{ _mmu2_eject_filament(3); });
111
+  ACTION_ITEM(MSG_MMU2_FILAMENT4, []{ _mmu2_eject_filament(4); });
112 112
   END_MENU();
113 113
 }
114 114
 
@@ -146,11 +146,11 @@ void menu_mmu2_choose_filament() {
146 146
   #if LCD_HEIGHT > 2
147 147
     STATIC_ITEM(MSG_MMU2_CHOOSE_FILAMENT_HEADER, SS_CENTER|SS_INVERT);
148 148
   #endif
149
-  ACTION_ITEM(MSG_MMU2_FILAMENT0, [](){ action_mmu2_choose(0); });
150
-  ACTION_ITEM(MSG_MMU2_FILAMENT1, [](){ action_mmu2_choose(1); });
151
-  ACTION_ITEM(MSG_MMU2_FILAMENT2, [](){ action_mmu2_choose(2); });
152
-  ACTION_ITEM(MSG_MMU2_FILAMENT3, [](){ action_mmu2_choose(3); });
153
-  ACTION_ITEM(MSG_MMU2_FILAMENT4, [](){ action_mmu2_choose(4); });
149
+  ACTION_ITEM(MSG_MMU2_FILAMENT0, []{ action_mmu2_choose(0); });
150
+  ACTION_ITEM(MSG_MMU2_FILAMENT1, []{ action_mmu2_choose(1); });
151
+  ACTION_ITEM(MSG_MMU2_FILAMENT2, []{ action_mmu2_choose(2); });
152
+  ACTION_ITEM(MSG_MMU2_FILAMENT3, []{ action_mmu2_choose(3); });
153
+  ACTION_ITEM(MSG_MMU2_FILAMENT4, []{ action_mmu2_choose(4); });
154 154
   END_MENU();
155 155
 }
156 156
 
@@ -164,10 +164,10 @@ void menu_mmu2_pause() {
164 164
   #if LCD_HEIGHT > 2
165 165
     STATIC_ITEM(MSG_FILAMENT_CHANGE_HEADER, SS_CENTER|SS_INVERT);
166 166
   #endif
167
-  ACTION_ITEM(MSG_MMU2_RESUME, [](){ mmuMenuWait = false; });
168
-  ACTION_ITEM(MSG_MMU2_UNLOAD_FILAMENT, [](){ mmu2.unload(); });
169
-  ACTION_ITEM(MSG_MMU2_LOAD_FILAMENT, [](){ mmu2.load_filament(currentTool); });
170
-  ACTION_ITEM(MSG_MMU2_LOAD_TO_NOZZLE, [](){ mmu2.load_filament_to_nozzle(currentTool); });
167
+  ACTION_ITEM(MSG_MMU2_RESUME, []{ mmuMenuWait = false; });
168
+  ACTION_ITEM(MSG_MMU2_UNLOAD_FILAMENT, []{ mmu2.unload(); });
169
+  ACTION_ITEM(MSG_MMU2_LOAD_FILAMENT, []{ mmu2.load_filament(currentTool); });
170
+  ACTION_ITEM(MSG_MMU2_LOAD_TO_NOZZLE, []{ mmu2.load_filament_to_nozzle(currentTool); });
171 171
   END_MENU();
172 172
 }
173 173
 

+ 10
- 10
Marlin/src/lcd/menu/menu_motion.cpp Bestand weergeven

@@ -252,9 +252,9 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
252 252
   #endif
253 253
   {
254 254
     BACK_ITEM(MSG_MOVE_AXIS);
255
-    SUBMENU(MSG_MOVE_10MM, [](){ _goto_manual_move(10);    });
256
-    SUBMENU(MSG_MOVE_1MM,  [](){ _goto_manual_move( 1);    });
257
-    SUBMENU(MSG_MOVE_01MM, [](){ _goto_manual_move( 0.1f); });
255
+    SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10);    });
256
+    SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move( 1);    });
257
+    SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
258 258
     if (axis == Z_AXIS && (SHORT_MANUAL_Z_MOVE) > 0.0f && (SHORT_MANUAL_Z_MOVE) < 0.1f) {
259 259
       SUBMENU_P(PSTR(""), []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
260 260
       MENU_ITEM_ADDON_START(0);
@@ -292,15 +292,15 @@ void menu_move() {
292 292
         true
293 293
       #endif
294 294
     ) {
295
-      SUBMENU(MSG_MOVE_X, [](){ _menu_move_distance(X_AXIS, lcd_move_x); });
296
-      SUBMENU(MSG_MOVE_Y, [](){ _menu_move_distance(Y_AXIS, lcd_move_y); });
295
+      SUBMENU(MSG_MOVE_X, []{ _menu_move_distance(X_AXIS, lcd_move_x); });
296
+      SUBMENU(MSG_MOVE_Y, []{ _menu_move_distance(Y_AXIS, lcd_move_y); });
297 297
     }
298 298
     #if ENABLED(DELTA)
299 299
       else
300
-        ACTION_ITEM(MSG_FREE_XY, [](){ line_to_z(delta_clip_start_height); ui.synchronize(); });
300
+        ACTION_ITEM(MSG_FREE_XY, []{ line_to_z(delta_clip_start_height); ui.synchronize(); });
301 301
     #endif
302 302
 
303
-    SUBMENU(MSG_MOVE_Z, [](){ _menu_move_distance(Z_AXIS, lcd_move_z); });
303
+    SUBMENU(MSG_MOVE_Z, []{ _menu_move_distance(Z_AXIS, lcd_move_z); });
304 304
   }
305 305
   else
306 306
     GCODES_ITEM(MSG_AUTO_HOME, PSTR("G28"));
@@ -344,9 +344,9 @@ void menu_move() {
344 344
   #if E_MANUAL
345 345
 
346 346
     // The current extruder
347
-    SUBMENU(MSG_MOVE_E, [](){ _menu_move_distance(E_AXIS, [](){ lcd_move_e(); }, -1); });
347
+    SUBMENU(MSG_MOVE_E, []{ _menu_move_distance(E_AXIS, []{ lcd_move_e(); }, -1); });
348 348
 
349
-    #define SUBMENU_MOVE_E(N) SUBMENU(MSG_MOVE_E##N, [](){ _menu_move_distance(E_AXIS, [](){ lcd_move_e(N); }, N); });
349
+    #define SUBMENU_MOVE_E(N) SUBMENU(MSG_MOVE_E##N, []{ _menu_move_distance(E_AXIS, []{ lcd_move_e(N); }, N); });
350 350
 
351 351
     #if EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE)
352 352
 
@@ -445,7 +445,7 @@ void menu_motion() {
445 445
     }
446 446
     #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
447 447
       editable.decimal = planner.z_fade_height;
448
-      EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, [](){ set_z_fade_height(editable.decimal); });
448
+      EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, []{ set_z_fade_height(editable.decimal); });
449 449
     #endif
450 450
 
451 451
   #endif

+ 18
- 18
Marlin/src/lcd/menu/menu_temperature.cpp Bestand weergeven

@@ -87,14 +87,14 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
87 87
 #if HAS_TEMP_HOTEND || HAS_HEATED_BED
88 88
 
89 89
   #define _PREHEAT_ITEMS(M,N) do{ \
90
-    ACTION_ITEM(MSG_PREHEAT_##M##_H##N, [](){ _preheat_both(M-1, N); }); \
91
-    ACTION_ITEM(MSG_PREHEAT_##M##_END_E##N, [](){ _preheat_end(M-1, N); }); \
90
+    ACTION_ITEM(MSG_PREHEAT_##M##_H##N, []{ _preheat_both(M-1, N); }); \
91
+    ACTION_ITEM(MSG_PREHEAT_##M##_END_E##N, []{ _preheat_end(M-1, N); }); \
92 92
   }while(0)
93 93
   #if HAS_HEATED_BED
94 94
     #define PREHEAT_ITEMS(M,N) _PREHEAT_ITEMS(M,N)
95 95
   #else
96 96
     #define PREHEAT_ITEMS(M,N) \
97
-      ACTION_ITEM(MSG_PREHEAT_##M##_H##N, [](){ _preheat_end(M-1, N); })
97
+      ACTION_ITEM(MSG_PREHEAT_##M##_H##N, []{ _preheat_end(M-1, N); })
98 98
   #endif
99 99
 
100 100
   void menu_preheat_m1() {
@@ -102,10 +102,10 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
102 102
     BACK_ITEM(MSG_TEMPERATURE);
103 103
     #if HOTENDS == 1
104 104
       #if HAS_HEATED_BED
105
-        ACTION_ITEM(MSG_PREHEAT_1, [](){ _preheat_both(0, 0); });
106
-        ACTION_ITEM(MSG_PREHEAT_1_END, [](){ _preheat_end(0, 0); });
105
+        ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_both(0, 0); });
106
+        ACTION_ITEM(MSG_PREHEAT_1_END, []{ _preheat_end(0, 0); });
107 107
       #else
108
-        ACTION_ITEM(MSG_PREHEAT_1, [](){ _preheat_end(0, 0); });
108
+        ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_end(0, 0); });
109 109
       #endif
110 110
     #elif HOTENDS > 1
111 111
       #if HAS_HEATED_BED
@@ -132,7 +132,7 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
132 132
       });
133 133
     #endif // HOTENDS > 1
134 134
     #if HAS_HEATED_BED
135
-      ACTION_ITEM(MSG_PREHEAT_1_BEDONLY, [](){ _preheat_bed(0); });
135
+      ACTION_ITEM(MSG_PREHEAT_1_BEDONLY, []{ _preheat_bed(0); });
136 136
     #endif
137 137
     END_MENU();
138 138
   }
@@ -142,10 +142,10 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
142 142
     BACK_ITEM(MSG_TEMPERATURE);
143 143
     #if HOTENDS == 1
144 144
       #if HAS_HEATED_BED
145
-        ACTION_ITEM(MSG_PREHEAT_2, [](){ _preheat_both(1, 0); });
146
-        ACTION_ITEM(MSG_PREHEAT_2_END, [](){ _preheat_end(1, 0); });
145
+        ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_both(1, 0); });
146
+        ACTION_ITEM(MSG_PREHEAT_2_END, []{ _preheat_end(1, 0); });
147 147
       #else
148
-        ACTION_ITEM(MSG_PREHEAT_2, [](){ _preheat_end(1, 0); });
148
+        ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(1, 0); });
149 149
       #endif
150 150
     #elif HOTENDS > 1
151 151
       #if HAS_HEATED_BED
@@ -172,7 +172,7 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
172 172
       });
173 173
     #endif // HOTENDS > 1
174 174
     #if HAS_HEATED_BED
175
-      ACTION_ITEM(MSG_PREHEAT_2_BEDONLY, [](){ _preheat_bed(1); });
175
+      ACTION_ITEM(MSG_PREHEAT_2_BEDONLY, []{ _preheat_bed(1); });
176 176
     #endif
177 177
     END_MENU();
178 178
   }
@@ -194,9 +194,9 @@ void menu_temperature() {
194 194
   // Nozzle [1-5]:
195 195
   //
196 196
   #if HOTENDS == 1
197
-    EDIT_ITEM_FAST(int3, MSG_NOZZLE, &thermalManager.temp_hotend[0].target, 0, HEATER_0_MAXTEMP - 15, [](){ thermalManager.start_watching_hotend(0); });
197
+    EDIT_ITEM_FAST(int3, MSG_NOZZLE, &thermalManager.temp_hotend[0].target, 0, HEATER_0_MAXTEMP - 15, []{ thermalManager.start_watching_hotend(0); });
198 198
   #elif HOTENDS > 1
199
-    #define EDIT_TARGET(N) EDIT_ITEM_FAST(int3, MSG_NOZZLE_##N, &thermalManager.temp_hotend[N].target, 0, HEATER_##N##_MAXTEMP - 15, [](){ thermalManager.start_watching_hotend(N); })
199
+    #define EDIT_TARGET(N) EDIT_ITEM_FAST(int3, MSG_NOZZLE_##N, &thermalManager.temp_hotend[N].target, 0, HEATER_##N##_MAXTEMP - 15, []{ thermalManager.start_watching_hotend(N); })
200 200
     EDIT_TARGET(0);
201 201
     EDIT_TARGET(1);
202 202
     #if HOTENDS > 2
@@ -237,21 +237,21 @@ void menu_temperature() {
237 237
   #if FAN_COUNT > 0
238 238
     #if HAS_FAN0
239 239
       editable.uint8 = thermalManager.fan_speed[0];
240
-      EDIT_ITEM_FAST(percent, MSG_FIRST_FAN_SPEED, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(0, editable.uint8); });
240
+      EDIT_ITEM_FAST(percent, MSG_FIRST_FAN_SPEED, &editable.uint8, 0, 255, []{ thermalManager.set_fan_speed(0, editable.uint8); });
241 241
       #if ENABLED(EXTRA_FAN_SPEED)
242 242
         EDIT_ITEM_FAST(percent, MSG_FIRST_EXTRA_FAN_SPEED, &thermalManager.new_fan_speed[0], 3, 255);
243 243
       #endif
244 244
     #endif
245 245
     #if HAS_FAN1
246 246
       editable.uint8 = thermalManager.fan_speed[1];
247
-      EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_2, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(1, editable.uint8); });
247
+      EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_2, &editable.uint8, 0, 255, []{ thermalManager.set_fan_speed(1, editable.uint8); });
248 248
       #if ENABLED(EXTRA_FAN_SPEED)
249 249
         EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_2, &thermalManager.new_fan_speed[1], 3, 255);
250 250
       #endif
251 251
     #endif
252 252
     #if HAS_FAN2
253 253
       editable.uint8 = thermalManager.fan_speed[2];
254
-      EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_3, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(2, editable.uint8); });
254
+      EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_3, &editable.uint8, 0, 255, []{ thermalManager.set_fan_speed(2, editable.uint8); });
255 255
       #if ENABLED(EXTRA_FAN_SPEED)
256 256
         EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_3, &thermalManager.new_fan_speed[2], 3, 255);
257 257
       #endif
@@ -267,8 +267,8 @@ void menu_temperature() {
267 267
       SUBMENU(MSG_PREHEAT_1, menu_preheat_m1);
268 268
       SUBMENU(MSG_PREHEAT_2, menu_preheat_m2);
269 269
     #else
270
-      ACTION_ITEM(MSG_PREHEAT_1, [](){ _preheat_end(0, 0); });
271
-      ACTION_ITEM(MSG_PREHEAT_2, [](){ _preheat_end(1, 0); });
270
+      ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_end(0, 0); });
271
+      ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(1, 0); });
272 272
     #endif
273 273
 
274 274
     //

+ 4
- 4
Marlin/src/lcd/menu/menu_tmc.cpp Bestand weergeven

@@ -32,7 +32,7 @@
32 32
 #include "../../module/stepper/indirection.h"
33 33
 #include "../../feature/tmc_util.h"
34 34
 
35
-#define TMC_EDIT_STORED_I_RMS(ST,MSG) EDIT_ITEM_P(uint16_4, PSTR(MSG), &stepper##ST.val_mA, 100, 3000, [](){ stepper##ST.refresh_stepper_current(); })
35
+#define TMC_EDIT_STORED_I_RMS(ST,MSG) EDIT_ITEM_P(uint16_4, PSTR(MSG), &stepper##ST.val_mA, 100, 3000, []{ stepper##ST.refresh_stepper_current(); })
36 36
 
37 37
 void menu_tmc_current() {
38 38
   START_MENU();
@@ -81,7 +81,7 @@ void menu_tmc_current() {
81 81
 
82 82
 #if ENABLED(HYBRID_THRESHOLD)
83 83
 
84
-  #define TMC_EDIT_STORED_HYBRID_THRS(ST, MSG) EDIT_ITEM_P(uint8, PSTR(MSG), &stepper##ST.stored.hybrid_thrs, 0, 255, [](){ stepper##ST.refresh_hybrid_thrs(); });
84
+  #define TMC_EDIT_STORED_HYBRID_THRS(ST, MSG) EDIT_ITEM_P(uint8, PSTR(MSG), &stepper##ST.stored.hybrid_thrs, 0, 255, []{ stepper##ST.refresh_hybrid_thrs(); });
85 85
 
86 86
   void menu_tmc_hybrid_thrs() {
87 87
     START_MENU();
@@ -132,7 +132,7 @@ void menu_tmc_current() {
132 132
 
133 133
 #if ENABLED(SENSORLESS_HOMING)
134 134
 
135
-  #define TMC_EDIT_STORED_SGT(ST) EDIT_ITEM_P(int4, PSTR(MSG_##ST), &stepper##ST.stored.homing_thrs, stepper##ST.sgt_min, stepper##ST.sgt_max, [](){ stepper##ST.refresh_homing_thrs(); });
135
+  #define TMC_EDIT_STORED_SGT(ST) EDIT_ITEM_P(int4, PSTR(MSG_##ST), &stepper##ST.stored.homing_thrs, stepper##ST.sgt_min, stepper##ST.sgt_max, []{ stepper##ST.refresh_homing_thrs(); });
136 136
 
137 137
   void menu_tmc_homing_thrs() {
138 138
     START_MENU();
@@ -156,7 +156,7 @@ void menu_tmc_current() {
156 156
 
157 157
 #if HAS_STEALTHCHOP
158 158
 
159
-  #define TMC_EDIT_STEP_MODE(ST, MSG) EDIT_ITEM_P(bool, PSTR(MSG), &stepper##ST.stored.stealthChop_enabled, [](){ stepper##ST.refresh_stepping_mode(); })
159
+  #define TMC_EDIT_STEP_MODE(ST, MSG) EDIT_ITEM_P(bool, PSTR(MSG), &stepper##ST.stored.stealthChop_enabled, []{ stepper##ST.refresh_stepping_mode(); })
160 160
 
161 161
   void menu_tmc_step_mode() {
162 162
     START_MENU();

+ 10
- 10
Marlin/src/lcd/menu/menu_tune.cpp Bestand weergeven

@@ -126,9 +126,9 @@ void menu_tune() {
126 126
   // Nozzle [1-4]:
127 127
   //
128 128
   #if HOTENDS == 1
129
-    EDIT_ITEM_FAST(int3, MSG_NOZZLE, &thermalManager.temp_hotend[0].target, 0, HEATER_0_MAXTEMP - 15, [](){ thermalManager.start_watching_hotend(0); });
129
+    EDIT_ITEM_FAST(int3, MSG_NOZZLE, &thermalManager.temp_hotend[0].target, 0, HEATER_0_MAXTEMP - 15, []{ thermalManager.start_watching_hotend(0); });
130 130
   #elif HOTENDS > 1
131
-    #define EDIT_NOZZLE(N) EDIT_ITEM_FAST(int3, MSG_NOZZLE_##N, &thermalManager.temp_hotend[N].target, 0, HEATER_##N##_MAXTEMP - 15, [](){ thermalManager.start_watching_hotend(N); })
131
+    #define EDIT_NOZZLE(N) EDIT_ITEM_FAST(int3, MSG_NOZZLE_##N, &thermalManager.temp_hotend[N].target, 0, HEATER_##N##_MAXTEMP - 15, []{ thermalManager.start_watching_hotend(N); })
132 132
     EDIT_NOZZLE(0);
133 133
     EDIT_NOZZLE(1);
134 134
     #if HOTENDS > 2
@@ -162,21 +162,21 @@ void menu_tune() {
162 162
   #if FAN_COUNT > 0
163 163
     #if HAS_FAN0
164 164
       editable.uint8 = thermalManager.fan_speed[0];
165
-      EDIT_ITEM_FAST(percent, MSG_FIRST_FAN_SPEED, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(0, editable.uint8); });
165
+      EDIT_ITEM_FAST(percent, MSG_FIRST_FAN_SPEED, &editable.uint8, 0, 255, []{ thermalManager.set_fan_speed(0, editable.uint8); });
166 166
       #if ENABLED(EXTRA_FAN_SPEED)
167 167
         EDIT_ITEM_FAST(percent, MSG_FIRST_EXTRA_FAN_SPEED, &thermalManager.new_fan_speed[0], 3, 255);
168 168
       #endif
169 169
     #endif
170 170
     #if HAS_FAN1
171 171
       editable.uint8 = thermalManager.fan_speed[1];
172
-      EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_2, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(1, editable.uint8); });
172
+      EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_2, &editable.uint8, 0, 255, []{ thermalManager.set_fan_speed(1, editable.uint8); });
173 173
       #if ENABLED(EXTRA_FAN_SPEED)
174 174
         EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_2, &thermalManager.new_fan_speed[1], 3, 255);
175 175
       #endif
176 176
     #endif
177 177
     #if HAS_FAN2
178 178
       editable.uint8 = thermalManager.fan_speed[2];
179
-      EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_3, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(2, editable.uint8); });
179
+      EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_3, &editable.uint8, 0, 255, []{ thermalManager.set_fan_speed(2, editable.uint8); });
180 180
       #if ENABLED(EXTRA_FAN_SPEED)
181 181
         EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_3, &thermalManager.new_fan_speed[2], 3, 255);
182 182
       #endif
@@ -188,10 +188,10 @@ void menu_tune() {
188 188
   // Flow [1-5]:
189 189
   //
190 190
   #if EXTRUDERS == 1
191
-    EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[0], 10, 999, [](){ planner.refresh_e_factor(0); });
191
+    EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[0], 10, 999, []{ planner.refresh_e_factor(0); });
192 192
   #elif EXTRUDERS
193
-    EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[active_extruder], 10, 999, [](){ planner.refresh_e_factor(active_extruder); });
194
-    #define EDIT_FLOW(N) EDIT_ITEM(int3, MSG_FLOW_##N, &planner.flow_percentage[N], 10, 999, [](){ planner.refresh_e_factor(N); })
193
+    EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[active_extruder], 10, 999, []{ planner.refresh_e_factor(active_extruder); });
194
+    #define EDIT_FLOW(N) EDIT_ITEM(int3, MSG_FLOW_##N, &planner.flow_percentage[N], 10, 999, []{ planner.refresh_e_factor(N); })
195 195
     EDIT_FLOW(0);
196 196
     EDIT_FLOW(1);
197 197
     #if EXTRUDERS > 2
@@ -215,8 +215,8 @@ void menu_tune() {
215 215
   //
216 216
   #if ENABLED(BABYSTEPPING)
217 217
     #if ENABLED(BABYSTEP_XY)
218
-      SUBMENU(MSG_BABYSTEP_X, [](){ _lcd_babystep_go(_lcd_babystep_x); });
219
-      SUBMENU(MSG_BABYSTEP_Y, [](){ _lcd_babystep_go(_lcd_babystep_y); });
218
+      SUBMENU(MSG_BABYSTEP_X, []{ _lcd_babystep_go(_lcd_babystep_x); });
219
+      SUBMENU(MSG_BABYSTEP_Y, []{ _lcd_babystep_go(_lcd_babystep_y); });
220 220
     #endif
221 221
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
222 222
       SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);

+ 2
- 2
Marlin/src/lcd/menu/menu_ubl.cpp Bestand weergeven

@@ -234,7 +234,7 @@ void _lcd_ubl_grid_level() {
234 234
   START_MENU();
235 235
   BACK_ITEM(MSG_UBL_TOOLS);
236 236
   EDIT_ITEM(int3, MSG_UBL_SIDE_POINTS, &side_points, 2, 6);
237
-  ACTION_ITEM(MSG_UBL_MESH_LEVEL, [](){
237
+  ACTION_ITEM(MSG_UBL_MESH_LEVEL, []{
238 238
     char ubl_lcd_gcode[12];
239 239
     sprintf_P(ubl_lcd_gcode, PSTR("G29 J%i"), side_points);
240 240
     lcd_enqueue_one_now(ubl_lcd_gcode);
@@ -617,7 +617,7 @@ void _lcd_ubl_level_bed() {
617 617
   GCODES_ITEM(MSG_UBL_INFO_UBL, PSTR("G29 W"));
618 618
   #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
619 619
     editable.decimal = planner.z_fade_height;
620
-    EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, [](){ set_z_fade_height(editable.decimal); });
620
+    EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, []{ set_z_fade_height(editable.decimal); });
621 621
   #endif
622 622
   END_MENU();
623 623
 }

Laden…
Annuleren
Opslaan