forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #7720 from thinkyhead/bf1_caselight_fix

Browse Source 
Fix caselight compile issues
master
Scott Lahteine 7 years ago committed by GitHub
parent 386b74f8c2 9d4d53e2fd
commit ca13f4c3dd
100 changed files with 243 additions and 193 deletions
Show Stats Download Patch File Download Diff File

6
Marlin/Configuration.h
Unescape View File

@ -955,9 +955,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1198,7 +1200,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

7
Marlin/Marlin_main.cpp
Unescape View File

@ -10097,15 +10097,14 @@ inline void gcode_M907() {
#ifndef INVERT_CASE_LIGHT #ifndef INVERT_CASE_LIGHT
#define INVERT_CASE_LIGHT false #define INVERT_CASE_LIGHT false
#endif #endif
int case_light_brightness; // LCD routine wants INT uint8_t case_light_brightness; // LCD routine wants INT
bool case_light_on; bool case_light_on;
void update_case_light() { void update_case_light() {
pinMode(CASE_LIGHT_PIN, OUTPUT); // digitalWrite doesn't set the port mode pinMode(CASE_LIGHT_PIN, OUTPUT); // digitalWrite doesn't set the port mode
uint8_t case_light_bright = (uint8_t)case_light_brightness;
if (case_light_on) { if (case_light_on) {
if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) { if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) {
analogWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? 255 - case_light_brightness : case_light_brightness ); analogWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? 255 - case_light_brightness : case_light_brightness);
} }
else WRITE(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? LOW : HIGH); else WRITE(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? LOW : HIGH);
} }
@ -10139,7 +10138,7 @@ inline void gcode_M355() {
} }
else { else {
if (!USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) SERIAL_ECHOLN("Case light: on"); if (!USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) SERIAL_ECHOLN("Case light: on");
else SERIAL_ECHOLNPAIR("Case light: ", case_light_brightness); else SERIAL_ECHOLNPAIR("Case light: ", (int)case_light_brightness);
} }
#else #else

6
Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
Unescape View File

@ -975,9 +975,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1218,7 +1220,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/AliExpress/CL-260/Configuration.h
Unescape View File

@ -955,9 +955,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1198,7 +1200,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Anet/A6/Configuration.h
Unescape View File

@ -1098,9 +1098,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1355,7 +1357,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Anet/A8/Configuration.h
Unescape View File

@ -961,9 +961,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1204,7 +1206,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/BQ/Hephestos/Configuration.h
Unescape View File

@ -946,9 +946,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1189,7 +1191,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
Unescape View File

@ -956,9 +956,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1199,7 +1201,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/BQ/WITBOX/Configuration.h
Unescape View File

@ -946,9 +946,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1189,7 +1191,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Cartesio/Configuration.h
Unescape View File

@ -954,9 +954,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1197,7 +1199,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Creality/CR-10/Configuration.h
Unescape View File

@ -965,9 +965,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1210,7 +1212,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Felix/Configuration.h
Unescape View File

@ -937,9 +937,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1180,7 +1182,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Felix/DUAL/Configuration.h
Unescape View File

@ -937,9 +937,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1180,7 +1182,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h
Unescape View File

@ -960,9 +960,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1203,7 +1205,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Geeetech/GT2560/Configuration.h
Unescape View File

@ -970,9 +970,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1213,7 +1215,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h
Unescape View File

@ -955,9 +955,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1198,7 +1200,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Infitary/i3-M508/Configuration.h
Unescape View File

@ -959,9 +959,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1202,7 +1204,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Malyan/M150/Configuration.h
Unescape View File

@ -983,9 +983,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1226,7 +1228,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
Unescape View File

@ -955,9 +955,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1198,7 +1200,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/RigidBot/Configuration.h
Unescape View File

@ -953,9 +953,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1196,7 +1198,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/SCARA/Configuration.h
Unescape View File

@ -967,9 +967,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1210,7 +1212,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Sanguinololu/Configuration.h
Unescape View File

@ -986,9 +986,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1229,7 +1231,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/TinyBoy2/Configuration.h
Unescape View File

