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

Fix custom m-code behavior 

Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
Scott Lahteine 10 years ago
parent
fbf9b21e0c
commit
5261d35737
12 changed files with 60 additions and 36 deletions
Unified View Show Diff Stats
  1. 5
    3
      Marlin/Configuration.h
  2. 5
    3
      Marlin/configurator/config/Configuration.h
  3. 5
    3
      Marlin/example_configurations/Felix/Configuration.h
  4. 5
    3
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  5. 5
    3
      Marlin/example_configurations/Hephestos/Configuration.h
  6. 5
    3
      Marlin/example_configurations/K8200/Configuration.h
  7. 5
    3
      Marlin/example_configurations/SCARA/Configuration.h
  8. 5
    3
      Marlin/example_configurations/WITBOX/Configuration.h
  9. 5
    3
      Marlin/example_configurations/delta/generic/Configuration.h
  10. 5
    3
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  11. 5
    3
      Marlin/example_configurations/makibox/Configuration.h
  12. 5
    3
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 5
- 3
Marlin/Configuration.h View File

533 
 // Custom M code points
 533 
 // Custom M code points
534 
 #define CUSTOM_M_CODES
 534 
 #define CUSTOM_M_CODES
535 
 #ifdef CUSTOM_M_CODES
 535 
 #ifdef CUSTOM_M_CODES
536 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
537 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
538 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
536 
+  #ifdef ENABLE_AUTO_BED_LEVELING
537 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
538 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
539 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
540 
+  #endif
539 
 #endif
 541 
 #endif
540
542
541
543

+ 5
- 3
Marlin/configurator/config/Configuration.h View File

570 
 // Custom M code points
 570 
 // Custom M code points
571 
 #define CUSTOM_M_CODES
 571 
 #define CUSTOM_M_CODES
572 
 #ifdef CUSTOM_M_CODES
 572 
 #ifdef CUSTOM_M_CODES
573 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
574 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
575 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
573 
+  #ifdef ENABLE_AUTO_BED_LEVELING
574 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
575 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
576 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
577 
+  #endif
576 
 #endif
 578 
 #endif
577
579
578 
 // @section extras
 580 
 // @section extras

+ 5
- 3
Marlin/example_configurations/Felix/Configuration.h View File

512 
 // Custom M code points
 512 
 // Custom M code points
513 
 #define CUSTOM_M_CODES
 513 
 #define CUSTOM_M_CODES
514 
 #ifdef CUSTOM_M_CODES
 514 
 #ifdef CUSTOM_M_CODES
515 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
516 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
517 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
515 
+  #ifdef ENABLE_AUTO_BED_LEVELING
516 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
517 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
518 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
519 
+  #endif
518 
 #endif
 520 
 #endif
519
521
520
522

+ 5
- 3
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

512 
 // Custom M code points
 512 
 // Custom M code points
513 
 #define CUSTOM_M_CODES
 513 
 #define CUSTOM_M_CODES
514 
 #ifdef CUSTOM_M_CODES
 514 
 #ifdef CUSTOM_M_CODES
515 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
516 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
517 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
515 
+  #ifdef ENABLE_AUTO_BED_LEVELING
516 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
517 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
518 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
519 
+  #endif
518 
 #endif
 520 
 #endif
519
521
520
522

+ 5
- 3
Marlin/example_configurations/Hephestos/Configuration.h View File

540 
 // Custom M code points
 540 
 // Custom M code points
541 
 #define CUSTOM_M_CODES
 541 
 #define CUSTOM_M_CODES
542 
 #ifdef CUSTOM_M_CODES
 542 
 #ifdef CUSTOM_M_CODES
543 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
544 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
545 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
543 
+  #ifdef ENABLE_AUTO_BED_LEVELING
544 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
545 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
546 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
547 
+  #endif
546 
 #endif
 548 
 #endif
547
549
548
550

+ 5
- 3
Marlin/example_configurations/K8200/Configuration.h View File

544 
 // Custom M code points
 544 
 // Custom M code points
