Browse Source

Merge pull request #8046 from thinkyhead/bf2_fix_micromake_endstops

[2.0.x] Add Makeboard MINI pins to fix Micromake C1
Scott Lahteine 6 years ago
parent
commit
adf168e68f

+ 1
- 1
Marlin/src/config/examples/BQ/Hephestos/Configuration.h View File

@@ -1189,7 +1189,7 @@
1189 1189
  *
1190 1190
  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'cz_utf8':'Czech (UTF8)', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'fr_utf8':'French (UTF8)', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'sk_utf8':'Slovak (UTF8)', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Taiwan)', test':'TEST' }
1191 1191
  */
1192
-//#define LCD_LANGUAGE en
1192
+#define LCD_LANGUAGE en
1193 1193
 
1194 1194
 /**
1195 1195
  * LCD Character Set

+ 1
- 1
Marlin/src/config/examples/BQ/WITBOX/Configuration.h View File

@@ -1189,7 +1189,7 @@
1189 1189
  *
1190 1190
  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'cz_utf8':'Czech (UTF8)', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'fr_utf8':'French (UTF8)', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'sk_utf8':'Slovak (UTF8)', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Taiwan)', test':'TEST' }
1191 1191
  */
1192
-//#define LCD_LANGUAGE en
1192
+#define LCD_LANGUAGE en
1193 1193
 
1194 1194
 /**
1195 1195
  * LCD Character Set

+ 1
- 1
Marlin/src/config/examples/Felix/Configuration.h View File

@@ -1180,7 +1180,7 @@
1180 1180
  *
1181 1181
  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'cz_utf8':'Czech (UTF8)', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'fr_utf8':'French (UTF8)', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'sk_utf8':'Slovak (UTF8)', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Taiwan)', test':'TEST' }
1182 1182
  */
1183
-//#define LCD_LANGUAGE en
1183
+#define LCD_LANGUAGE en
1184 1184
 
1185 1185
 /**
1186 1186
  * LCD Character Set

+ 1
- 1
Marlin/src/config/examples/Felix/DUAL/Configuration.h View File

@@ -1180,7 +1180,7 @@
1180 1180
  *
1181 1181
  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'cz_utf8':'Czech (UTF8)', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'fr_utf8':'French (UTF8)', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'sk_utf8':'Slovak (UTF8)', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Taiwan)', test':'TEST' }
1182 1182
  */
1183
-//#define LCD_LANGUAGE en
1183
+#define LCD_LANGUAGE en
1184 1184
 
1185 1185
 /**
1186 1186
  * LCD Character Set

+ 30
- 25
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h View File

@@ -119,7 +119,7 @@
119 119
 // The following define selects which electronics board you have.
120 120
 // Please choose the name from boards.h that matches your setup
121 121
 #ifndef MOTHERBOARD
122
-  #define MOTHERBOARD BOARD_RAMPS_14_EFB
122
+  #define MOTHERBOARD BOARD_MAKEBOARD_MINI
123 123
 #endif
124 124
 
125 125
 // Optional custom name for your RepStrap or other custom machine
@@ -498,7 +498,7 @@
498 498
 
499 499
 // Enable this feature if all enabled endstop pins are interrupt-capable.
500 500
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.
501
-#define ENDSTOP_INTERRUPTS_FEATURE
501
+//#define ENDSTOP_INTERRUPTS_FEATURE
502 502
 
503 503
 //=============================================================================
504 504
 //============================== Movement Settings ============================
@@ -525,14 +525,18 @@
525 525
  * Override with M92
526 526
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
527 527
  */
528
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 100, 100, 100, 150 }  // MicroMake 128 Steps
528
+// choose your micro step per step configuration ( 16 factory settings )
529
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 100, 100, 100, 150 }       // 16  steps per unit for Micromake C1 - Factory Settings - ( MS1 : closed ; MS2 : closed on MAKEBOARD Mini)
530
+//#define DEFAULT_AXIS_STEPS_PER_UNIT   { 200, 200, 200, 300 }       // 32  steps per unit for Micromake C1 - Custom  Settings - ( MS1 : closed ; MS2 : open   on MAKEBOARD Mini)
531
+//#define DEFAULT_AXIS_STEPS_PER_UNIT   { 400, 400, 400, 600 }       // 64  steps per unit for Micromake C1 - Custom  Settings - ( MS1 : open   ; MS2 : closed on MAKEBOARD Mini)
532
+//#define DEFAULT_AXIS_STEPS_PER_UNIT   { 800, 800, 800, 1200 }      // 128 steps per unit for Micromake C1 - Custom  Settings - ( MS1 : open   ; MS2 : open   on MAKEBOARD Mini)
529 533
 