@ -1011,9 +1011,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1254,7 +1256,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Velleman/K8200/Configuration.h
Unescape View File

@ -984,9 +984,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1230,7 +1232,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Velleman/K8400/Configuration.h
Unescape View File

@ -955,9 +955,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1198,7 +1200,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h
Unescape View File

@ -955,9 +955,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1198,7 +1200,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/adafruit/ST7565/Configuration.h
Unescape View File

@ -955,9 +955,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1198,7 +1200,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
Unescape View File

@ -1083,9 +1083,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1325,7 +1327,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
Unescape View File

@ -1077,9 +1077,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1319,7 +1321,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/delta/generic/Configuration.h
Unescape View File

@ -1072,9 +1072,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1314,7 +1316,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Unescape View File

@ -1075,9 +1075,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1317,7 +1319,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/delta/kossel_pro/Configuration.h
Unescape View File

@ -1075,9 +1075,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1317,7 +1319,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/delta/kossel_xl/Configuration.h
Unescape View File

@ -1084,9 +1084,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1326,7 +1328,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h
Unescape View File

@ -969,9 +969,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1212,7 +1214,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/makibox/Configuration.h
Unescape View File

@ -958,9 +958,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1201,7 +1203,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Unescape View File

@ -950,9 +950,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1193,7 +1195,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

6
Marlin/example_configurations/wt150/Configuration.h
Unescape View File

@ -960,9 +960,11 @@
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#define LEVEL_BED_CORNERS // Add an option to move between corners
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1203,7 +1205,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */

2
Marlin/language.h
Unescape View File

@ -44,7 +44,7 @@
// //
// ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" // ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h"
// ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS // ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS
// See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language // See also http://marlinfw.org/docs/development/lcd_language.html
// Languages // Languages
// an Aragonese // an Aragonese

2
Marlin/language_an.h
Unescape View File

@ -24,7 +24,7 @@
* Aragonese * Aragonese
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_AN_H #ifndef LANGUAGE_AN_H

2
Marlin/language_bg.h
Unescape View File

@ -24,7 +24,7 @@
* Bulgarian * Bulgarian
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_BG_H #ifndef LANGUAGE_BG_H

2
Marlin/language_ca.h
Unescape View File

@ -24,7 +24,7 @@
* Catalan * Catalan
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_CA_H #ifndef LANGUAGE_CA_H

2
Marlin/language_cn.h
Unescape View File

@ -24,7 +24,7 @@
* Chinese * Chinese
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_CN_H #ifndef LANGUAGE_CN_H

2
Marlin/language_cz.h
Unescape View File

@ -24,7 +24,7 @@
* Czech * Czech
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
* Translated by Petr Zahradnik, Computer Laboratory * Translated by Petr Zahradnik, Computer Laboratory
* Blog and video blog Zahradnik se bavi * Blog and video blog Zahradnik se bavi

2
Marlin/language_cz_utf8.h
Unescape View File

@ -25,7 +25,7 @@
* UTF-8 for Graphical Display * UTF-8 for Graphical Display
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
* Translated by Petr Zahradnik, Computer Laboratory * Translated by Petr Zahradnik, Computer Laboratory
* Blog and video blog Zahradnik se bavi * Blog and video blog Zahradnik se bavi

2
Marlin/language_da.h
Unescape View File

@ -24,7 +24,7 @@
* Danish * Danish
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_DA_H #ifndef LANGUAGE_DA_H

2
Marlin/language_de.h
Unescape View File

@ -24,7 +24,7 @@
* German * German
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_DE_H #ifndef LANGUAGE_DE_H

2
Marlin/language_el-gr.h
Unescape View File

@ -24,7 +24,7 @@
* Greek (Greece) * Greek (Greece)
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_EL_GR_H #ifndef LANGUAGE_EL_GR_H

2
Marlin/language_el.h
Unescape View File

@ -24,7 +24,7 @@
* Greek * Greek
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_EL_H #ifndef LANGUAGE_EL_H

2
Marlin/language_en.h
Unescape View File

@ -24,7 +24,7 @@
* English * English
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_EN_H #ifndef LANGUAGE_EN_H

2
Marlin/language_es.h
Unescape View File

