Browse Source

Comments, includes (#14671)

Ludy 5 years ago
parent
commit
39e1726498

+ 3
- 2
Marlin/src/lcd/menu/menu.cpp View File

156
 
156
 
157
 #define DEFINE_MENU_EDIT_ITEM(NAME) template class TMenuItem<MenuItemInfo_##NAME>
157
 #define DEFINE_MENU_EDIT_ITEM(NAME) template class TMenuItem<MenuItemInfo_##NAME>
158
 
158
 
159
+DEFINE_MENU_EDIT_ITEM(percent);     // 100%       right-justified
159
 DEFINE_MENU_EDIT_ITEM(int3);        // 123, -12   right-justified
160
 DEFINE_MENU_EDIT_ITEM(int3);        // 123, -12   right-justified
160
 DEFINE_MENU_EDIT_ITEM(int4);        // 1234, -123 right-justified
161
 DEFINE_MENU_EDIT_ITEM(int4);        // 1234, -123 right-justified
161
 DEFINE_MENU_EDIT_ITEM(int8);        // 123, -12   right-justified
162
 DEFINE_MENU_EDIT_ITEM(int8);        // 123, -12   right-justified
162
 DEFINE_MENU_EDIT_ITEM(uint8);       // 123        right-justified
163
 DEFINE_MENU_EDIT_ITEM(uint8);       // 123        right-justified
163
-DEFINE_MENU_EDIT_ITEM(uint16_3);    // 123, -12   right-justified
164
+DEFINE_MENU_EDIT_ITEM(uint16_3);    // 123        right-justified
164
 DEFINE_MENU_EDIT_ITEM(uint16_4);    // 1234       right-justified
165
 DEFINE_MENU_EDIT_ITEM(uint16_4);    // 1234       right-justified
165
 DEFINE_MENU_EDIT_ITEM(uint16_5);    // 12345      right-justified
166
 DEFINE_MENU_EDIT_ITEM(uint16_5);    // 12345      right-justified
166
 DEFINE_MENU_EDIT_ITEM(float3);      // 123        right-justified
167
 DEFINE_MENU_EDIT_ITEM(float3);      // 123        right-justified
167
-DEFINE_MENU_EDIT_ITEM(float52);     // 123.45
168
+DEFINE_MENU_EDIT_ITEM(float52);     // _2.34, 12.34, -2.34 or 123.45, -23.45
168
 DEFINE_MENU_EDIT_ITEM(float43);     // 1.234
169
 DEFINE_MENU_EDIT_ITEM(float43);     // 1.234
169
 DEFINE_MENU_EDIT_ITEM(float5);      // 12345      right-justified
170
 DEFINE_MENU_EDIT_ITEM(float5);      // 12345      right-justified
170
 DEFINE_MENU_EDIT_ITEM(float5_25);   // 12345      right-justified (25 increment)
171
 DEFINE_MENU_EDIT_ITEM(float5_25);   // 12345      right-justified (25 increment)

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

59
 DECLARE_MENU_EDIT_TYPE(float,    float43,     ftostr43sign, 1000     );   // 1.234
59
 DECLARE_MENU_EDIT_TYPE(float,    float43,     ftostr43sign, 1000     );   // 1.234
60
 DECLARE_MENU_EDIT_TYPE(float,    float5,      ftostr5rj,       0.01f );   // 12345      right-justified
60
 DECLARE_MENU_EDIT_TYPE(float,    float5,      ftostr5rj,       0.01f );   // 12345      right-justified
61
 DECLARE_MENU_EDIT_TYPE(float,    float5_25,   ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
61
 DECLARE_MENU_EDIT_TYPE(float,    float5_25,   ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
62
-DECLARE_MENU_EDIT_TYPE(float,    float51,     ftostr51rj,     10     );   // _1234.5    right-justified
62
+DECLARE_MENU_EDIT_TYPE(float,    float51,     ftostr51rj,     10     );   // 1234.5     right-justified
63
 DECLARE_MENU_EDIT_TYPE(float,    float51sign, ftostr51sign,   10     );   // +1234.5
63
 DECLARE_MENU_EDIT_TYPE(float,    float51sign, ftostr51sign,   10     );   // +1234.5
64
 DECLARE_MENU_EDIT_TYPE(float,    float52sign, ftostr52sign,  100     );   // +123.45
64
 DECLARE_MENU_EDIT_TYPE(float,    float52sign, ftostr52sign,  100     );   // +123.45
65
 DECLARE_MENU_EDIT_TYPE(uint32_t, long5,       ftostr5rj,       0.01f );   // 12345      right-justified
65
 DECLARE_MENU_EDIT_TYPE(uint32_t, long5,       ftostr5rj,       0.01f );   // 12345      right-justified

+ 3
- 1
Marlin/src/lcd/menu/menu_configuration.cpp View File

50
 #define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST)
50
 #define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST)
51
 
51
 
52
 void menu_advanced_settings();
52
 void menu_advanced_settings();
53
-void menu_delta_calibrate();
53
+#if EITHER(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION)
54
+  void menu_delta_calibrate();
55
+#endif
54
 
56
 
55
 static void lcd_factory_settings() {
57
 static void lcd_factory_settings() {
56
   settings.reset();
58
   settings.reset();

+ 5
- 2
Marlin/src/lcd/menu/menu_motion.cpp View File

414
   END_MENU();
414
   END_MENU();
415
 }
415
 }
416
 
416
 
417
-void _lcd_ubl_level_bed();
418
-void menu_bed_leveling();
417
+#if ENABLED(AUTO_BED_LEVELING_UBL)
418
+  void _lcd_ubl_level_bed();
419
+#elif ENABLED(LCD_BED_LEVELING)
420
+  void menu_bed_leveling();
421
+#endif
419
 
422
 
420
 void menu_motion() {
423
 void menu_motion() {
421
   START_MENU();
424
   START_MENU();

+ 1
- 1
Marlin/src/lcd/ultralcd.cpp View File

1467
     #endif
1467
     #endif
1468
     print_job_timer.stop();
1468
     print_job_timer.stop();
1469
     set_status_P(PSTR(MSG_PRINT_ABORTED));
1469
     set_status_P(PSTR(MSG_PRINT_ABORTED));
1470
-    #if HAS_SPI_LCD
1470
+    #if HAS_LCD_MENU
1471
       return_to_status();
1471
       return_to_status();
1472
     #endif
1472
     #endif
1473
   }
1473
   }

Loading…
Cancel
Save