530 534
 /**
531 535
  * Default Max Feed Rate (mm/s)
532 536
  * Override with M203
533 537
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
534 538
  */
535
-#define DEFAULT_MAX_FEEDRATE          { 200, 200, 200, 30 } // MicroMake 128 Steps
539
+#define DEFAULT_MAX_FEEDRATE          { 200, 200, 200, 30 }
536 540
 
537 541
 /**
538 542
  * Default Max Acceleration (change/s) change = mm/s
@@ -540,7 +544,7 @@
540 544
  * Override with M201
541 545
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
542 546
  */
543
-#define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 3000, 4000 } // MicroMake 128 Steps
547
+ #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 3000, 4000 }
544 548
 
545 549
 /**
546 550
  * Default Acceleration (change/s) change = mm/s
@@ -550,9 +554,9 @@
550 554
  *   M204 R    Retract Acceleration
551 555
  *   M204 T    Travel Acceleration
552 556
  */
553
-#define DEFAULT_ACCELERATION          1000    // X, Y, Z and E acceleration for printing moves
554
-#define DEFAULT_RETRACT_ACCELERATION  1000    // E acceleration for retracts
555
-#define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
557
+#define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration for printing moves
558
+#define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
559
+#define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
556 560
 
557 561
 /**
558 562
  * Default Jerk (mm/s)
@@ -562,10 +566,10 @@
562 566
  * When changing speed and direction, if the difference is less than the
563 567
  * value set here, it may happen instantaneously.
564 568
  */
565
-#define DEFAULT_XJERK                 20.0    // (mm/sec)
566
-#define DEFAULT_YJERK                 20.0    // (mm/sec)
567
-#define DEFAULT_ZJERK                 20.0    // (mm/sec)
568
-#define DEFAULT_EJERK                 5.0     // (mm/sec)
569
+#define DEFAULT_XJERK                 20.0
570
+#define DEFAULT_YJERK                 20.0
571
+#define DEFAULT_ZJERK                 20.0
572
+#define DEFAULT_EJERK                  5.0
569 573
 
570 574
 //===========================================================================
571 575
 //============================= Z Probe Options =============================
@@ -774,15 +778,16 @@
774 778
 // @section machine
775 779
 
776 780
 // The size of the print bed
777
-#define X_BED_SIZE 245
778
-#define Y_BED_SIZE 245
781
+#define X_BED_SIZE 240
782
+#define Y_BED_SIZE 240
779 783
 
784
+// Travel limits (mm) after homing, corresponding to endstop positions.
780 785
 #define X_MIN_POS 0
781 786
 #define Y_MIN_POS 0
782 787
 #define Z_MIN_POS 0
783 788
 #define X_MAX_POS X_BED_SIZE
784 789
 #define Y_MAX_POS Y_BED_SIZE
785
-#define Z_MAX_POS 263
790
+#define Z_MAX_POS 260
786 791
 
787 792
 /**
788 793
  * Software Endstops
@@ -890,9 +895,9 @@
890 895
 
891 896
   // Set the boundaries for probing (where the probe can reach).
892 897
   #define LEFT_PROBE_BED_POSITION 15
893
-  #define RIGHT_PROBE_BED_POSITION 140
898
+  #define RIGHT_PROBE_BED_POSITION 170
894 899
   #define FRONT_PROBE_BED_POSITION 20
895
-  #define BACK_PROBE_BED_POSITION 200
900
+  #define BACK_PROBE_BED_POSITION 170
896 901
 
897 902
   // The Z probe minimum outer margin (to validate G29 parameters).
898 903
   #define MIN_PROBE_EDGE 10
@@ -923,10 +928,10 @@
923 928
   // 3 arbitrary points to probe.
924 929
   // A simple cross-product is used to estimate the plane of the bed.
925 930
   #define ABL_PROBE_PT_1_X 15
926
-  #define ABL_PROBE_PT_1_Y 140
931
+  #define ABL_PROBE_PT_1_Y 180
927 932
   #define ABL_PROBE_PT_2_X 15
928 933
   #define ABL_PROBE_PT_2_Y 20
929
-  #define ABL_PROBE_PT_3_X 200
934
+  #define ABL_PROBE_PT_3_X 170
930 935
   #define ABL_PROBE_PT_3_Y 20
931 936
 
932 937
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
@@ -1051,12 +1056,12 @@
1051 1056
 //
1052 1057
 // G20/G21 Inch mode support
1053 1058
 //
1054
-//#define INCH_MODE_SUPPORT
1059
+#define INCH_MODE_SUPPORT
1055 1060
 
1056 1061
 //
1057 1062
 // M149 Set temperature units support
1058 1063
 //
1059
-//#define TEMPERATURE_UNITS_SUPPORT
1064
+#define TEMPERATURE_UNITS_SUPPORT
1060 1065
 
1061 1066
 // @section temperature
1062 1067
 
@@ -1080,7 +1085,7 @@
1080 1085
  *    P1  Raise the nozzle always to Z-park height.
1081 1086
  *    P2  Raise the nozzle by Z-park amount, limited to Z_MAX_POS.
1082 1087
  */