@ -24,7 +24,7 @@
* Spanish * Spanish
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_ES_H #ifndef LANGUAGE_ES_H

2
Marlin/language_eu.h
Unescape View File

@ -24,7 +24,7 @@
* Basque-Euskera * Basque-Euskera
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_EU_H #ifndef LANGUAGE_EU_H

2
Marlin/language_fi.h
Unescape View File

@ -24,7 +24,7 @@
* Finnish * Finnish
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_FI_H #ifndef LANGUAGE_FI_H

2
Marlin/language_fr.h
Unescape View File

@ -24,7 +24,7 @@
* French * French
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_FR_H #ifndef LANGUAGE_FR_H

2
Marlin/language_gl.h
Unescape View File

@ -24,7 +24,7 @@
* Galician language (ISO "gl") * Galician language (ISO "gl")
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_GL_H #ifndef LANGUAGE_GL_H

2
Marlin/language_hr.h
Unescape View File

@ -24,7 +24,7 @@
* Croatian (Hrvatski) * Croatian (Hrvatski)
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_HR_H #ifndef LANGUAGE_HR_H

2
Marlin/language_it.h
Unescape View File

@ -24,7 +24,7 @@
* Italian * Italian
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_IT_H #ifndef LANGUAGE_IT_H

2
Marlin/language_kana.h
Unescape View File

@ -24,7 +24,7 @@
* Japanese (Kana) * Japanese (Kana)
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */

2
Marlin/language_kana_utf8.h
Unescape View File

@ -25,7 +25,7 @@
* UTF-8 for Graphical Display * UTF-8 for Graphical Display
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */

2
Marlin/language_nl.h
Unescape View File

@ -24,7 +24,7 @@
* Dutch * Dutch
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_NL_H #ifndef LANGUAGE_NL_H

2
Marlin/language_pl.h
Unescape View File

@ -24,7 +24,7 @@
* Polish * Polish
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_PL_H #ifndef LANGUAGE_PL_H

2
Marlin/language_pt-br.h
Unescape View File

@ -24,7 +24,7 @@
* Portuguese (Brazil) * Portuguese (Brazil)
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_PT_BR_H #ifndef LANGUAGE_PT_BR_H

2
Marlin/language_pt-br_utf8.h
Unescape View File

@ -25,7 +25,7 @@
* UTF-8 for Graphical Display * UTF-8 for Graphical Display
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_PT_BR_UTF_H #ifndef LANGUAGE_PT_BR_UTF_H

2
Marlin/language_pt.h
Unescape View File

@ -24,7 +24,7 @@
* Portuguese * Portuguese
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_PT_H #ifndef LANGUAGE_PT_H

2
Marlin/language_pt_utf8.h
Unescape View File

@ -25,7 +25,7 @@
* UTF-8 for Graphical Display * UTF-8 for Graphical Display
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_PT_UTF_H #ifndef LANGUAGE_PT_UTF_H

2
Marlin/language_ru.h
Unescape View File

@ -24,7 +24,7 @@
* Russian * Russian
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_RU_H #ifndef LANGUAGE_RU_H

2
Marlin/language_sk_utf8.h
Unescape View File

@ -25,7 +25,7 @@
* UTF-8 for Graphical Display * UTF-8 for Graphical Display
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
* Translated by Michal Holeš, Farma MaM * Translated by Michal Holeš, Farma MaM
* http://www.facebook.com/farmamam * http://www.facebook.com/farmamam

2
Marlin/language_test.h
Unescape View File

@ -24,7 +24,7 @@
* TEST * TEST
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_TEST_H #ifndef LANGUAGE_TEST_H

2
Marlin/language_tr.h
Unescape View File

@ -24,7 +24,7 @@
* Turkish * Turkish
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_TR_H #ifndef LANGUAGE_TR_H

2
Marlin/language_uk.h
Unescape View File

@ -24,7 +24,7 @@
* Ukrainian * Ukrainian
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_UK_H #ifndef LANGUAGE_UK_H

2
Marlin/language_zh_CN.h
Unescape View File

