ソースを参照

Merge pull request #3740 from thinkyhead/rc_lcd_home_options

Individual Axis Homing LCD menu items
Scott Lahteine 8年前
コミット
14cd0f4c92

+ 7
- 0
Marlin/Configuration.h ファイルの表示

@@ -878,6 +878,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
878 878
 //#define REVERSE_MENU_DIRECTION
879 879
 
880 880
 //
881
+// Individual Axis Homing
882
+//
883
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
884
+//
885
+//#define INDIVIDUAL_AXIS_HOMING_MENU
886
+
887
+//
881 888
 // SPEAKER/BUZZER
882 889
 //
883 890
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/Felix/Configuration.h ファイルの表示

@@ -861,6 +861,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
861 861
 //#define REVERSE_MENU_DIRECTION
862 862
 
863 863
 //
864
+// Individual Axis Homing
865
+//
866
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
867
+//
868
+//#define INDIVIDUAL_AXIS_HOMING_MENU
869
+
870
+//
864 871
 // SPEAKER/BUZZER
865 872
 //
866 873
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/Felix/Configuration_DUAL.h ファイルの表示

@@ -859,6 +859,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
859 859
 //#define REVERSE_MENU_DIRECTION
860 860
 
861 861
 //
862
+// Individual Axis Homing
863
+//
864
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
865
+//
866
+//#define INDIVIDUAL_AXIS_HOMING_MENU
867
+
868
+//
862 869
 // SPEAKER/BUZZER
863 870
 //
864 871
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/Hephestos/Configuration.h ファイルの表示

@@ -870,6 +870,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
870 870
 //#define REVERSE_MENU_DIRECTION
871 871
 
872 872
 //
873
+// Individual Axis Homing
874
+//
875
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
876
+//
877
+//#define INDIVIDUAL_AXIS_HOMING_MENU
878
+
879
+//
873 880
 // SPEAKER/BUZZER
874 881
 //
875 882
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/Hephestos_2/Configuration.h ファイルの表示

@@ -872,6 +872,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
872 872
 //#define REVERSE_MENU_DIRECTION
873 873
 
874 874
 //
875
+// Individual Axis Homing
876
+//
877
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
878
+//
879
+//#define INDIVIDUAL_AXIS_HOMING_MENU
880
+
881
+//
875 882
 // SPEAKER/BUZZER
876 883
 //
877 884
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/K8200/Configuration.h ファイルの表示

@@ -895,6 +895,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
895 895
 //#define REVERSE_MENU_DIRECTION
896 896
 
897 897
 //
898
+// Individual Axis Homing
899
+//
900
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
901
+//
902
+//#define INDIVIDUAL_AXIS_HOMING_MENU
903
+
904
+//
898 905
 // SPEAKER/BUZZER
899 906
 //
900 907
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h ファイルの表示

@@ -878,6 +878,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
878 878
 //#define REVERSE_MENU_DIRECTION
879 879
 
880 880
 //
881
+// Individual Axis Homing
882
+//
883
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
884
+//
885
+//#define INDIVIDUAL_AXIS_HOMING_MENU
886
+
887
+//
881 888
 // SPEAKER/BUZZER
882 889
 //
883 890
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/RigidBot/Configuration.h ファイルの表示

@@ -873,6 +873,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
873 873
 //#define REVERSE_MENU_DIRECTION
874 874
 
875 875
 //
876
+// Individual Axis Homing
877
+//
878
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
879
+//
880
+//#define INDIVIDUAL_AXIS_HOMING_MENU
881
+
882
+//
876 883
 // SPEAKER/BUZZER
877 884
 //
878 885
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/SCARA/Configuration.h ファイルの表示

@@ -886,6 +886,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
886 886
 //#define REVERSE_MENU_DIRECTION
887 887
 
888 888
 //
889
+// Individual Axis Homing
890
+//
891
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
892
+//
893
+//#define INDIVIDUAL_AXIS_HOMING_MENU
894
+
895
+//
889 896
 // SPEAKER/BUZZER
890 897
 //
891 898
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/TAZ4/Configuration.h ファイルの表示

@@ -899,6 +899,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
899 899
 //#define REVERSE_MENU_DIRECTION
900 900
 
901 901
 //
902
+// Individual Axis Homing
903
+//
904
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
905
+//
906
+//#define INDIVIDUAL_AXIS_HOMING_MENU
907
+
908
+//
902 909
 // SPEAKER/BUZZER
903 910
 //
904 911
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/WITBOX/Configuration.h ファイルの表示

@@ -870,6 +870,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
870 870
 //#define REVERSE_MENU_DIRECTION
871 871
 
872 872
 //
873
+// Individual Axis Homing
874
+//
875
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
876
+//
877
+//#define INDIVIDUAL_AXIS_HOMING_MENU
878
+
879
+//
873 880
 // SPEAKER/BUZZER
874 881
 //
875 882
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/adafruit/ST7565/Configuration.h ファイルの表示

@@ -878,6 +878,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
878 878
 //#define REVERSE_MENU_DIRECTION
879 879
 
880 880
 //