1083
-//#define NOZZLE_PARK_FEATURE
1088
+#define NOZZLE_PARK_FEATURE
1084 1089
 
1085 1090
 #if ENABLED(NOZZLE_PARK_FEATURE)
1086 1091
   // Specify a park position as { X, Y, Z }
@@ -1125,7 +1130,7 @@
1125 1130
  * Attention: EXPERIMENTAL. G-code arguments may change.
1126 1131
  *
1127 1132
  */
1128
-//#define NOZZLE_CLEAN_FEATURE
1133
+#define NOZZLE_CLEAN_FEATURE
1129 1134
 
1130 1135
 #if ENABLED(NOZZLE_CLEAN_FEATURE)
1131 1136
   // Default number of pattern repetitions
@@ -1178,7 +1183,7 @@
1178 1183
  *
1179 1184
  * View the current statistics with M78.
1180 1185
  */
1181
-//#define PRINTCOUNTER
1186
+#define PRINTCOUNTER
1182 1187
 
1183 1188
 //=============================================================================
1184 1189
 //============================= LCD and SD support ============================
@@ -1260,7 +1265,7 @@
1260 1265
  *
1261 1266
  * Use CRC checks and retries on the SD communication.
1262 1267
  */
1263
-//#define SD_CHECK_AND_RETRY
1268
+#define SD_CHECK_AND_RETRY
1264 1269
 
1265 1270
 //
1266 1271
 // ENCODER SETTINGS

+ 42
- 37
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h View File

@@ -119,7 +119,7 @@
119 119
 // The following define selects which electronics board you have.
120 120
 // Please choose the name from boards.h that matches your setup
121 121
 #ifndef MOTHERBOARD
122
-  #define MOTHERBOARD BOARD_RAMPS_14_EFB
122
+  #define MOTHERBOARD BOARD_MAKEBOARD_MINI
123 123
 #endif
124 124
 
125 125
 // Optional custom name for your RepStrap or other custom machine
@@ -474,17 +474,17 @@
474 474
 //#define USE_ZMAX_PLUG
475 475
 
476 476
 // coarse Endstop Settings
477
-//#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
477
+#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
478 478
 
479 479
 #if DISABLED(ENDSTOPPULLUPS)
480 480
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
481 481
   //#define ENDSTOPPULLUP_XMAX
482 482
   //#define ENDSTOPPULLUP_YMAX
483 483
   //#define ENDSTOPPULLUP_ZMAX
484
-  #define ENDSTOPPULLUP_XMIN
485
-  #define ENDSTOPPULLUP_YMIN
486
-  #define ENDSTOPPULLUP_ZMIN
487
-  #define ENDSTOPPULLUP_ZMIN_PROBE
484
+  //#define ENDSTOPPULLUP_XMIN
485
+  //#define ENDSTOPPULLUP_YMIN
486
+  //#define ENDSTOPPULLUP_ZMIN
487
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
488 488
 #endif
489 489
 
490 490
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
@@ -498,7 +498,7 @@
498 498
 
499 499
 // Enable this feature if all enabled endstop pins are interrupt-capable.
500 500
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.
501
-#define ENDSTOP_INTERRUPTS_FEATURE
501
+//#define ENDSTOP_INTERRUPTS_FEATURE
502 502
 
503 503
 //=============================================================================
504 504
 //============================== Movement Settings ============================
@@ -525,14 +525,18 @@
525 525
  * Override with M92
526 526
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
527 527
  */