@ -24,7 +24,7 @@
* Simplified Chinese * Simplified Chinese
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_ZH_CN_H #ifndef LANGUAGE_ZH_CN_H

2
Marlin/language_zh_TW.h
Unescape View File

@ -24,7 +24,7 @@
* Traditional Chinese * Traditional Chinese
* *
* LCD Menu Messages * LCD Menu Messages
* See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See also http://marlinfw.org/docs/development/lcd_language.html
* *
*/ */
#ifndef LANGUAGE_ZH_TW_H #ifndef LANGUAGE_ZH_TW_H

34
Marlin/ultralcd.cpp
Unescape View File

@ -79,6 +79,36 @@ char lcd_status_message[3 * (LCD_WIDTH) + 1] = WELCOME_MSG; // worst case is kan
#include "ultralcd_impl_HD44780.h" #include "ultralcd_impl_HD44780.h"
#endif #endif
#if ENABLED(ULTIPANEL)
#define DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(_type, _name, _strFunc) \
inline void lcd_implementation_drawmenu_setting_edit_ ## _name (const bool sel, const uint8_t row, const char* pstr, const char* pstr2, _type * const data, ...) { \
UNUSED(pstr2); \
DRAWMENU_SETTING_EDIT_GENERIC(_strFunc(*(data))); \
} \
inline void lcd_implementation_drawmenu_setting_edit_callback_ ## _name (const bool sel, const uint8_t row, const char* pstr, const char* pstr2, _type * const data, ...) { \
UNUSED(pstr2); \
DRAWMENU_SETTING_EDIT_GENERIC(_strFunc(*(data))); \
} \
inline void lcd_implementation_drawmenu_setting_edit_accessor_ ## _name (const bool sel, const uint8_t row, const char* pstr, const char* pstr2, _type (*pget)(), void (*pset)(_type), ...) { \
UNUSED(pstr2); UNUSED(pset); \
DRAWMENU_SETTING_EDIT_GENERIC(_strFunc(pget())); \
} \
typedef void _name##_void
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(int16_t, int3, itostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint8_t, int8, i8tostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float3, ftostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float32, ftostr32);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float43, ftostr43sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float5, ftostr5rj);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float51, ftostr51sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float52, ftostr52sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float62, ftostr62rj);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint32_t, long5, ftostr5rj);
#define lcd_implementation_drawmenu_setting_edit_bool(sel, row, pstr, pstr2, data) DRAW_BOOL_SETTING(sel, row, pstr, data)
#define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) DRAW_BOOL_SETTING(sel, row, pstr, data)
#define lcd_implementation_drawmenu_setting_edit_accessor_bool(sel, row, pstr, pstr2, pget, pset) DRAW_BOOL_SETTING(sel, row, pstr, data)
#endif // ULTIPANEL
// The main status screen // The main status screen
void lcd_status_screen(); void lcd_status_screen();
@ -752,7 +782,7 @@ void kill_screen(const char* lcd_msg) {
#if ENABLED(MENU_ITEM_CASE_LIGHT) #if ENABLED(MENU_ITEM_CASE_LIGHT)
extern int case_light_brightness; extern uint8_t case_light_brightness;
extern bool case_light_on; extern bool case_light_on;
extern void update_case_light(); extern void update_case_light();
@ -762,7 +792,7 @@ void kill_screen(const char* lcd_msg) {
// ^ Main // ^ Main
// //
MENU_BACK(MSG_MAIN); MENU_BACK(MSG_MAIN);
MENU_ITEM_EDIT_CALLBACK(int3, MSG_CASE_LIGHT_BRIGHTNESS, &case_light_brightness, 0, 255, update_case_light, true); MENU_ITEM_EDIT_CALLBACK(int8, MSG_CASE_LIGHT_BRIGHTNESS, &case_light_brightness, 0, 255, update_case_light, true);
MENU_ITEM_EDIT_CALLBACK(bool, MSG_CASE_LIGHT, (bool*)&case_light_on, update_case_light); MENU_ITEM_EDIT_CALLBACK(bool, MSG_CASE_LIGHT, (bool*)&case_light_on, update_case_light);
END_MENU(); END_MENU();
} }

