thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Activate warning about possible reduced accuracy by default 

Renamed `WARN_REDUCED_ACCURACY` to `DISABLE_REDUCED_ACCURACY_WARNING`

Changed the condition for blinking from
```
#if ENABLED(WARN_REDUCED_ACCURACY)
```
to
```
#if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
```
AnHardt 9 years ago
parent
1c889cd303
commit
615bec2329
19 changed files with 26 additions and 26 deletions
Unified View Show Diff Stats
  1. 1
    1
      Marlin/Configuration.h
  2. 3
    3
      Marlin/dogm_lcd_implementation.h
  3. 1
    1
      Marlin/example_configurations/Felix/Configuration.h
  4. 1
    1
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  5. 1
    1
      Marlin/example_configurations/Hephestos/Configuration.h
  6. 1
    1
      Marlin/example_configurations/K8200/Configuration.h
  7. 1
    1
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  8. 1
    1
      Marlin/example_configurations/RigidBot/Configuration.h
  9. 1
    1
      Marlin/example_configurations/SCARA/Configuration.h
  10. 1
    1
      Marlin/example_configurations/TAZ4/Configuration.h
  11. 1
    1
      Marlin/example_configurations/WITBOX/Configuration.h
  12. 1
    1
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  13. 1
    1
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  14. 1
    1
      Marlin/example_configurations/delta/generic/Configuration.h
  15. 1
    1
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  16. 1
    1
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  17. 1
    1
      Marlin/example_configurations/makibox/Configuration.h
  18. 1
    1
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  19. 6
    6
      Marlin/ultralcd_implementation_hitachi_HD44780.h

+ 1
- 1
Marlin/Configuration.h View File

355 
 #define DISABLE_Y false
 355 
 #define DISABLE_Y false
356 
 #define DISABLE_Z false
 356 
 #define DISABLE_Z false
357 
 // Warn on display about possibly reduced accuracy
 357 
 // Warn on display about possibly reduced accuracy
358 
-//#define WARN_REDUCED_ACCURACY
358 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
359
359
360 
 // @section extruder
 360 
 // @section extruder
361
361

+ 3
- 3
Marlin/dogm_lcd_implementation.h View File

357 
     if (!axis_homed[X_AXIS])
 357 
     if (!axis_homed[X_AXIS])
358 
       lcd_printPGM(PSTR("?"));
 358 
       lcd_printPGM(PSTR("?"));
359 
     else
 359 
     else
360 
-      #if ENABLED(WARN_REDUCED_ACCURACY)
360 
+      #if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
361 
         if (!axis_known_position[X_AXIS])
 361 
         if (!axis_known_position[X_AXIS])
362 
           lcd_printPGM(PSTR(" "));
 362 
           lcd_printPGM(PSTR(" "));
363 
         else
 363 
         else
376 
     if (!axis_homed[Y_AXIS])
 376 
     if (!axis_homed[Y_AXIS])
377 
       lcd_printPGM(PSTR("?"));
 377 
       lcd_printPGM(PSTR("?"));
378 
     else
 378 
     else
379 
-      #if ENABLED(WARN_REDUCED_ACCURACY)
379 
+      #if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
380 
         if (!axis_known_position[Y_AXIS])
 380 
         if (!axis_known_position[Y_AXIS])
381 
           lcd_printPGM(PSTR(" "));
 381 
           lcd_printPGM(PSTR(" "));
382 
         else
 382 
         else
395 
     if (!axis_homed[Z_AXIS])
 395 
     if (!axis_homed[Z_AXIS])
396 
       lcd_printPGM(PSTR("?"));
 396 
       lcd_printPGM(PSTR("?"));
397 
     else
 397 
     else
398 
-      #if ENABLED(WARN_REDUCED_ACCURACY)
398 
+      #if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
399 
         if (!axis_known_position[Z_AXIS])
 399 
         if (!axis_known_position[Z_AXIS])
400 
           lcd_printPGM(PSTR(" "));
 400 
           lcd_printPGM(PSTR(" "));
401 
         else
 401 
         else

+ 1
- 1
Marlin/example_configurations/Felix/Configuration.h View File

337 
 #define DISABLE_Y false
 337 
 #define DISABLE_Y false
338 
 #define DISABLE_Z false
 338 
 #define DISABLE_Z false
339 
 // Warn on display about possibly reduced accuracy
 339 
 // Warn on display about possibly reduced accuracy
340 
-//#define WARN_REDUCED_ACCURACY
340 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
341
341
342 
 // @section extruder
 342 
 // @section extruder
343
343

+ 1
- 1
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

321 
 #define DISABLE_Y false
 321 
 #define DISABLE_Y false