528
-#define DEFAULT_AXIS_STEPS_PER_UNIT   {800,800,800,1200}  // MicroMake 128 Steps
528
+// choose your micro step per step configuration ( 16 factory settings )
529
+//#define DEFAULT_AXIS_STEPS_PER_UNIT   { 100, 100, 100, 150 }       // 16  steps per unit for Micromake C1 - Factory Settings - ( MS1 : closed ; MS2 : closed on MAKEBOARD Mini)
530
+//#define DEFAULT_AXIS_STEPS_PER_UNIT   { 200, 200, 200, 300 }       // 32  steps per unit for Micromake C1 - Custom  Settings - ( MS1 : closed ; MS2 : open   on MAKEBOARD Mini)
531
+//#define DEFAULT_AXIS_STEPS_PER_UNIT   { 400, 400, 400, 600 }       // 64  steps per unit for Micromake C1 - Custom  Settings - ( MS1 : open   ; MS2 : closed on MAKEBOARD Mini)
532
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 800, 800, 800, 1200 }      // 128 steps per unit for Micromake C1 - Custom  Settings - ( MS1 : open   ; MS2 : open   on MAKEBOARD Mini)
529 533
 
530 534
 /**
531 535
  * Default Max Feed Rate (mm/s)
532 536
  * Override with M203
533 537
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
534 538
  */
535
-#define DEFAULT_MAX_FEEDRATE          {200, 200, 200, 30} // MicroMake 128 Steps
539
+ #define DEFAULT_MAX_FEEDRATE          { 200, 200, 200, 30 }
536 540
 
537 541
 /**
538 542
  * Default Max Acceleration (change/s) change = mm/s
@@ -540,7 +544,7 @@
540 544
  * Override with M201
541 545
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
542 546
  */
543
-#define DEFAULT_MAX_ACCELERATION      {3000,3000,3000,4000} // MicroMake 128 Steps
547
+ #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 3000, 4000 }
544 548
 
545 549
 /**
546 550
  * Default Acceleration (change/s) change = mm/s
@@ -550,9 +554,9 @@
550 554
  *   M204 R    Retract Acceleration
551 555
  *   M204 T    Travel Acceleration
552 556
  */
553
-#define DEFAULT_ACCELERATION          1000    // X, Y, Z and E acceleration for printing moves
554
-#define DEFAULT_RETRACT_ACCELERATION  1000    // E acceleration for retracts
555
-#define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
557
+#define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration for printing moves
558
+#define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
559
+#define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
556 560
 
557 561
 /**
558 562
  * Default Jerk (mm/s)
@@ -562,10 +566,10 @@
562 566
  * When changing speed and direction, if the difference is less than the
563 567
  * value set here, it may happen instantaneously.
564 568
  */
565
-#define DEFAULT_XJERK                 20.0    // (mm/sec)
566
-#define DEFAULT_YJERK                 20.0    // (mm/sec)
567
-#define DEFAULT_ZJERK                 20.0    // (mm/sec)
568
-#define DEFAULT_EJERK                 5.0     // (mm/sec)
569
+#define DEFAULT_XJERK                 20.0
570
+#define DEFAULT_YJERK                 20.0
571
+#define DEFAULT_ZJERK                  0.4
572
+#define DEFAULT_EJERK                  5.0
569 573
 
570 574
 //===========================================================================
571 575
 //============================= Z Probe Options =============================
@@ -679,8 +683,8 @@
679 683
  *      O-- FRONT --+
680 684
  *    (0,0)
681 685
  */
682
-#define X_PROBE_OFFSET_FROM_EXTRUDER -50  // X offset: -left  +right  [of the nozzle]
683
-#define Y_PROBE_OFFSET_FROM_EXTRUDER -20  // Y offset: -front +behind [the nozzle]
686
+#define X_PROBE_OFFSET_FROM_EXTRUDER 0  // X offset: -left  +right  [of the nozzle]
687
+#define Y_PROBE_OFFSET_FROM_EXTRUDER 0  // Y offset: -front +behind [the nozzle]
684 688
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
685 689
 
686 690
 // X and Y axis travel speed (mm/m) between probes
@@ -693,7 +697,7 @@
693 697
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
694 698
 
695 699
 // Use double touch for probing
696
-//#define PROBE_DOUBLE_TOUCH
700
+#define PROBE_DOUBLE_TOUCH
697 701
 
