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

Merge pull request #1266 from RobotCaleb/DeltaCalMenu 

Delta manual calibration menu
Bo Herrmannsen 10 years ago
parent
10ad9f1062 cb047e9070
commit
f4ce235589
15 changed files with 132 additions and 0 deletions
Split View Show Diff Stats
  1. 7
    0
      Marlin/Configuration.h
  2. 8
    0
      Marlin/language_an.h
  3. 8
    0
      Marlin/language_ca.h
  4. 8
    0
      Marlin/language_de.h
  5. 8
    0
      Marlin/language_en.h
  6. 8
    0
      Marlin/language_es.h
  7. 8
    0
      Marlin/language_eu.h
  8. 8
    0
      Marlin/language_fi.h
  9. 8
    0
      Marlin/language_fr.h
  10. 8
    0
      Marlin/language_it.h
  11. 8
    0
      Marlin/language_nl.h
  12. 8
    0
      Marlin/language_pl.h
  13. 8
    0
      Marlin/language_pt.h
  14. 8
    0
      Marlin/language_ru.h
  15. 21
    0
      Marlin/ultralcd.cpp

+ 7
- 0
Marlin/Configuration.h View File 

@@ -546,6 +546,13 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
546 546 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
547 547 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
548 548
549 
+// Delta calibration menu
550 
+// uncomment to add three points calibration menu option.
551 
+// See http://minow.blogspot.com/index.html#4918805519571907051
552 
+// If needed, adjust the X, Y, Z calibration coordinates
553 
+// in ultralcd.cpp@lcd_delta_calibrate_menu()
554 
+#define DELTA_CALIBRATION_MENU
555 
+
549 556 
 // The GADGETS3D G3D LCD/SD Controller (blue PCB)
550 557 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
551 558 
 //#define G3D_PANEL

+ 8
- 0
Marlin/language_an.h View File 

@@ -136,4 +136,12 @@
136 136 
 #define MSG_RETRACT_ARROW                   "Retraer \x7E"
137 137 
 #define MSG_STEPPER_RELEASED                "Desacoplada."
138 138
139 
+#ifdef DELTA_CALIBRATION_MENU
140 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
141 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
142 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
143 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
144 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
145 
+#endif // DELTA_CALIBRATION_MENU
146 
+
139 147 
 #endif // LANGUAGE_AN_H

+ 8
- 0
Marlin/language_ca.h View File 

@@ -127,4 +127,12 @@
127 127
128 128 
 #define MSG_RECTRACT                        "Retreure"
129 129
130 
+#ifdef DELTA_CALIBRATION_MENU
131 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
132 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
133 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
134 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
135 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
136 
+#endif // DELTA_CALIBRATION_MENU
137 
+
130 138 
 #endif // LANGUAGE_CA_H

+ 8
- 0
Marlin/language_de.h View File 

@@ -128,4 +128,12 @@
128 128 
 #define MSG_STEPPER_RELEASED                "Stepper frei"
129 129 
 #define MSG_RECTRACT_WIDE                   "Rectract"
130 130
131 
+#ifdef DELTA_CALIBRATION_MENU
132 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
133 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
134 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
135 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
136 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
137 
+#endif // DELTA_CALIBRATION_MENU
138 
+
131 139 
 #endif // LANGUAGE_DE_H

+ 8
- 0
Marlin/language_en.h View File 

@@ -127,4 +127,12 @@
127 127
128 128 
 #define MSG_RECTRACT                        "Rectract"
129 129
130 
+#ifdef DELTA_CALIBRATION_MENU
131 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
132 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
133 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
134 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
135 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
136 
+#endif // DELTA_CALIBRATION_MENU
137 
+
130 138 
 #endif // LANGUAGE_EN_H

+ 8
- 0
Marlin/language_es.h View File 

@@ -136,4 +136,12 @@
136 136 
 #define MSG_RETRACT_ARROW                   "Retraer \x7E"
137 137 
 #define MSG_STEPPER_RELEASED                "Desacoplada."
138 138
139 
+#ifdef DELTA_CALIBRATION_MENU
140 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
141 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
142 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
143 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
144 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
145 
+#endif // DELTA_CALIBRATION_MENU
146 
+
139 147 
 #endif // LANGUAGE_ES_H

+ 8
- 0
Marlin/language_eu.h View File 

@@ -127,4 +127,12 @@
127 127
128 128 
 #define MSG_RECTRACT                        "Atzera eragin"
129 129
130 
+#ifdef DELTA_CALIBRATION_MENU
131 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
132 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
133 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
134 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
135 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
136 
+#endif // DELTA_CALIBRATION_MENU
137 
+
130 138 
 #endif // LANGUAGE_EU_H

+ 8
- 0
Marlin/language_fi.h View File 

@@ -127,4 +127,12 @@
127 127
128 128 
 #define MSG_RECTRACT                        "Veda takaisin"
129 129
130 
+#ifdef DELTA_CALIBRATION_MENU
131 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
132 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
133 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
134 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
135 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
136 
+#endif // DELTA_CALIBRATION_MENU
137 
+
130 138 
 #endif // LANGUAGE_FI_H

+ 8
- 0
Marlin/language_fr.h View File 