545 
 #define CUSTOM_M_CODES
 545 
 #define CUSTOM_M_CODES
546 
 #ifdef CUSTOM_M_CODES
 546 
 #ifdef CUSTOM_M_CODES
547 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
548 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
549 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
547 
+  #ifdef ENABLE_AUTO_BED_LEVELING
548 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
549 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
550 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
551 
+  #endif
550 
 #endif
 552 
 #endif
551
553
552
554

+ 5
- 3
Marlin/example_configurations/SCARA/Configuration.h View File

570 
 // Custom M code points
 570 
 // Custom M code points
571 
 //#define CUSTOM_M_CODES
 571 
 //#define CUSTOM_M_CODES
572 
 #ifdef CUSTOM_M_CODES
 572 
 #ifdef CUSTOM_M_CODES
573 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
574 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
575 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
573 
+  #ifdef ENABLE_AUTO_BED_LEVELING
574 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
575 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
576 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
577 
+  #endif
576 
 #endif
 578 
 #endif
577
579
578
580

+ 5
- 3
Marlin/example_configurations/WITBOX/Configuration.h View File

537 
 // Custom M code points
 537 
 // Custom M code points
538 
 #define CUSTOM_M_CODES
 538 
 #define CUSTOM_M_CODES
539 
 #ifdef CUSTOM_M_CODES
 539 
 #ifdef CUSTOM_M_CODES
540 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
541 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
542 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
540 
+  #ifdef ENABLE_AUTO_BED_LEVELING
541 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
542 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
543 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
544 
+  #endif
543 
 #endif
 545 
 #endif
544
546
545
547

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

553 
 // Custom M code points
 553 
 // Custom M code points
554 
 #define CUSTOM_M_CODES
 554 
 #define CUSTOM_M_CODES
555 
 #ifdef CUSTOM_M_CODES
 555 
 #ifdef CUSTOM_M_CODES
556 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
557 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
558 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
556 
+  #ifdef ENABLE_AUTO_BED_LEVELING
557 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
558 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
559 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
560 
+  #endif
559 
 #endif
 561 
 #endif
560
562
561
563

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

555 
 // Custom M code points
 555 
 // Custom M code points
556 
 #define CUSTOM_M_CODES
 556 
 #define CUSTOM_M_CODES
557 
 #ifdef CUSTOM_M_CODES
 557 
 #ifdef CUSTOM_M_CODES
558 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
559 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
560 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
558 
+  #ifdef ENABLE_AUTO_BED_LEVELING
559 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
560 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
561 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
562 
+  #endif
561 
 #endif
 563 
 #endif
562
564
563
565

+ 5
- 3
Marlin/example_configurations/makibox/Configuration.h View File

535 
 // Custom M code points
 535 
 // Custom M code points
536 
 #define CUSTOM_M_CODES
 536 
 #define CUSTOM_M_CODES
537 
 #ifdef CUSTOM_M_CODES
 537 
 #ifdef CUSTOM_M_CODES
538 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
539 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
540 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
538 
+  #ifdef ENABLE_AUTO_BED_LEVELING
539 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
540 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
541 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
542 
+  #endif
541 
 #endif
 543 
 #endif
542
544
543
545

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

542 
 // Custom M code points
 542 
 // Custom M code points
543 
 #define CUSTOM_M_CODES
 543 
 #define CUSTOM_M_CODES
544 
 #ifdef CUSTOM_M_CODES
 544 
 #ifdef CUSTOM_M_CODES
545 
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
546 
-  #define Z_PROBE_OFFSET_RANGE_MIN -15
547 
-  #define Z_PROBE_OFFSET_RANGE_MAX -5
545 
+  #ifdef ENABLE_AUTO_BED_LEVELING
546 
+    #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
547 
+    #define Z_PROBE_OFFSET_RANGE_MIN -15
548 
+    #define Z_PROBE_OFFSET_RANGE_MAX -5
549 
+  #endif
548 
 #endif
 550 
 #endif
549
551
550
552

Write Preview
Loading…
Cancel
Save