698 702
 /**
699 703
  * Z probes require clearance when deploying, stowing, and moving between
@@ -774,15 +778,16 @@
774 778
 // @section machine
775 779
 
776 780
 // The size of the print bed
777
-#define X_BED_SIZE 245
778
-#define Y_BED_SIZE 245
781
+#define X_BED_SIZE 240
782
+#define Y_BED_SIZE 240
779 783
 
784
+// Travel limits (mm) after homing, corresponding to endstop positions.
780 785
 #define X_MIN_POS 0
781 786
 #define Y_MIN_POS 0
782 787
 #define Z_MIN_POS 0
783 788
 #define X_MAX_POS X_BED_SIZE
784 789
 #define Y_MAX_POS Y_BED_SIZE
785
-#define Z_MAX_POS 263
790
+#define Z_MAX_POS 260
786 791
 
787 792
 /**
788 793
  * Software Endstops
@@ -890,9 +895,9 @@
890 895
 
891 896
   // Set the boundaries for probing (where the probe can reach).
892 897
   #define LEFT_PROBE_BED_POSITION 15
893
-  #define RIGHT_PROBE_BED_POSITION 140
898
+  #define RIGHT_PROBE_BED_POSITION 170
894 899
   #define FRONT_PROBE_BED_POSITION 20
895
-  #define BACK_PROBE_BED_POSITION 200
900
+  #define BACK_PROBE_BED_POSITION 170
896 901
 
897 902
   // The Z probe minimum outer margin (to validate G29 parameters).
898 903
   #define MIN_PROBE_EDGE 10
@@ -923,10 +928,10 @@
923 928
   // 3 arbitrary points to probe.
924 929
   // A simple cross-product is used to estimate the plane of the bed.
925 930
   #define ABL_PROBE_PT_1_X 15
926
-  #define ABL_PROBE_PT_1_Y 140
931
+  #define ABL_PROBE_PT_1_Y 180
927 932
   #define ABL_PROBE_PT_2_X 15
928 933
   #define ABL_PROBE_PT_2_Y 20
929
-  #define ABL_PROBE_PT_3_X 200
934
+  #define ABL_PROBE_PT_3_X 170
930 935
   #define ABL_PROBE_PT_3_Y 20
931 936
 
932 937
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
@@ -1029,7 +1034,7 @@
1029 1034
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
1030 1035
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
1031 1036
 //
1032
-//#define EEPROM_SETTINGS // Enable for M500 and M501 commands
1037
+#define EEPROM_SETTINGS // Enable for M500 and M501 commands
1033 1038
 //#define DISABLE_M503    // Saves ~2700 bytes of PROGMEM. Disable for release!
1034 1039
 #define EEPROM_CHITCHAT   // Give feedback on EEPROM commands. Disable to save PROGMEM.
1035 1040
 
@@ -1051,12 +1056,12 @@
1051 1056
 //
1052 1057
 // G20/G21 Inch mode support
1053 1058
 //
1054
-//#define INCH_MODE_SUPPORT
1059
+#define INCH_MODE_SUPPORT
1055 1060
 
1056 1061
 //
1057 1062
 // M149 Set temperature units support
1058 1063
 //
1059
-//#define TEMPERATURE_UNITS_SUPPORT
1064
+#define TEMPERATURE_UNITS_SUPPORT
1060 1065
 
1061 1066
 // @section temperature
1062 1067
 
@@ -1080,7 +1085,7 @@
1080 1085
  *    P1  Raise the nozzle always to Z-park height.
1081 1086
  *    P2  Raise the nozzle by Z-park amount, limited to Z_MAX_POS.
1082 1087
  */
1083
-//#define NOZZLE_PARK_FEATURE
1088
+#define NOZZLE_PARK_FEATURE
1084 1089
 
1085 1090
 #if ENABLED(NOZZLE_PARK_FEATURE)
1086 1091
   // Specify a park position as { X, Y, Z }
@@ -1125,7 +1130,7 @@
1125 1130
  * Attention: EXPERIMENTAL. G-code arguments may change.
1126 1131
  *
1127 1132
  */
1128
-//#define NOZZLE_CLEAN_FEATURE
1133
+#define NOZZLE_CLEAN_FEATURE
1129 1134
 
1130 1135
 #if ENABLED(NOZZLE_CLEAN_FEATURE)
1131 1136
   // Default number of pattern repetitions
@@ -1178,7 +1183,7 @@
1178 1183
  *
1179 1184
  * View the current statistics with M78.
1180 1185
  */
1181
-//#define PRINTCOUNTER
1186
+#define PRINTCOUNTER
1182 1187
 
1183 1188
 //=============================================================================
1184 1189
 //============================= LCD and SD support ============================
