Преглед изворни кода

Merge pull request #5430 from thinkyhead/rc_optional_dogm_splitup

Move Hollow Frame options to config-adv
Scott Lahteine пре 8 година
родитељ
комит
7ca4f16a5c

+ 18
- 1
Marlin/Configuration_adv.h Прегледај датотеку

@@ -466,8 +466,25 @@
466 466
 
467 467
 #endif // SDSUPPORT
468 468
 
469
-// Some additional options are available for graphical displays:
469
+/**
470
+ * Additional options for Graphical Displays
471
+ * 
472
+ * Use the optimizations here to improve printing performance,
473
+ * which can be adversely affected by graphical display drawing,
474
+ * especially when doing several short moves, and when printing
475
+ * on DELTA and SCARA machines.
476
+ * 
477
+ * Some of these options may result in the display lagging behind
478
+ * controller events, as there is a trade-off between reliable
479
+ * printing performance versus fast display updates.
480
+ */
470 481
 #if ENABLED(DOGLCD)
482
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
483
+  #define XYZ_HOLLOW_FRAME
484
+
485
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
486
+  #define MENU_HOLLOW_FRAME
487
+
471 488
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
472 489
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
473 490
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/Cartesio/Configuration_adv.h Прегледај датотеку

@@ -466,8 +466,25 @@
466 466
 
467 467
 #endif // SDSUPPORT
468 468
 
469
-// Some additional options are available for graphical displays:
469
+/**
470
+ * Additional options for Graphical Displays
471
+ * 
472
+ * Use the optimizations here to improve printing performance,
473
+ * which can be adversely affected by graphical display drawing,
474
+ * especially when doing several short moves, and when printing
475
+ * on DELTA and SCARA machines.
476
+ * 
477
+ * Some of these options may result in the display lagging behind
478
+ * controller events, as there is a trade-off between reliable
479
+ * printing performance versus fast display updates.
480
+ */
470 481
 #if ENABLED(DOGLCD)
482
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
483
+  #define XYZ_HOLLOW_FRAME
484
+
485
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
486
+  #define MENU_HOLLOW_FRAME
487
+
471 488
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
472 489
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
473 490
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/Felix/Configuration_adv.h Прегледај датотеку

@@ -466,8 +466,25 @@
466 466
 
467 467
 #endif // SDSUPPORT
468 468
 
469
-// Some additional options are available for graphical displays:
469
+/**
470
+ * Additional options for Graphical Displays
471
+ * 
472
+ * Use the optimizations here to improve printing performance,
473
+ * which can be adversely affected by graphical display drawing,
474
+ * especially when doing several short moves, and when printing
475
+ * on DELTA and SCARA machines.
476
+ * 
477
+ * Some of these options may result in the display lagging behind
478
+ * controller events, as there is a trade-off between reliable
479
+ * printing performance versus fast display updates.
480
+ */
470 481
 #if ENABLED(DOGLCD)
482
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
483
+  #define XYZ_HOLLOW_FRAME
484
+
485
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
486
+  #define MENU_HOLLOW_FRAME
487
+
471 488
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
472 489
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
473 490
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/Hephestos/Configuration_adv.h Прегледај датотеку

@@ -466,8 +466,25 @@
466 466
 
467 467
 #endif // SDSUPPORT
468 468
 
469
-// Some additional options are available for graphical displays:
469
+/**
470
+ * Additional options for Graphical Displays
471
+ * 
472
+ * Use the optimizations here to improve printing performance,
473
+ * which can be adversely affected by graphical display drawing,
474
+ * especially when doing several short moves, and when printing
475
+ * on DELTA and SCARA machines.
476
+ * 
477
+ * Some of these options may result in the display lagging behind
478
+ * controller events, as there is a trade-off between reliable
479
+ * printing performance versus fast display updates.
480
+ */
470 481
 #if ENABLED(DOGLCD)
482
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
483
+  #define XYZ_HOLLOW_FRAME
484
+
485
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
486
+  #define MENU_HOLLOW_FRAME
487
+
471 488
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
472 489
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
473 490
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/K8200/Configuration_adv.h Прегледај датотеку

@@ -479,8 +479,25 @@
479 479
 
480 480
 #endif // SDSUPPORT
481 481
 
