瀏覽代碼

Menu edit accel in increments of 25 (#13850)

Tanguy Pruvot 6 年之前
父節點
當前提交
e7b3720b81
共有 3 個檔案被更改,包括 12 行新增3 行删除
  1. 2
    0
      Marlin/src/lcd/menu/menu.cpp
  2. 6
    0
      Marlin/src/lcd/menu/menu.h
  3. 4
    3
      Marlin/src/lcd/menu/menu_advanced.cpp

+ 2
- 0
Marlin/src/lcd/menu/menu.cpp 查看文件

167
 DEFINE_MENU_EDIT_ITEM(float52);     // 123.45
167
 DEFINE_MENU_EDIT_ITEM(float52);     // 123.45
168
 DEFINE_MENU_EDIT_ITEM(float43);     // 1.234
168
 DEFINE_MENU_EDIT_ITEM(float43);     // 1.234
169
 DEFINE_MENU_EDIT_ITEM(float5);      // 12345      right-justified
169
 DEFINE_MENU_EDIT_ITEM(float5);      // 12345      right-justified
170
+DEFINE_MENU_EDIT_ITEM(float5_25);   // 12345      right-justified (25 increment)
170
 DEFINE_MENU_EDIT_ITEM(float51);     // 1234.5     right-justified
171
 DEFINE_MENU_EDIT_ITEM(float51);     // 1234.5     right-justified
171
 DEFINE_MENU_EDIT_ITEM(float51sign); // +1234.5
172
 DEFINE_MENU_EDIT_ITEM(float51sign); // +1234.5
172
 DEFINE_MENU_EDIT_ITEM(float52sign); // +123.45
173
 DEFINE_MENU_EDIT_ITEM(float52sign); // +123.45
173
 DEFINE_MENU_EDIT_ITEM(long5);       // 12345      right-justified
174
 DEFINE_MENU_EDIT_ITEM(long5);       // 12345      right-justified
175
+DEFINE_MENU_EDIT_ITEM(long5_25);    // 12345      right-justified (25 increment)
174
 
176
 
175
 void MenuItem_bool::action_edit(PGM_P pstr, bool *ptr, screenFunc_t callback) {
177
 void MenuItem_bool::action_edit(PGM_P pstr, bool *ptr, screenFunc_t callback) {
176
   UNUSED(pstr); *ptr ^= true; ui.refresh();
178
   UNUSED(pstr); *ptr ^= true; ui.refresh();

+ 6
- 0
Marlin/src/lcd/menu/menu.h 查看文件

56
 DECLARE_MENU_EDIT_TYPE(float,    float52,     ftostr52,      100     );   // 123.45
56
 DECLARE_MENU_EDIT_TYPE(float,    float52,     ftostr52,      100     );   // 123.45
57
 DECLARE_MENU_EDIT_TYPE(float,    float43,     ftostr43sign, 1000     );   // 1.234
57
 DECLARE_MENU_EDIT_TYPE(float,    float43,     ftostr43sign, 1000     );   // 1.234
58
 DECLARE_MENU_EDIT_TYPE(float,    float5,      ftostr5rj,       0.01f );   // 12345      right-justified
58
 DECLARE_MENU_EDIT_TYPE(float,    float5,      ftostr5rj,       0.01f );   // 12345      right-justified
59
+DECLARE_MENU_EDIT_TYPE(float,    float5_25,   ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
59
 DECLARE_MENU_EDIT_TYPE(float,    float51,     ftostr51rj,     10     );   // 1234.5     right-justified
60
 DECLARE_MENU_EDIT_TYPE(float,    float51,     ftostr51rj,     10     );   // 1234.5     right-justified
60
 DECLARE_MENU_EDIT_TYPE(float,    float51sign, ftostr51sign,   10     );   // +1234.5
61
 DECLARE_MENU_EDIT_TYPE(float,    float51sign, ftostr51sign,   10     );   // +1234.5
61
 DECLARE_MENU_EDIT_TYPE(float,    float52sign, ftostr52sign,  100     );   // +123.45
62
 DECLARE_MENU_EDIT_TYPE(float,    float52sign, ftostr52sign,  100     );   // +123.45
62
 DECLARE_MENU_EDIT_TYPE(uint32_t, long5,       ftostr5rj,       0.01f );   // 12345      right-justified
63
 DECLARE_MENU_EDIT_TYPE(uint32_t, long5,       ftostr5rj,       0.01f );   // 12345      right-justified
64
+DECLARE_MENU_EDIT_TYPE(uint32_t, long5_25,    ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
63
 
65
 
64
 ////////////////////////////////////////////
66
 ////////////////////////////////////////////
65
 ///////// Menu Item Draw Functions /////////
67
 ///////// Menu Item Draw Functions /////////
124
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52);          // 123.45
126
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52);          // 123.45
125
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float43);          // 1.234
127
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float43);          // 1.234
126
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float5);           // 12345      right-justified
128
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float5);           // 12345      right-justified
129
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float5_25);        // 12345      right-justified (25 increment)
127
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51);          // 1234.5     right-justified
130
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51);          // 1234.5     right-justified
128
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51sign);      // +1234.5
131
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51sign);      // +1234.5
129
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52sign);      // +123.45
132
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52sign);      // +123.45
130
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(long5);            // 12345      right-justified
133
 DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(long5);            // 12345      right-justified
