Browse Source

Merge pull request #3740 from thinkyhead/rc_lcd_home_options

Individual Axis Homing LCD menu items
Scott Lahteine 9 years ago
parent
commit
14cd0f4c92

+ 7
- 0
Marlin/Configuration.h View File

878
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
888
 // SPEAKER/BUZZER
882
 //
889
 //
883
 // If you have a speaker that can produce tones, enable it here.
890
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/Felix/Configuration.h View File

861
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
871
 // SPEAKER/BUZZER
865
 //
872
 //
866
 // If you have a speaker that can produce tones, enable it here.
873
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

859
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
869
 // SPEAKER/BUZZER
863
 //
870
 //
864
 // If you have a speaker that can produce tones, enable it here.
871
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/Hephestos/Configuration.h View File

870
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
880
 // SPEAKER/BUZZER
874
 //
881
 //
875
 // If you have a speaker that can produce tones, enable it here.
882
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/Hephestos_2/Configuration.h View File

872
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
882
 // SPEAKER/BUZZER
876
 //
883
 //
877
 // If you have a speaker that can produce tones, enable it here.
884
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/K8200/Configuration.h View File

895
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
905
 // SPEAKER/BUZZER
899
 //
906
 //
900
 // If you have a speaker that can produce tones, enable it here.
907
 // If you have a speaker that can produce tones, enable it here.

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

878
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
888
 // SPEAKER/BUZZER
882
 //
889
 //
883
 // If you have a speaker that can produce tones, enable it here.
890
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/RigidBot/Configuration.h View File

873
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
883
 // SPEAKER/BUZZER
877
 //
884
 //
878
 // If you have a speaker that can produce tones, enable it here.
885
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/SCARA/Configuration.h View File

886
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
896
 // SPEAKER/BUZZER
890
 //
897
 //
891
 // If you have a speaker that can produce tones, enable it here.
898
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/TAZ4/Configuration.h View File

899
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
909
 // SPEAKER/BUZZER
903
 //
910
 //
904
 // If you have a speaker that can produce tones, enable it here.
911
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/WITBOX/Configuration.h View File

870
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
880
 // SPEAKER/BUZZER
874
 //
881
 //
875
 // If you have a speaker that can produce tones, enable it here.
882
 // If you have a speaker that can produce tones, enable it here.

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

878
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
888
 // SPEAKER/BUZZER
882
 //
889
 //
883
 // If you have a speaker that can produce tones, enable it here.
890
 // If you have a speaker that can produce tones, enable it here.

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

1007
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
1017
 // SPEAKER/BUZZER
1011
 //
1018
 //
1012
 // If you have a speaker that can produce tones, enable it here.
1019
 // If you have a speaker that can produce tones, enable it here.

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

1007
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
1017
 // SPEAKER/BUZZER
1011
 //
1018
 //
1012
 // If you have a speaker that can produce tones, enable it here.
1019
 // If you have a speaker that can produce tones, enable it here.

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

1011
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
1021
 // SPEAKER/BUZZER
1015
 //
1022
 //
1016
 // If you have a speaker that can produce tones, enable it here.
1023
 // If you have a speaker that can produce tones, enable it here.

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

1004
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
1014
 // SPEAKER/BUZZER
1008
 //
1015
 //
1009
 // If you have a speaker that can produce tones, enable it here.
1016
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

1012
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
1022
 // SPEAKER/BUZZER
1016
 //
1023
 //
1017
 // If you have a speaker that can produce tones, enable it here.
1024
 // If you have a speaker that can produce tones, enable it here.

+ 7
- 0
Marlin/example_configurations/makibox/Configuration.h View File

881
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
891
 // SPEAKER/BUZZER
885
 //
892
 //
886
 // If you have a speaker that can produce tones, enable it here.
893
 // If you have a speaker that can produce tones, enable it here.

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

872
 //#define REVERSE_MENU_DIRECTION
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
 // SPEAKER/BUZZER
882
 // SPEAKER/BUZZER
876
 //
883
 //
877
 // If you have a speaker that can produce tones, enable it here.
884
 // If you have a speaker that can produce tones, enable it here.

+ 9
- 0
Marlin/language_en.h View File

64
 #ifndef MSG_AUTO_HOME
64
 #ifndef MSG_AUTO_HOME
65
   #define MSG_AUTO_HOME                       "Auto home"
65
   #define MSG_AUTO_HOME                       "Auto home"
66
 #endif
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
 #ifndef MSG_LEVEL_BED_HOMING
76
 #ifndef MSG_LEVEL_BED_HOMING
68
   #define MSG_LEVEL_BED_HOMING                "Homing XYZ"
77
   #define MSG_LEVEL_BED_HOMING                "Homing XYZ"
69
 #endif
78
 #endif

+ 5
- 0
Marlin/ultralcd.cpp View File

1093
   // Auto Home
1093
   // Auto Home
1094
   //
1094
   //
1095
   MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
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
   // Set Home Offsets
1103
   // Set Home Offsets

Loading…
Cancel
Save