482
-// Some additional options are available for graphical displays:
482
+/**
483
+ * Additional options for Graphical Displays
484
+ * 
485
+ * Use the optimizations here to improve printing performance,
486
+ * which can be adversely affected by graphical display drawing,
487
+ * especially when doing several short moves, and when printing
488
+ * on DELTA and SCARA machines.
489
+ * 
490
+ * Some of these options may result in the display lagging behind
491
+ * controller events, as there is a trade-off between reliable
492
+ * printing performance versus fast display updates.
493
+ */
483 494
 #if ENABLED(DOGLCD)
495
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
496
+  #define XYZ_HOLLOW_FRAME
497
+
498
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
499
+  #define MENU_HOLLOW_FRAME
500
+
484 501
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
485 502
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
486 503
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/K8400/Configuration_adv.h Прегледај датотеку

@@ -466,8 +466,25 @@
466 466
 
467 467
 #endif // SDSUPPORT
468 468
 
469
-// Some additional options are available for graphical displays:
469
+/**
470
+ * Additional options for Graphical Displays
471
+ * 
472
+ * Use the optimizations here to improve printing performance,
473
+ * which can be adversely affected by graphical display drawing,
474
+ * especially when doing several short moves, and when printing
475
+ * on DELTA and SCARA machines.
476
+ * 
477
+ * Some of these options may result in the display lagging behind
478
+ * controller events, as there is a trade-off between reliable
479
+ * printing performance versus fast display updates.
480
+ */
470 481
 #if ENABLED(DOGLCD)
482
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
483
+  #define XYZ_HOLLOW_FRAME
484
+
485
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
486
+  #define MENU_HOLLOW_FRAME
487
+
471 488
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
472 489
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
473 490
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/RigidBot/Configuration_adv.h Прегледај датотеку

@@ -466,8 +466,25 @@
466 466
 
467 467
 #endif // SDSUPPORT
468 468
 
469
-// Some additional options are available for graphical displays:
469
+/**
470
+ * Additional options for Graphical Displays
471
+ * 
472
+ * Use the optimizations here to improve printing performance,
473
+ * which can be adversely affected by graphical display drawing,
474
+ * especially when doing several short moves, and when printing
475
+ * on DELTA and SCARA machines.
476
+ * 
477
+ * Some of these options may result in the display lagging behind
478
+ * controller events, as there is a trade-off between reliable
479
+ * printing performance versus fast display updates.
480
+ */
470 481
 #if ENABLED(DOGLCD)
482
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
483
+  #define XYZ_HOLLOW_FRAME
484
+
485
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
486
+  #define MENU_HOLLOW_FRAME
487
+
471 488
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
472 489
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
473 490
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/SCARA/Configuration_adv.h Прегледај датотеку

@@ -466,8 +466,25 @@
466 466
 
467 467
 #endif // SDSUPPORT
468 468
 
469
-// Some additional options are available for graphical displays:
469
+/**
470
+ * Additional options for Graphical Displays
471
+ * 
472
+ * Use the optimizations here to improve printing performance,
473
+ * which can be adversely affected by graphical display drawing,
474
+ * especially when doing several short moves, and when printing
475
+ * on DELTA and SCARA machines.
476
+ * 
477
+ * Some of these options may result in the display lagging behind
478
+ * controller events, as there is a trade-off between reliable
479
+ * printing performance versus fast display updates.
480
+ */
470 481
 #if ENABLED(DOGLCD)
482
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
483
+  #define XYZ_HOLLOW_FRAME
484
+
485
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
486
+  #define MENU_HOLLOW_FRAME
487
+
471 488
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
472 489
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
473 490
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/TAZ4/Configuration_adv.h Прегледај датотеку

@@ -474,8 +474,25 @@
474 474
 
475 475
 #endif // SDSUPPORT
476 476
 
477
-// Some additional options are available for graphical displays:
477
+/**
478
+ * Additional options for Graphical Displays
479
+ * 
480
+ * Use the optimizations here to improve printing performance,
481
+ * which can be adversely affected by graphical display drawing,
482
+ * especially when doing several short moves, and when printing
483
+ * on DELTA and SCARA machines.
484
+ * 
485
+ * Some of these options may result in the display lagging behind
486
+ * controller events, as there is a trade-off between reliable
487
+ * printing performance versus fast display updates.
488
+ */
478 489
 #if ENABLED(DOGLCD)