322 
 #define DISABLE_Z false
 322 
 #define DISABLE_Z false
323 
 // Warn on display about possibly reduced accuracy
 323 
 // Warn on display about possibly reduced accuracy
324 
-//#define WARN_REDUCED_ACCURACY
324 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
325 
 #define DISABLE_E false // For all extruders
 325 
 #define DISABLE_E false // For all extruders
326 
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
 326 
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
327
327

+ 1
- 1
Marlin/example_configurations/Hephestos/Configuration.h View File

347 
 #define DISABLE_Y false
 347 
 #define DISABLE_Y false
348 
 #define DISABLE_Z false
 348 
 #define DISABLE_Z false
349 
 // Warn on display about possibly reduced accuracy
 349 
 // Warn on display about possibly reduced accuracy
350 
-//#define WARN_REDUCED_ACCURACY
350 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
351
351
352 
 // @section extruder
 352 
 // @section extruder
353
353

+ 1
- 1
Marlin/example_configurations/K8200/Configuration.h View File

370 
 #define DISABLE_Y false
 370 
 #define DISABLE_Y false
371 
 #define DISABLE_Z false // not for K8200 -> looses Steps
 371 
 #define DISABLE_Z false // not for K8200 -> looses Steps
372 
 // Warn on display about possibly reduced accuracy
 372 
 // Warn on display about possibly reduced accuracy
373 
-//#define WARN_REDUCED_ACCURACY
373 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
374
374
375 
 // @section extruder
 375 
 // @section extruder
376
376

+ 1
- 1
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

355 
 #define DISABLE_Y false
 355 
 #define DISABLE_Y false
356 
 #define DISABLE_Z false
 356 
 #define DISABLE_Z false
357 
 // Warn on display about possibly reduced accuracy
 357 
 // Warn on display about possibly reduced accuracy
358 
-//#define WARN_REDUCED_ACCURACY
358 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
359
359
360 
 // @section extruder
 360 
 // @section extruder
361
361

+ 1
- 1
Marlin/example_configurations/RigidBot/Configuration.h View File

346 
 #define DISABLE_Y false
 346 
 #define DISABLE_Y false
347 
 #define DISABLE_Z false
 347 
 #define DISABLE_Z false
348 
 // Warn on display about possibly reduced accuracy
 348 
 // Warn on display about possibly reduced accuracy
349 
-//#define WARN_REDUCED_ACCURACY
349 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
350
350
351 
 // @section extruder
 351 
 // @section extruder
352
352

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration.h View File

363 
 #define DISABLE_Y false
 363 
 #define DISABLE_Y false
364 
 #define DISABLE_Z false
 364 
 #define DISABLE_Z false
365 
 // Warn on display about possibly reduced accuracy
 365 
 // Warn on display about possibly reduced accuracy
366 
-//#define WARN_REDUCED_ACCURACY
366 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
367
367
368 
 // @section extruder
 368 
 // @section extruder
369
369

+ 1
- 1
Marlin/example_configurations/TAZ4/Configuration.h View File

375 
 #define DISABLE_Y false
 375 
 #define DISABLE_Y false
376 
 #define DISABLE_Z false
 376 
 #define DISABLE_Z false
377 
 // Warn on display about possibly reduced accuracy
 377 
 // Warn on display about possibly reduced accuracy
378 
-//#define WARN_REDUCED_ACCURACY
378 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
379
379
380 
 // @section extruder
 380 
 // @section extruder
381
381

+ 1
- 1
Marlin/example_configurations/WITBOX/Configuration.h View File

347 
 #define DISABLE_Y false
 347 
 #define DISABLE_Y false
348 
 #define DISABLE_Z true
 348 
 #define DISABLE_Z true
349 
 // Warn on display about possibly reduced accuracy
 349 
 // Warn on display about possibly reduced accuracy
350 
-//#define WARN_REDUCED_ACCURACY
350 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
351
351
352 
 // @section extruder
 352 
 // @section extruder
353
353

+ 1
- 1
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

355 
 #define DISABLE_Y false
 355 
 #define DISABLE_Y false
356 
 #define DISABLE_Z false
 356 
 #define DISABLE_Z false
357 
 // Warn on display about possibly reduced accuracy
 357 
 // Warn on display about possibly reduced accuracy
358 
-//#define WARN_REDUCED_ACCURACY
358 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
359
359
360 
 // @section extruder
 360 
 // @section extruder
361
361

+ 1
- 1
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

390 
 #define DISABLE_Y false
 390 
 #define DISABLE_Y false
391 
 #define DISABLE_Z false
 391 
 #define DISABLE_Z false
392 
 // Warn on display about possibly reduced accuracy
 392 
 // Warn on display about possibly reduced accuracy