134
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(long5_25);         // 12345      right-justified (25 increment)
131
 
135
 
132
 #define draw_menu_item_edit_bool(sel, row, pstr, pstr2, data, ...)           DRAW_BOOL_SETTING(sel, row, pstr, data)
136
 #define draw_menu_item_edit_bool(sel, row, pstr, pstr2, data, ...)           DRAW_BOOL_SETTING(sel, row, pstr, data)
133
 #define draw_menu_item_edit_accessor_bool(sel, row, pstr, pstr2, pget, pset) DRAW_BOOL_SETTING(sel, row, pstr, data)
137
 #define draw_menu_item_edit_accessor_bool(sel, row, pstr, pstr2, pget, pset) DRAW_BOOL_SETTING(sel, row, pstr, data)
205
 DECLARE_MENU_EDIT_ITEM(float52);
209
 DECLARE_MENU_EDIT_ITEM(float52);
206
 DECLARE_MENU_EDIT_ITEM(float43);
210
 DECLARE_MENU_EDIT_ITEM(float43);
207
 DECLARE_MENU_EDIT_ITEM(float5);
211
 DECLARE_MENU_EDIT_ITEM(float5);
212
+DECLARE_MENU_EDIT_ITEM(float5_25);
208
 DECLARE_MENU_EDIT_ITEM(float51);
213
 DECLARE_MENU_EDIT_ITEM(float51);
209
 DECLARE_MENU_EDIT_ITEM(float51sign);
214
 DECLARE_MENU_EDIT_ITEM(float51sign);
210
 DECLARE_MENU_EDIT_ITEM(float52sign);
215
 DECLARE_MENU_EDIT_ITEM(float52sign);
211
 DECLARE_MENU_EDIT_ITEM(long5);
216
 DECLARE_MENU_EDIT_ITEM(long5);
217
+DECLARE_MENU_EDIT_ITEM(long5_25);
212
 
218
 
213
 class MenuItem_bool {
219
 class MenuItem_bool {
214
   public:
220
   public:

+ 4
- 3
Marlin/src/lcd/menu/menu_advanced.cpp 查看文件

499
     MENU_BACK(MSG_ADVANCED_SETTINGS);
499
     MENU_BACK(MSG_ADVANCED_SETTINGS);
500
 
500
 
501
     // M204 P Acceleration
501
     // M204 P Acceleration
502
-    MENU_MULTIPLIER_ITEM_EDIT(float5, MSG_ACC, &planner.settings.acceleration, 10, 99000);
502
+    MENU_MULTIPLIER_ITEM_EDIT(float5_25, MSG_ACC, &planner.settings.acceleration, 25, 99000);
503
 
503
 
504
     // M204 R Retract Acceleration
504
     // M204 R Retract Acceleration
505
     MENU_MULTIPLIER_ITEM_EDIT(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, 99000);
505
     MENU_MULTIPLIER_ITEM_EDIT(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, 99000);
506
 
506
 
507
     // M204 T Travel Acceleration
507
     // M204 T Travel Acceleration
508
-    MENU_MULTIPLIER_ITEM_EDIT(float5, MSG_A_TRAVEL, &planner.settings.travel_acceleration, 100, 99000);
508
+    MENU_MULTIPLIER_ITEM_EDIT(float5_25, MSG_A_TRAVEL, &planner.settings.travel_acceleration, 25, 99000);
509
 
509
 
510
     // M201 settings
510
     // M201 settings
511
-    #define EDIT_AMAX(Q,L) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_##Q, &planner.settings.max_acceleration_mm_per_s2[_AXIS(Q)], L, 99000, _reset_acceleration_rates)
511
+    #define EDIT_AMAX(Q,L) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(long5_25, MSG_AMAX MSG_##Q, &planner.settings.max_acceleration_mm_per_s2[_AXIS(Q)], L, 99000, _reset_acceleration_rates)
512
+
512
     EDIT_AMAX(A,100);
513
     EDIT_AMAX(A,100);
513
     EDIT_AMAX(B,100);
514
     EDIT_AMAX(B,100);
514
     EDIT_AMAX(C, 10);
515
     EDIT_AMAX(C, 10);

Loading…
取消
儲存