490
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
491
+  #define XYZ_HOLLOW_FRAME
492
+
493
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
494
+  #define MENU_HOLLOW_FRAME
495
+
479 496
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
480 497
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
481 498
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/WITBOX/Configuration_adv.h Прегледај датотеку

@@ -466,8 +466,25 @@
466 466
 
467 467
 #endif // SDSUPPORT
468 468
 
469
-// Some additional options are available for graphical displays:
469
+/**
470
+ * Additional options for Graphical Displays
471
+ * 
472
+ * Use the optimizations here to improve printing performance,
473
+ * which can be adversely affected by graphical display drawing,
474
+ * especially when doing several short moves, and when printing
475
+ * on DELTA and SCARA machines.
476
+ * 
477
+ * Some of these options may result in the display lagging behind
478
+ * controller events, as there is a trade-off between reliable
479
+ * printing performance versus fast display updates.
480
+ */
470 481
 #if ENABLED(DOGLCD)
482
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
483
+  #define XYZ_HOLLOW_FRAME
484
+
485
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
486
+  #define MENU_HOLLOW_FRAME
487
+
471 488
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
472 489
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
473 490
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h Прегледај датотеку

@@ -468,8 +468,25 @@
468 468
 
469 469
 #endif // SDSUPPORT
470 470
 
471
-// Some additional options are available for graphical displays:
471
+/**
472
+ * Additional options for Graphical Displays
473
+ * 
474
+ * Use the optimizations here to improve printing performance,
475
+ * which can be adversely affected by graphical display drawing,
476
+ * especially when doing several short moves, and when printing
477
+ * on DELTA and SCARA machines.
478
+ * 
479
+ * Some of these options may result in the display lagging behind
480
+ * controller events, as there is a trade-off between reliable
481
+ * printing performance versus fast display updates.
482
+ */
472 483
 #if ENABLED(DOGLCD)
484
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
485
+  #define XYZ_HOLLOW_FRAME
486
+
487
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
488
+  #define MENU_HOLLOW_FRAME
489
+
473 490
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
474 491
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
475 492
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/delta/generic/Configuration_adv.h Прегледај датотеку

@@ -468,8 +468,25 @@
468 468
 
469 469
 #endif // SDSUPPORT
470 470
 
471
-// Some additional options are available for graphical displays:
471
+/**
472
+ * Additional options for Graphical Displays
473
+ * 
474
+ * Use the optimizations here to improve printing performance,
475
+ * which can be adversely affected by graphical display drawing,
476
+ * especially when doing several short moves, and when printing
477
+ * on DELTA and SCARA machines.
478
+ * 
479
+ * Some of these options may result in the display lagging behind
480
+ * controller events, as there is a trade-off between reliable
481
+ * printing performance versus fast display updates.
482
+ */
472 483
 #if ENABLED(DOGLCD)
484
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
485
+  #define XYZ_HOLLOW_FRAME
486
+
487
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
488
+  #define MENU_HOLLOW_FRAME
489
+
473 490
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
474 491
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
475 492
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h Прегледај датотеку

@@ -468,8 +468,25 @@
468 468
 
469 469
 #endif // SDSUPPORT
470 470
 
471
-// Some additional options are available for graphical displays:
471
+/**
472
+ * Additional options for Graphical Displays
473
+ * 
474
+ * Use the optimizations here to improve printing performance,
475
+ * which can be adversely affected by graphical display drawing,
476
+ * especially when doing several short moves, and when printing
477
+ * on DELTA and SCARA machines.
478
+ * 
479
+ * Some of these options may result in the display lagging behind
480
+ * controller events, as there is a trade-off between reliable
481
+ * printing performance versus fast display updates.
482
+ */
472 483
 #if ENABLED(DOGLCD)
484
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
485
+  #define XYZ_HOLLOW_FRAME
486
+
487
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
488
+  #define MENU_HOLLOW_FRAME
489
+
473 490
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
474 491
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
475 492
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h Прегледај датотеку

@@ -473,8 +473,25 @@
473 473
 
474 474
 #endif // SDSUPPORT
475 475
 