31
Marlin/ultralcd_impl_DOGM.h
Unescape View File

@ -854,35 +854,8 @@ static void lcd_implementation_status_screen() {
#define lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, false) #define lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, false)
#define lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, true) #define lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, true)
#define DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(_type, _name, _strFunc) \ #define DRAWMENU_SETTING_EDIT_GENERIC(_src) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, _src)
inline void lcd_implementation_drawmenu_setting_edit_ ## _name (const bool sel, const uint8_t row, const char* pstr, const char* pstr2, _type * const data, ...) { \ #define DRAW_BOOL_SETTING(sel, row, pstr, data) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
UNUSED(pstr2); \
lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, _strFunc(*(data))); \
} \
inline void lcd_implementation_drawmenu_setting_edit_callback_ ## _name (const bool sel, const uint8_t row, const char* pstr, const char* pstr2, _type * const data, ...) { \
UNUSED(pstr2); \
lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, _strFunc(*(data))); \
} \
inline void lcd_implementation_drawmenu_setting_edit_accessor_ ## _name (const bool sel, const uint8_t row, const char* pstr, const char* pstr2, _type (*pget)(), void (*pset)(_type), ...) { \
UNUSED(pstr2); UNUSED(pset); \
lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, _strFunc(pget())); \
} \
typedef void _name##_void
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(int16_t, int3, itostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint8_t, int8, i8tostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float3, ftostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float32, ftostr32);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float43, ftostr43sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float5, ftostr5rj);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float51, ftostr51sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float52, ftostr52sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float62, ftostr62rj);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint32_t, long5, ftostr5rj);
#define lcd_implementation_drawmenu_setting_edit_bool(sel, row, pstr, pstr2, data) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
#define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
#define lcd_implementation_drawmenu_setting_edit_accessor_bool(sel, row, pstr, pstr2, pget, pset) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
void lcd_implementation_drawedit(const char* const pstr, const char* const value=NULL) { void lcd_implementation_drawedit(const char* const pstr, const char* const value=NULL) {
const uint8_t labellen = lcd_strlen_P(pstr), const uint8_t labellen = lcd_strlen_P(pstr),

28
Marlin/ultralcd_impl_HD44780.h
Unescape View File

@ -964,32 +964,8 @@ static void lcd_implementation_status_screen() {
lcd_printPGM(data); lcd_printPGM(data);
} }
#define DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(_type, _name, _strFunc) \ #define DRAWMENU_SETTING_EDIT_GENERIC(_src) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', _src)
inline void lcd_implementation_drawmenu_setting_edit_ ## _name (const bool sel, const uint8_t row, const char* pstr, const char* pstr2, _type * const data, ...) { \ #define DRAW_BOOL_SETTING(sel, row, pstr, data) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', _strFunc(*(data))); \
} \
inline void lcd_implementation_drawmenu_setting_edit_callback_ ## _name (const bool sel, const uint8_t row, const char* pstr, const char* pstr2, _type * const data, ...) { \
lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', _strFunc(*(data))); \
} \
inline void lcd_implementation_drawmenu_setting_edit_accessor_ ## _name (const bool sel, const uint8_t row, const char* pstr, const char* pstr2, _type (*pget)(), void (*pset)(_type), ...) { \
lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', _strFunc(pget())); \
} \
typedef void _name##_void
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(int16_t, int3, itostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint8_t, int8, i8tostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float3, ftostr3);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float32, ftostr32);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float43, ftostr43sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float5, ftostr5rj);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float51, ftostr51sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float52, ftostr52sign);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(float, float62, ftostr62rj);
DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE(uint32_t, long5, ftostr5rj);
#define lcd_implementation_drawmenu_setting_edit_bool(sel, row, pstr, pstr2, data) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
#define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
#define lcd_implementation_drawmenu_setting_edit_accessor_bool(sel, row, pstr, pstr2, pget, pset, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
void lcd_implementation_drawedit(const char* pstr, const char* const value=NULL) { void lcd_implementation_drawedit(const char* pstr, const char* const value=NULL) {
lcd.setCursor(1, 1); lcd.setCursor(1, 1);

Write Preview
Loading…
Cancel
Save