393 
-//#define WARN_REDUCED_ACCURACY
393 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
394
394
395 
 // @section extruder
 395 
 // @section extruder
396
396

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration.h View File

390 
 #define DISABLE_Y false
 390 
 #define DISABLE_Y false
391 
 #define DISABLE_Z false
 391 
 #define DISABLE_Z false
392 
 // Warn on display about possibly reduced accuracy
 392 
 // Warn on display about possibly reduced accuracy
393 
-//#define WARN_REDUCED_ACCURACY
393 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
394
394
395 
 // @section extruder
 395 
 // @section extruder
396
396

+ 1
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

390 
 #define DISABLE_Y false
 390 
 #define DISABLE_Y false
391 
 #define DISABLE_Z false
 391 
 #define DISABLE_Z false
392 
 // Warn on display about possibly reduced accuracy
 392 
 // Warn on display about possibly reduced accuracy
393 
-//#define WARN_REDUCED_ACCURACY
393 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
394
394
395 
 // @section extruder
 395 
 // @section extruder
396
396

+ 1
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

377 
 #define DISABLE_Y false
 377 
 #define DISABLE_Y false
378 
 #define DISABLE_Z false
 378 
 #define DISABLE_Z false
379 
 // Warn on display about possibly reduced accuracy
 379 
 // Warn on display about possibly reduced accuracy
380 
-//#define WARN_REDUCED_ACCURACY
380 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
381
381
382 
 // @section extruder
 382 
 // @section extruder
383
383

+ 1
- 1
Marlin/example_configurations/makibox/Configuration.h View File

358 
 #define DISABLE_Y false
 358 
 #define DISABLE_Y false
359 
 #define DISABLE_Z false
 359 
 #define DISABLE_Z false
360 
 // Warn on display about possibly reduced accuracy
 360 
 // Warn on display about possibly reduced accuracy
361 
-//#define WARN_REDUCED_ACCURACY
361 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
362
362
363 
 // @section extruder
 363 
 // @section extruder
364
364

+ 1
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

345 
 #define DISABLE_Y false
 345 
 #define DISABLE_Y false
346 
 #define DISABLE_Z false
 346 
 #define DISABLE_Z false
347 
 // Warn on display about possibly reduced accuracy
 347 
 // Warn on display about possibly reduced accuracy
348 
-//#define WARN_REDUCED_ACCURACY
348 
+//#define DISABLE_REDUCED_ACCURACY_WARNING
349
349
350 
 // @section extruder
 350 
 // @section extruder
351
351

+ 6
- 6
Marlin/ultralcd_implementation_hitachi_HD44780.h View File

624 
         else {
 624 
         else {
625 
           if (!axis_homed[X_AXIS])
 625 
           if (!axis_homed[X_AXIS])
626 
             lcd_printPGM(PSTR("?"));
 626 
             lcd_printPGM(PSTR("?"));
627 
-          else
628 
-            #if ENABLED(WARN_REDUCED_ACCURACY)
627 
+          else
628 
+            #if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
629 
               if (!axis_known_position[X_AXIS])
 629 
               if (!axis_known_position[X_AXIS])
630 
                 lcd_printPGM(PSTR(" "));
 630 
                 lcd_printPGM(PSTR(" "));
631 
               else
 631 
               else
641 
         else {
 641 
         else {
642 
           if (!axis_homed[Y_AXIS])
 642 
           if (!axis_homed[Y_AXIS])
643 
             lcd_printPGM(PSTR("?"));
 643 
             lcd_printPGM(PSTR("?"));
644 
-          else
645 
-            #if ENABLED(WARN_REDUCED_ACCURACY)
644 
+          else
645 
+            #if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
646 
               if (!axis_known_position[Y_AXIS])
 646 
               if (!axis_known_position[Y_AXIS])
647 
                 lcd_printPGM(PSTR(" "));
 647 
                 lcd_printPGM(PSTR(" "));
648 
               else
 648 
               else
661 
     else {
 661 
     else {
662 
       if (!axis_homed[Z_AXIS])
 662 
       if (!axis_homed[Z_AXIS])
663 
         lcd_printPGM(PSTR("?"));
 663 
         lcd_printPGM(PSTR("?"));
664 
-      else
665 
-        #if ENABLED(WARN_REDUCED_ACCURACY)
664 
+      else
665 
+        #if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
666 
           if (!axis_known_position[Z_AXIS])
 666 
           if (!axis_known_position[Z_AXIS])
667 
             lcd_printPGM(PSTR(" "));
 667 
             lcd_printPGM(PSTR(" "));
668 
           else
 668 
           else

Write Preview
Loading…
Cancel
Save