@@ -1260,7 +1265,7 @@
1260 1265
  *
1261 1266
  * Use CRC checks and retries on the SD communication.
1262 1267
  */
1263
-//#define SD_CHECK_AND_RETRY
1268
+#define SD_CHECK_AND_RETRY
1264 1269
 
1265 1270
 //
1266 1271
 // ENCODER SETTINGS
@@ -1314,7 +1319,7 @@
1314 1319
 // If you have a speaker that can produce tones, enable it here.
1315 1320
 // By default Marlin assumes you have a buzzer with a fixed frequency.
1316 1321
 //
1317
-//#define SPEAKER
1322
+#define SPEAKER
1318 1323
 
1319 1324
 //
1320 1325
 // The duration and frequency for the UI feedback sound.
@@ -1323,8 +1328,8 @@
1323 1328
 // Note: Test audio output with the G-Code:
1324 1329
 //  M300 S<frequency Hz> P<duration ms>
1325 1330
 //
1326
-//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100
1327
-//#define LCD_FEEDBACK_FREQUENCY_HZ 1000
1331
+#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100
1332
+#define LCD_FEEDBACK_FREQUENCY_HZ 1000
1328 1333
 
1329 1334
 //
1330 1335
 // CONTROLLER TYPE: Standard

+ 1445
- 0
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
File diff suppressed because it is too large
View File


+ 1
- 1
Marlin/src/config/examples/SCARA/Configuration.h View File

@@ -1210,7 +1210,7 @@
1210 1210
  *
1211 1211
  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'cz_utf8':'Czech (UTF8)', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'fr_utf8':'French (UTF8)', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'sk_utf8':'Slovak (UTF8)', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Taiwan)', test':'TEST' }
1212 1212
  */
1213
-//#define LCD_LANGUAGE en
1213
+#define LCD_LANGUAGE en
1214 1214
 
1215 1215
 /**
1216 1216
  * LCD Character Set

+ 1
- 1
Marlin/src/config/examples/makibox/Configuration.h View File

@@ -1201,7 +1201,7 @@
1201 1201
  *
1202 1202
  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'cz_utf8':'Czech (UTF8)', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'fr_utf8':'French (UTF8)', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'sk_utf8':'Slovak (UTF8)', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Taiwan)', test':'TEST' }
1203 1203
  */
1204
-//#define LCD_LANGUAGE en
1204
+#define LCD_LANGUAGE en
1205 1205
 
1206 1206
 /**
1207 1207
  * LCD Character Set

+ 1
- 1
Marlin/src/config/examples/tvrrug/Round2/Configuration.h View File

@@ -1193,7 +1193,7 @@
1193 1193
  *
1194 1194
  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'cz_utf8':'Czech (UTF8)', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'fr_utf8':'French (UTF8)', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'sk_utf8':'Slovak (UTF8)', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Taiwan)', test':'TEST' }
1195 1195
  */
1196
-//#define LCD_LANGUAGE en
1196
+#define LCD_LANGUAGE en
1197 1197
 
1198 1198
 /**
1199 1199
  * LCD Character Set

+ 1
- 0
Marlin/src/core/boards.h View File

@@ -101,6 +101,7 @@
101 101
 #define BOARD_BAM_DICE_DUE      402  // 2PrintBeta BAM&DICE Due with STK drivers
102 102
 #define BOARD_BQ_ZUM_MEGA_3D    503  // bq ZUM Mega 3D
103 103
 #define BOARD_ZRIB_V20          504  // zrib V2.0 control board (Chinese knock off RAMPS replica)
104
+#define BOARD_MAKEBOARD_MINI    431  // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
104 105
 //ARM 32
105 106
 #define BOARD_DUE3DOM          1411  // DUE3DOM for Arduino DUE
106 107
 #define BOARD_DUE3DOM_MINI     1412  // DUE3DOM MINI for Arduino DUE

+ 2
- 0
Marlin/src/pins/pins.h View File

@@ -118,6 +118,8 @@
118 118
   #include "pins_RUMBA.h"             // ATmega2560
119 119
 #elif MB(BQ_ZUM_MEGA_3D)
120 120
   #include "pins_BQ_ZUM_MEGA_3D.h"    // ATmega2560
121
+#elif MB(MAKEBOARD_MINI)
122
+  #include "pins_MAKEBOARD_MINI.h"    // ATmega2560
121 123
 
122 124
 //
123 125
 // Other ATmega1280, ATmega2560

Loading…
Cancel
Save