@@ -128,4 +128,12 @@
128 128 
 #define MSG_RECTRACT                        "Rectract"
129 129 
 #define MSG_STEPPER_RELEASED                "RELACHE."
130 130
131 
+#ifdef DELTA_CALIBRATION_MENU
132 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
133 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
134 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
135 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
136 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
137 
+#endif // DELTA_CALIBRATION_MENU
138 
+
131 139 
 #endif // LANGUAGE_FR_H

+ 8
- 0
Marlin/language_it.h View File 

@@ -127,4 +127,12 @@
127 127
128 128 
 #define MSG_RECTRACT                        "Ritrai"
129 129
130 
+#ifdef DELTA_CALIBRATION_MENU
131 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
132 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
133 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
134 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
135 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
136 
+#endif // DELTA_CALIBRATION_MENU
137 
+
130 138 
 #endif // LANGUAGE_IT_H

+ 8
- 0
Marlin/language_nl.h View File 

@@ -127,4 +127,12 @@
127 127
128 128 
 #define MSG_RECTRACT                        "Terugtrekken"
129 129
130 
+#ifdef DELTA_CALIBRATION_MENU
131 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
132 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
133 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
134 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
135 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
136 
+#endif // DELTA_CALIBRATION_MENU
137 
+
130 138 
 #endif // LANGUAGE_NL_H

+ 8
- 0
Marlin/language_pl.h View File 

@@ -128,4 +128,12 @@
128 128 
 #define MSG_RECTRACT                        "Wycofanie"
129 129 
 #define MSG_STEPPER_RELEASED                "Zwolniony."
130 130
131 
+#ifdef DELTA_CALIBRATION_MENU
132 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
133 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
134 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
135 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
136 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
137 
+#endif // DELTA_CALIBRATION_MENU
138 
+
131 139 
 #endif // LANGUAGE_PL_H

+ 8
- 0
Marlin/language_pt.h View File 

@@ -132,4 +132,12 @@
132 132 
 #define MSG_RETRACT_ARROW                   "Retrair \x7E"
133 133 
 #define MSG_STEPPER_RELEASED                "Lancado."
134 134
135 
+#ifdef DELTA_CALIBRATION_MENU
136 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
137 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
138 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
139 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
140 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
141 
+#endif // DELTA_CALIBRATION_MENU
142 
+
135 143 
 #endif // LANGUAGE_PT_H

+ 8
- 0
Marlin/language_ru.h View File 

@@ -127,4 +127,12 @@
127 127
128 128 
 #define MSG_RECTRACT                        "Откат подачи    \x7E"
129 129
130 
+#ifdef DELTA_CALIBRATION_MENU
131 
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
132 
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
133 
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
134 
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
135 
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
136 
+#endif // DELTA_CALIBRATION_MENU
137 
+
130 138 
 #endif // LANGUAGE_RU_H

+ 21
- 0
Marlin/ultralcd.cpp View File 

@@ -65,6 +65,10 @@ static void lcd_set_contrast();
65 65 
 static void lcd_control_retract_menu();
66 66 
 static void lcd_sdcard_menu();
67 67
68 
+#ifdef DELTA_CALIBRATION_MENU
69 
+static void lcd_delta_calibrate_menu();
70 
+#endif // DELTA_CALIBRATION_MENU
71 
+
68 72 
 static void lcd_quick_feedback();//Cause an LCD refresh, and give the user visual or audible feedback that something has happened
69 73
70 74 
 /* Different types of actions that can be used in menu items. */
 
@@ -334,6 +338,9 @@ static void lcd_main_menu()
334 338 
         MENU_ITEM(submenu, MSG_TUNE, lcd_tune_menu);
335 339 
     }else{
336 340 
         MENU_ITEM(submenu, MSG_PREPARE, lcd_prepare_menu);
341 
+#ifdef DELTA_CALIBRATION_MENU
342 
+        MENU_ITEM(submenu, MSG_DELTA_CALIBRATE, lcd_delta_calibrate_menu);
343 
+#endif // DELTA_CALIBRATION_MENU
337 344 
     }
338 345 
     MENU_ITEM(submenu, MSG_CONTROL, lcd_control_menu);
339 346 
 #ifdef SDSUPPORT
 
@@ -628,6 +635,20 @@ static void lcd_prepare_menu()
628 635 
     END_MENU();
629 636 
 }
630 637
638 
+#ifdef DELTA_CALIBRATION_MENU
639 
+static void lcd_delta_calibrate_menu()
640 
+{
641 
+    START_MENU();
642 
+    MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
643 
+    MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
644 
+    MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_X, PSTR("G0 F8000 X-77.94 Y-45 Z0"));
645 
+    MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_Y, PSTR("G0 F8000 X77.94 Y-45 Z0"));
646 
+    MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_Z, PSTR("G0 F8000 X0 Y90 Z0"));
647 
+    MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_CENTER, PSTR("G0 F8000 X0 Y0 Z0"));
648 
+    END_MENU();
649 
+}
650 
+#endif // DELTA_CALIBRATION_MENU
651 
+
631 652 
 float move_menu_scale;
632 653 
 static void lcd_move_menu_axis();
633 654

Write Preview
Loading…
Cancel
Save