瀏覽代碼

Label menu edit items

Scott Lahteine 6 年之前
父節點
當前提交
17a8c37148
共有 2 個檔案被更改,包括 42 行新增42 行删除
  1. 14
    14
      Marlin/src/lcd/menu/menu.cpp
  2. 28
    28
      Marlin/src/lcd/menu/menu.h

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

@@ -160,20 +160,20 @@ void MenuItemBase::init(PGM_P const el, void * const ev, const int32_t minv, con
160 160
 
161 161
 #define DEFINE_MENU_EDIT_ITEM(NAME) template class TMenuItem<MenuItemInfo_##NAME>;
162 162
 
163
-DEFINE_MENU_EDIT_ITEM(int3);
164
-DEFINE_MENU_EDIT_ITEM(int4);
165
-DEFINE_MENU_EDIT_ITEM(int8);
166
-DEFINE_MENU_EDIT_ITEM(uint8);
167
-DEFINE_MENU_EDIT_ITEM(uint16_3);
168
-DEFINE_MENU_EDIT_ITEM(uint16_4);
169
-DEFINE_MENU_EDIT_ITEM(float3);
170
-DEFINE_MENU_EDIT_ITEM(float52);
171
-DEFINE_MENU_EDIT_ITEM(float43);
172
-DEFINE_MENU_EDIT_ITEM(float5);
173
-DEFINE_MENU_EDIT_ITEM(float51);
174
-DEFINE_MENU_EDIT_ITEM(float52sign);
175
-DEFINE_MENU_EDIT_ITEM(float62);
176
-DEFINE_MENU_EDIT_ITEM(long5);
163
+DEFINE_MENU_EDIT_ITEM(int3);        // 123, -12   right-justified
164
+DEFINE_MENU_EDIT_ITEM(int4);        // 1234, -123 right-justified
165
+DEFINE_MENU_EDIT_ITEM(int8);        // 123, -12   right-justified
166
+DEFINE_MENU_EDIT_ITEM(uint8);       // 123        right-justified
167
+DEFINE_MENU_EDIT_ITEM(uint16_3);    // 123, -12   right-justified
168
+DEFINE_MENU_EDIT_ITEM(uint16_4);    // 1234, -123 right-justified
169
+DEFINE_MENU_EDIT_ITEM(float3);      // 123        right-justified
170
+DEFINE_MENU_EDIT_ITEM(float52);     // 123.45
171
+DEFINE_MENU_EDIT_ITEM(float43);     // 1.234
172
+DEFINE_MENU_EDIT_ITEM(float5);      // 12345      right-justified
173
+DEFINE_MENU_EDIT_ITEM(float51);     // +1234.5
174
+DEFINE_MENU_EDIT_ITEM(float52sign); // +123.45
175
+DEFINE_MENU_EDIT_ITEM(float62);     // 1234.56    right-justified
176
+DEFINE_MENU_EDIT_ITEM(long5);       // 12345      right-justified
177 177
 
178 178
 void MenuItem_bool::action_edit(PGM_P pstr, bool *ptr, screenFunc_t callback) {
179 179
   UNUSED(pstr); *ptr ^= true; ui.refresh();

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

@@ -43,20 +43,20 @@ bool printer_busy();
43 43
     static inline char* strfunc(const float value) { return STRFUNC((TYPE) value); } \
44 44
   };
45 45
 
46
-DECLARE_MENU_EDIT_TYPE(int16_t,  int3,        i16tostr3,       1     );
47
-DECLARE_MENU_EDIT_TYPE(int16_t,  int4,        i16tostr4sign,   1     );
48
-DECLARE_MENU_EDIT_TYPE(int8_t,   int8,        i8tostr3,        1     );
49
-DECLARE_MENU_EDIT_TYPE(uint8_t,  uint8,       ui8tostr3,       1     );
50
-DECLARE_MENU_EDIT_TYPE(uint16_t, uint16_3,    ui16tostr3,      1     );
51
-DECLARE_MENU_EDIT_TYPE(uint16_t, uint16_4,    ui16tostr4,      0.1   );
52
-DECLARE_MENU_EDIT_TYPE(float,    float3,      ftostr3,         1     );
53
-DECLARE_MENU_EDIT_TYPE(float,    float52,     ftostr52,      100     );
54
-DECLARE_MENU_EDIT_TYPE(float,    float43,     ftostr43sign, 1000     );
55
-DECLARE_MENU_EDIT_TYPE(float,    float5,      ftostr5rj,       0.01f );
56
-DECLARE_MENU_EDIT_TYPE(float,    float51,     ftostr51sign,   10     );
57
-DECLARE_MENU_EDIT_TYPE(float,    float52sign, ftostr52sign,  100     );
58
-DECLARE_MENU_EDIT_TYPE(float,    float62,     ftostr62rj,    100     );
59
-DECLARE_MENU_EDIT_TYPE(uint32_t, long5,       ftostr5rj,       0.01f );
46
+DECLARE_MENU_EDIT_TYPE(int16_t,  int3,        i16tostr3,       1     );   // 123, -12   right-justified
47
+DECLARE_MENU_EDIT_TYPE(int16_t,  int4,        i16tostr4sign,   1     );   // 1234, -123 right-justified
48
+DECLARE_MENU_EDIT_TYPE(int8_t,   int8,        i8tostr3,        1     );   // 123, -12   right-justified
49
+DECLARE_MENU_EDIT_TYPE(uint8_t,  uint8,       ui8tostr3,       1     );   // 123        right-justified
50
+DECLARE_MENU_EDIT_TYPE(uint16_t, uint16_3,    ui16tostr3,      1     );   // 123, -12   right-justified
51
+DECLARE_MENU_EDIT_TYPE(uint16_t, uint16_4,    ui16tostr4,      0.1   );   // 1234, -123 right-justified
52
+DECLARE_MENU_EDIT_TYPE(float,    float3,      ftostr3,         1     );   // 123        right-justified
53
+DECLARE_MENU_EDIT_TYPE(float,    float52,     ftostr52,      100     );   // 123.45
54
+DECLARE_MENU_EDIT_TYPE(float,    float43,     ftostr43sign, 1000     );   // 1.234
55
+DECLARE_MENU_EDIT_TYPE(float,    float5,      ftostr5rj,       0.01f );   // 12345      right-justified
56
+DECLARE_MENU_EDIT_TYPE(float,    float51,     ftostr51sign,   10     );   // +1234.5
57
+DECLARE_MENU_EDIT_TYPE(float,    float52sign, ftostr52sign,  100     );   // +123.45
58
+DECLARE_MENU_EDIT_TYPE(float,    float62,     ftostr62rj,    100     );   // 1234.56    right-justified
59
+DECLARE_MENU_EDIT_TYPE(uint32_t, long5,       ftostr5rj,       0.01f );   // 12345      right-justified
60 60
 
61 61
 ////////////////////////////////////////////
62 62
 ///////// Menu Item Draw Functions /////////
@@ -102,20 +102,20 @@ FORCE_INLINE void draw_menu_item_edit_P(const bool sel, const uint8_t row, PGM_P
102 102
   typedef void NAME##_void
103 103
 #define DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(NAME) _DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(MenuItemInfo_##NAME::type_t, NAME, MenuItemInfo_##NAME::strfunc)
104 104
 
105
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(int3);
106
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(int4);
107
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(int8);
108
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(uint8);
109
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(uint16_3);
110
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(uint16_4);
111
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float3);
112
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52);
113
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float43);
114
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float5);
115
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51);
116
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52sign);
117
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float62);
118
-DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(long5);
105
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(int3);             // 123, -12   right-justified
106
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(int4);             // 1234, -123 right-justified
107
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(int8);             // 123, -12   right-justified
108
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(uint8);            // 123        right-justified
109
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(uint16_3);         // 123, -12   right-justified
110
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(uint16_4);         // 1234, -123 right-justified
111
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float3);           // 123        right-justified
112
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52);          // 123.45
113
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float43);          // 1.234
114
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float5);           // 12345      right-justified
115
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51);          // +1234.5
116
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52sign);      // +123.45
117
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float62);          // 1234.56    right-justified
118
+DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(long5);            // 12345      right-justified
119 119
 
120 120
 #define draw_menu_item_edit_bool(sel, row, pstr, pstr2, data, ...)           DRAW_BOOL_SETTING(sel, row, pstr, data)
121 121
 #define draw_menu_item_edit_accessor_bool(sel, row, pstr, pstr2, pget, pset) DRAW_BOOL_SETTING(sel, row, pstr, data)

Loading…
取消
儲存