Browse Source

4 / 5 digits for some edit items (#20793)

Martin 4 years ago
parent
commit
f7e2467da1
No account linked to committer's email address
2 changed files with 13 additions and 12 deletions
  1. 12
    12
      Marlin/src/lcd/menu/menu_advanced.cpp
  2. 1
    0
      Marlin/src/lcd/menu/menu_item.h

+ 12
- 12
Marlin/src/lcd/menu/menu_advanced.cpp View File

140
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
140
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
141
       constexpr float extrude_maxlength = TERN(PREVENT_LENGTHY_EXTRUDE, EXTRUDE_MAXLENGTH, 999);
141
       constexpr float extrude_maxlength = TERN(PREVENT_LENGTHY_EXTRUDE, EXTRUDE_MAXLENGTH, 999);
142
 
142
 
143
-      EDIT_ITEM_FAST(float3, MSG_FILAMENT_UNLOAD, &fc_settings[active_extruder].unload_length, 0, extrude_maxlength);
143
+      EDIT_ITEM_FAST(float4, MSG_FILAMENT_UNLOAD, &fc_settings[active_extruder].unload_length, 0, extrude_maxlength);
144
       #if HAS_MULTI_EXTRUDER
144
       #if HAS_MULTI_EXTRUDER
145
         LOOP_L_N(n, EXTRUDERS)
145
         LOOP_L_N(n, EXTRUDERS)
146
-          EDIT_ITEM_FAST_N(float3, n, MSG_FILAMENTUNLOAD_E, &fc_settings[n].unload_length, 0, extrude_maxlength);
146
+          EDIT_ITEM_FAST_N(float4, n, MSG_FILAMENTUNLOAD_E, &fc_settings[n].unload_length, 0, extrude_maxlength);
147
       #endif
147
       #endif
148
 
148
 
149
-      EDIT_ITEM_FAST(float3, MSG_FILAMENT_LOAD, &fc_settings[active_extruder].load_length, 0, extrude_maxlength);
149
+      EDIT_ITEM_FAST(float4, MSG_FILAMENT_LOAD, &fc_settings[active_extruder].load_length, 0, extrude_maxlength);
150
       #if HAS_MULTI_EXTRUDER
150
       #if HAS_MULTI_EXTRUDER
151
         LOOP_L_N(n, EXTRUDERS)
151
         LOOP_L_N(n, EXTRUDERS)
152
-          EDIT_ITEM_FAST_N(float3, n, MSG_FILAMENTLOAD_E, &fc_settings[n].load_length, 0, extrude_maxlength);
152
+          EDIT_ITEM_FAST_N(float4, n, MSG_FILAMENTLOAD_E, &fc_settings[n].load_length, 0, extrude_maxlength);
153
       #endif
153
       #endif
154
     #endif
154
     #endif
155
 
155
 
279
       #if ENABLED(PID_EXTRUSION_SCALING)
279
       #if ENABLED(PID_EXTRUSION_SCALING)
280
         #define _PID_BASE_MENU_ITEMS(N) \
280
         #define _PID_BASE_MENU_ITEMS(N) \
281
           __PID_BASE_MENU_ITEMS(N); \
281
           __PID_BASE_MENU_ITEMS(N); \
282
-          EDIT_ITEM_N(float3, N, MSG_PID_C_E, &PID_PARAM(Kc, N), 1, 9990)
282
+          EDIT_ITEM_N(float4, N, MSG_PID_C_E, &PID_PARAM(Kc, N), 1, 9990)
283
       #else
283
       #else
284
         #define _PID_BASE_MENU_ITEMS(N) __PID_BASE_MENU_ITEMS(N)
284
         #define _PID_BASE_MENU_ITEMS(N) __PID_BASE_MENU_ITEMS(N)
285
       #endif
285
       #endif
287
       #if ENABLED(PID_FAN_SCALING)
287
       #if ENABLED(PID_FAN_SCALING)
288
         #define _PID_EDIT_MENU_ITEMS(N) \
288
         #define _PID_EDIT_MENU_ITEMS(N) \
289
           _PID_BASE_MENU_ITEMS(N); \
289
           _PID_BASE_MENU_ITEMS(N); \
290
-          EDIT_ITEM_N(float3, N, MSG_PID_F_E, &PID_PARAM(Kf, N), 1, 9990)
290
+          EDIT_ITEM_N(float4, N, MSG_PID_F_E, &PID_PARAM(Kf, N), 1, 9990)
291
       #else
291
       #else
292
         #define _PID_EDIT_MENU_ITEMS(N) _PID_BASE_MENU_ITEMS(N)
292
         #define _PID_EDIT_MENU_ITEMS(N) _PID_BASE_MENU_ITEMS(N)
293
       #endif
293
       #endif
348
       #elif ENABLED(LIMITED_MAX_FR_EDITING)
348
       #elif ENABLED(LIMITED_MAX_FR_EDITING)
349
         DEFAULT_MAX_FEEDRATE
349
         DEFAULT_MAX_FEEDRATE
350
       #else
350
       #else
351
-        { 999, 999, 999, 999 }
351
+        { 9999, 9999, 9999, 9999 }
352
       #endif
352
       #endif
353
     ;
353
     ;
354
     #if ENABLED(LIMITED_MAX_FR_EDITING) && !defined(MAX_FEEDRATE_EDIT_VALUES)
354
     #if ENABLED(LIMITED_MAX_FR_EDITING) && !defined(MAX_FEEDRATE_EDIT_VALUES)
360
     START_MENU();
360
     START_MENU();
361
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
361
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
362
 
362
 
363
-    #define EDIT_VMAX(N) EDIT_ITEM_FAST(float3, MSG_VMAX_##N, &planner.settings.max_feedrate_mm_s[_AXIS(N)], 1, max_fr_edit_scaled[_AXIS(N)])
363
+    #define EDIT_VMAX(N) EDIT_ITEM_FAST(float5, MSG_VMAX_##N, &planner.settings.max_feedrate_mm_s[_AXIS(N)], 1, max_fr_edit_scaled[_AXIS(N)])
364
     EDIT_VMAX(A);
364
     EDIT_VMAX(A);
365
     EDIT_VMAX(B);
365
     EDIT_VMAX(B);
366
     EDIT_VMAX(C);
366
     EDIT_VMAX(C);
367
 
367
 
368
     #if E_STEPPERS
368
     #if E_STEPPERS
369
-      EDIT_ITEM_FAST(float3, MSG_VMAX_E, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
369
+      EDIT_ITEM_FAST(float5, MSG_VMAX_E, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
370
     #endif
370
     #endif
371
     #if ENABLED(DISTINCT_E_FACTORS)
371
     #if ENABLED(DISTINCT_E_FACTORS)
372
       LOOP_L_N(n, E_STEPPERS)
372
       LOOP_L_N(n, E_STEPPERS)
373
-        EDIT_ITEM_FAST_N(float3, n, MSG_VMAX_EN, &planner.settings.max_feedrate_mm_s[E_AXIS_N(n)], 1, max_fr_edit_scaled.e);
373
+        EDIT_ITEM_FAST_N(float5, n, MSG_VMAX_EN, &planner.settings.max_feedrate_mm_s[E_AXIS_N(n)], 1, max_fr_edit_scaled.e);
374
     #endif
374
     #endif
375
 
375
 
376
     // M205 S Min Feedrate
376
     // M205 S Min Feedrate
377
-    EDIT_ITEM_FAST(float3, MSG_VMIN, &planner.settings.min_feedrate_mm_s, 0, 999);
377
+    EDIT_ITEM_FAST(float5, MSG_VMIN, &planner.settings.min_feedrate_mm_s, 0, 9999);
378
 
378
 
379
     // M205 T Min Travel Feedrate
379
     // M205 T Min Travel Feedrate
380
-    EDIT_ITEM_FAST(float3, MSG_VTRAV_MIN, &planner.settings.min_travel_feedrate_mm_s, 0, 999);
380
+    EDIT_ITEM_FAST(float5, MSG_VTRAV_MIN, &planner.settings.min_travel_feedrate_mm_s, 0, 9999);
381
 
381
 
382
     END_MENU();
382
     END_MENU();
383
   }
383
   }

+ 1
- 0
Marlin/src/lcd/menu/menu_item.h View File

133
 DEFINE_MENU_EDIT_ITEM_TYPE(float3      ,float    ,ftostr3         ,   1     );   // 123        right-justified
133
 DEFINE_MENU_EDIT_ITEM_TYPE(float3      ,float    ,ftostr3         ,   1     );   // 123        right-justified
134
 DEFINE_MENU_EDIT_ITEM_TYPE(float42_52  ,float    ,ftostr42_52     , 100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
134
 DEFINE_MENU_EDIT_ITEM_TYPE(float42_52  ,float    ,ftostr42_52     , 100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
135
 DEFINE_MENU_EDIT_ITEM_TYPE(float43     ,float    ,ftostr43sign    ,1000     );   // -1.234, _1.234, +1.234
135
 DEFINE_MENU_EDIT_ITEM_TYPE(float43     ,float    ,ftostr43sign    ,1000     );   // -1.234, _1.234, +1.234
136
+DEFINE_MENU_EDIT_ITEM_TYPE(float4      ,float    ,ftostr4sign     ,   1     );   // 1234       right-justified
136
 DEFINE_MENU_EDIT_ITEM_TYPE(float5      ,float    ,ftostr5rj       ,   1     );   // 12345      right-justified
137
 DEFINE_MENU_EDIT_ITEM_TYPE(float5      ,float    ,ftostr5rj       ,   1     );   // 12345      right-justified
137
 DEFINE_MENU_EDIT_ITEM_TYPE(float5_25   ,float    ,ftostr5rj       ,   0.04f );   // 12345      right-justified (25 increment)
138
 DEFINE_MENU_EDIT_ITEM_TYPE(float5_25   ,float    ,ftostr5rj       ,   0.04f );   // 12345      right-justified (25 increment)
138
 DEFINE_MENU_EDIT_ITEM_TYPE(float51     ,float    ,ftostr51rj      ,  10     );   // 1234.5     right-justified
139
 DEFINE_MENU_EDIT_ITEM_TYPE(float51     ,float    ,ftostr51rj      ,  10     );   // 1234.5     right-justified

Loading…
Cancel
Save