zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6942 from thinkyhead/bf_cleanups_friday

Browse source 
General cleanup after recent commits
This commit is contained in:
Scott Lahteine 2017-06-03 00:48:57 -05:00 committed by GitHub
parent fff50d3958 789b2928a8
commit d336e413aa
31 changed files with 227 additions and 282 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration_adv.h
View file

@ -1029,7 +1029,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

5
Marlin/Marlin_main.cpp
View file

@ -6354,9 +6354,8 @@ inline void gcode_M42() {
#endif #endif
SERIAL_PROTOCOLLNPGM(". deploy & stow 4 times"); SERIAL_PROTOCOLLNPGM(". deploy & stow 4 times");
pinMode(PROBE_TEST_PIN, INPUT_PULLUP); SET_INPUT_PULLUP(PROBE_TEST_PIN);
bool deploy_state; bool deploy_state, stow_state;
bool stow_state;
for (uint8_t i = 0; i < 4; i++) { for (uint8_t i = 0; i < 4; i++) {
servo[probe_index].move(z_servo_angle[0]); //deploy servo[probe_index].move(z_servo_angle[0]); //deploy
safe_delay(500); safe_delay(500);

14
Marlin/example_configurations/Cartesio/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1022,7 +1020,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/Felix/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1022,7 +1020,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1031,7 +1029,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/Hephestos/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1022,7 +1020,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/Hephestos_2/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1006,7 +1004,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/K8200/Configuration_adv.h
View file

@ -238,13 +238,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1035,7 +1033,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/K8400/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1022,7 +1020,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/M150/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1029,7 +1027,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/RigidBot/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1022,7 +1020,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/SCARA/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1022,7 +1020,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/TAZ4/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1022,7 +1020,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/TinyBoy2/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1025,7 +1023,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/WITBOX/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1022,7 +1020,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1027,7 +1025,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1026,7 +1024,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/delta/generic/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1024,7 +1022,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1024,7 +1022,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
View file

@ -230,13 +230,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1029,7 +1027,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1024,7 +1022,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1031,7 +1029,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/makibox/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1022,7 +1020,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1022,7 +1020,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

14
Marlin/example_configurations/wt150/Configuration_adv.h
View file

@ -225,13 +225,11 @@
*/ */
//#define CASE_LIGHT_ENABLE //#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
#define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board //#define CASE_LIGHT_PIN 4 // Override the default pin if needed
// pins_XXX.h file overrides this one #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
// and if CASE_LIGHT_DEFAULT is set to on
//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu
#endif #endif
//=========================================================================== //===========================================================================
@ -1025,7 +1023,7 @@
*/ */
#define TMC2130_ADV() { } #define TMC2130_ADV() { }
#endif // ENABLED(HAVE_TMC2130) #endif // HAVE_TMC2130
// @section L6470 // @section L6470

4
Marlin/gcode.h
View file

@ -120,7 +120,7 @@ public:
// Code seen bit was set. If not found, value_ptr is unchanged. // Code seen bit was set. If not found, value_ptr is unchanged.
// This allows "if (seen('A')||seen('B'))" to use the last-found value. // This allows "if (seen('A')||seen('B'))" to use the last-found value.
static bool seen(const char c) { static volatile bool seen(const char c) {
const uint8_t ind = c - 'A'; const uint8_t ind = c - 'A';
if (ind >= COUNT(param)) return false; // Only A-Z if (ind >= COUNT(param)) return false; // Only A-Z
const bool b = TEST(codebits[ind >> 3], ind & 0x7); const bool b = TEST(codebits[ind >> 3], ind & 0x7);
@ -132,7 +132,7 @@ public:
// Code is found in the string. If not found, value_ptr is unchanged. // Code is found in the string. If not found, value_ptr is unchanged.
// This allows "if (seen('A')||seen('B'))" to use the last-found value. // This allows "if (seen('A')||seen('B'))" to use the last-found value.
static bool seen(const char c) { static volatile bool seen(const char c) {
const char *p = strchr(command_args, c); const char *p = strchr(command_args, c);
const bool b = !!p; const bool b = !!p;
if (b) value_ptr = DECIMAL_SIGNED(p[1]) ? &p[1] : (char*)NULL; if (b) value_ptr = DECIMAL_SIGNED(p[1]) ? &p[1] : (char*)NULL;

12
Marlin/ultralcd.cpp
View file

@ -1598,7 +1598,6 @@ void kill_screen(const char* lcd_msg) {
// //
// The last G29 will record and enable but not move. // The last G29 will record and enable but not move.
// Since G29 is deferred,
// //
lcd_wait_for_move = true; lcd_wait_for_move = true;
enqueue_and_echo_commands_P(PSTR("G29 V1")); enqueue_and_echo_commands_P(PSTR("G29 V1"));
@ -2592,16 +2591,9 @@ void kill_screen(const char* lcd_msg) {
* *
*/ */
/**
*
* Callback for LCD contrast
*
*/
#if HAS_LCD_CONTRAST #if HAS_LCD_CONTRAST
void lcd_callback_set_contrast() { set_lcd_contrast(lcd_contrast); } void lcd_callback_set_contrast() { set_lcd_contrast(lcd_contrast); }
#endif
#endif // HAS_LCD_CONTRAST
static void lcd_factory_settings() { static void lcd_factory_settings() {
settings.reset(); settings.reset();
@ -2616,7 +2608,7 @@ void kill_screen(const char* lcd_msg) {
MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu); MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu);
#if HAS_LCD_CONTRAST #if HAS_LCD_CONTRAST
MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, (int) &lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true); MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, (int*)&lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true);
#endif #endif
#if ENABLED(FWRETRACT) #if ENABLED(FWRETRACT)
MENU_ITEM(submenu, MSG_RETRACT, lcd_control_retract_menu); MENU_ITEM(submenu, MSG_RETRACT, lcd_control_retract_menu);

4
Marlin/ultralcd_impl_DOGM.h
View file

@ -410,8 +410,8 @@ inline void lcd_implementation_status_message() {
const uint8_t slen = lcd_strlen(lcd_status_message); const uint8_t slen = lcd_strlen(lcd_status_message);
if (slen > LCD_WIDTH) { if (slen > LCD_WIDTH) {
// Skip any non-printing bytes // Skip any non-printing bytes
while (!PRINTABLE(lcd_status_message[status_scroll_pos])) ++status_scroll_pos; while (!PRINTABLE(lcd_status_message[status_scroll_pos++])) { /* nada */ }
if (++status_scroll_pos > slen - LCD_WIDTH) status_scroll_pos = 0; if (status_scroll_pos > slen - LCD_WIDTH) status_scroll_pos = 0;
} }
#else #else
lcd_print_utf(lcd_status_message); lcd_print_utf(lcd_status_message);

4
Marlin/ultralcd_impl_HD44780.h
View file

@ -829,8 +829,8 @@ static void lcd_implementation_status_screen() {
const uint8_t slen = lcd_strlen(lcd_status_message); const uint8_t slen = lcd_strlen(lcd_status_message);
if (slen > LCD_WIDTH) { if (slen > LCD_WIDTH) {
// Skip any non-printing bytes // Skip any non-printing bytes
while (!PRINTABLE(lcd_status_message[status_scroll_pos])) ++status_scroll_pos; while (!PRINTABLE(lcd_status_message[status_scroll_pos++])) { /* nada */ }
if (++status_scroll_pos > slen - LCD_WIDTH) status_scroll_pos = 0; if (status_scroll_pos > slen - LCD_WIDTH) status_scroll_pos = 0;
} }
#else #else
lcd_print_utf(lcd_status_message); lcd_print_utf(lcd_status_message);