476
-// Some additional options are available for graphical displays:
476
+/**
477
+ * Additional options for Graphical Displays
478
+ * 
479
+ * Use the optimizations here to improve printing performance,
480
+ * which can be adversely affected by graphical display drawing,
481
+ * especially when doing several short moves, and when printing
482
+ * on DELTA and SCARA machines.
483
+ * 
484
+ * Some of these options may result in the display lagging behind
485
+ * controller events, as there is a trade-off between reliable
486
+ * printing performance versus fast display updates.
487
+ */
477 488
 #if ENABLED(DOGLCD)
489
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
490
+  #define XYZ_HOLLOW_FRAME
491
+
492
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
493
+  #define MENU_HOLLOW_FRAME
494
+
478 495
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
479 496
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
480 497
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h Прегледај датотеку

@@ -468,8 +468,25 @@
468 468
 
469 469
 #endif // SDSUPPORT
470 470
 
471
-// Some additional options are available for graphical displays:
471
+/**
472
+ * Additional options for Graphical Displays
473
+ * 
474
+ * Use the optimizations here to improve printing performance,
475
+ * which can be adversely affected by graphical display drawing,
476
+ * especially when doing several short moves, and when printing
477
+ * on DELTA and SCARA machines.
478
+ * 
479
+ * Some of these options may result in the display lagging behind
480
+ * controller events, as there is a trade-off between reliable
481
+ * printing performance versus fast display updates.
482
+ */
472 483
 #if ENABLED(DOGLCD)
484
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
485
+  #define XYZ_HOLLOW_FRAME
486
+
487
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
488
+  #define MENU_HOLLOW_FRAME
489
+
473 490
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
474 491
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
475 492
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/makibox/Configuration_adv.h Прегледај датотеку

@@ -466,8 +466,25 @@
466 466
 
467 467
 #endif // SDSUPPORT
468 468
 
469
-// Some additional options are available for graphical displays:
469
+/**
470
+ * Additional options for Graphical Displays
471
+ * 
472
+ * Use the optimizations here to improve printing performance,
473
+ * which can be adversely affected by graphical display drawing,
474
+ * especially when doing several short moves, and when printing
475
+ * on DELTA and SCARA machines.
476
+ * 
477
+ * Some of these options may result in the display lagging behind
478
+ * controller events, as there is a trade-off between reliable
479
+ * printing performance versus fast display updates.
480
+ */
470 481
 #if ENABLED(DOGLCD)
482
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
483
+  #define XYZ_HOLLOW_FRAME
484
+
485
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
486
+  #define MENU_HOLLOW_FRAME
487
+
471 488
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
472 489
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
473 490
   //#define USE_BIG_EDIT_FONT

+ 18
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h Прегледај датотеку

@@ -466,8 +466,25 @@
466 466
 
467 467
 #endif // SDSUPPORT
468 468
 
469
-// Some additional options are available for graphical displays:
469
+/**
470
+ * Additional options for Graphical Displays
471
+ * 
472
+ * Use the optimizations here to improve printing performance,
473
+ * which can be adversely affected by graphical display drawing,
474
+ * especially when doing several short moves, and when printing
475
+ * on DELTA and SCARA machines.
476
+ * 
477
+ * Some of these options may result in the display lagging behind
478
+ * controller events, as there is a trade-off between reliable
479
+ * printing performance versus fast display updates.
480
+ */
470 481
 #if ENABLED(DOGLCD)
482
+  // Enable to save many cycles by drawing a hollow frame on the Info Screen
483
+  #define XYZ_HOLLOW_FRAME
484
+
485
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
486
+  #define MENU_HOLLOW_FRAME
487
+
471 488
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
472 489
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
473 490
   //#define USE_BIG_EDIT_FONT

+ 0
- 4
Marlin/ultralcd_impl_DOGM.h Прегледај датотеку

@@ -525,10 +525,6 @@ static void lcd_implementation_status_screen() {
525 525
   #define X_VALUE_POS 11
526 526
   #define XYZ_SPACING 40
527 527
 
528
-  // Enable to save many cycles by drawing a hollow frame
529
-  #define XYZ_HOLLOW_FRAME
530
-  #define MENU_HOLLOW_FRAME
531
-
532 528
   #if ENABLED(XYZ_HOLLOW_FRAME)
533 529
     #define XYZ_FRAME_TOP 29
534 530
     #define XYZ_FRAME_HEIGHT INFO_FONT_HEIGHT + 3

Loading…
Откажи
Сачувај