881
+// Individual Axis Homing
882
+//
883
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
884
+//
885
+//#define INDIVIDUAL_AXIS_HOMING_MENU
886
+
887
+//
881 888
 // SPEAKER/BUZZER
882 889
 //
883 890
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/delta/biv2.5/Configuration.h ファイルの表示

@@ -1007,6 +1007,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
1007 1007
 //#define REVERSE_MENU_DIRECTION
1008 1008
 
1009 1009
 //
1010
+// Individual Axis Homing
1011
+//
1012
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
1013
+//
1014
+//#define INDIVIDUAL_AXIS_HOMING_MENU
1015
+
1016
+//
1010 1017
 // SPEAKER/BUZZER
1011 1018
 //
1012 1019
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/delta/generic/Configuration.h ファイルの表示

@@ -1007,6 +1007,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
1007 1007
 //#define REVERSE_MENU_DIRECTION
1008 1008
 
1009 1009
 //
1010
+// Individual Axis Homing
1011
+//
1012
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
1013
+//
1014
+//#define INDIVIDUAL_AXIS_HOMING_MENU
1015
+
1016
+//
1010 1017
 // SPEAKER/BUZZER
1011 1018
 //
1012 1019
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h ファイルの表示

@@ -1011,6 +1011,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1011 1011
 //#define REVERSE_MENU_DIRECTION
1012 1012
 
1013 1013
 //
1014
+// Individual Axis Homing
1015
+//
1016
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
1017
+//
1018
+//#define INDIVIDUAL_AXIS_HOMING_MENU
1019
+
1020
+//
1014 1021
 // SPEAKER/BUZZER
1015 1022
 //
1016 1023
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration.h ファイルの表示

@@ -1004,6 +1004,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1004 1004
 //#define REVERSE_MENU_DIRECTION
1005 1005
 
1006 1006
 //
1007
+// Individual Axis Homing
1008
+//
1009
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
1010
+//
1011
+//#define INDIVIDUAL_AXIS_HOMING_MENU
1012
+
1013
+//
1007 1014
 // SPEAKER/BUZZER
1008 1015
 //
1009 1016
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration.h ファイルの表示

@@ -1012,6 +1012,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1012 1012
 //#define REVERSE_MENU_DIRECTION
1013 1013
 
1014 1014
 //
1015
+// Individual Axis Homing
1016
+//
1017
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
1018
+//
1019
+//#define INDIVIDUAL_AXIS_HOMING_MENU
1020
+
1021
+//
1015 1022
 // SPEAKER/BUZZER
1016 1023
 //
1017 1024
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/makibox/Configuration.h ファイルの表示

@@ -881,6 +881,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
881 881
 //#define REVERSE_MENU_DIRECTION
882 882
 
883 883
 //
884
+// Individual Axis Homing
885
+//
886
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
887
+//
888
+//#define INDIVIDUAL_AXIS_HOMING_MENU
889
+
890
+//
884 891
 // SPEAKER/BUZZER
885 892
 //
886 893
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h ファイルの表示

@@ -872,6 +872,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
872 872
 //#define REVERSE_MENU_DIRECTION
873 873
 
874 874
 //
875
+// Individual Axis Homing
876
+//
877
+// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
878
+//
879
+//#define INDIVIDUAL_AXIS_HOMING_MENU
880
+
881
+//
875 882
 // SPEAKER/BUZZER
876 883
 //
877 884
 // If you have a speaker that can produce tones, enable it here.

+ 9
- 0
Marlin/language_en.h ファイルの表示

@@ -64,6 +64,15 @@
64 64
 #ifndef MSG_AUTO_HOME
65 65
   #define MSG_AUTO_HOME                       "Auto home"
66 66
 #endif
67
+#ifndef MSG_AUTO_HOME_X
68
+  #define MSG_AUTO_HOME_X                     "Home X"
69
+#endif
70
+#ifndef MSG_AUTO_HOME_Y
71
+  #define MSG_AUTO_HOME_Y                     "Home Y"
72
+#endif
73
+#ifndef MSG_AUTO_HOME_Z
74
+  #define MSG_AUTO_HOME_Z                     "Home Z"
75
+#endif
67 76
 #ifndef MSG_LEVEL_BED_HOMING
68 77
   #define MSG_LEVEL_BED_HOMING                "Homing XYZ"
69 78
 #endif

+ 5
- 0
Marlin/ultralcd.cpp ファイルの表示

@@ -1093,6 +1093,11 @@ static void lcd_prepare_menu() {
1093 1093
   // Auto Home
1094 1094
   //
1095 1095
   MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
1096
+  #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
1097
+    MENU_ITEM(gcode, MSG_AUTO_HOME_X, PSTR("G28 X"));
1098
+    MENU_ITEM(gcode, MSG_AUTO_HOME_Y, PSTR("G28 Y"));
1099
+    MENU_ITEM(gcode, MSG_AUTO_HOME_Z, PSTR("G28 Z"));
1100
+  #endif
1096 1101
 
1097 1102
   //
1098 1103
   // Set Home Offsets

読み込み中…
キャンセル
保存