Update indentation, file-wrapping for Marlin 2.0.x
This commit is contained in:
Scott Lahteine
parent
60af705e6d
commit
4e2baeb3e1
@ -28,467 +28,467 @@
|
|||||||
#ifndef CONDITIONALS_LCD_H // Get the LCD defines which are needed first
|
#ifndef CONDITIONALS_LCD_H // Get the LCD defines which are needed first
|
||||||
#define CONDITIONALS_LCD_H
|
#define CONDITIONALS_LCD_H
|
||||||
|
|
||||||
#define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
|
#define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
|
||||||
|
|
||||||
#if ENABLED(CARTESIO_UI)
|
#if ENABLED(CARTESIO_UI)
|
||||||
|
|
||||||
#define DOGLCD
|
#define DOGLCD
|
||||||
#define ULTIPANEL
|
#define ULTIPANEL
|
||||||
#define DEFAULT_LCD_CONTRAST 90
|
#define DEFAULT_LCD_CONTRAST 90
|
||||||
#define LCD_CONTRAST_MIN 60
|
#define LCD_CONTRAST_MIN 60
|
||||||
#define LCD_CONTRAST_MAX 140
|
#define LCD_CONTRAST_MAX 140
|
||||||
|
|
||||||
#elif ENABLED(MAKRPANEL)
|
#elif ENABLED(MAKRPANEL)
|
||||||
|
|
||||||
|
#define U8GLIB_ST7565_64128N
|
||||||
|
|
||||||
|
#elif ENABLED(ANET_KEYPAD_LCD)
|
||||||
|
|
||||||
|
#define REPRAPWORLD_KEYPAD
|
||||||
|
#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
|
||||||
|
#define ADC_KEYPAD
|
||||||
|
#define ADC_KEY_NUM 8
|
||||||
|
#define ULTIPANEL
|
||||||
|
|
||||||
|
// this helps to implement ADC_KEYPAD menus
|
||||||
|
#define ENCODER_PULSES_PER_STEP 1
|
||||||
|
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
#define REVERSE_MENU_DIRECTION
|
||||||
|
|
||||||
|
#elif ENABLED(ANET_FULL_GRAPHICS_LCD)
|
||||||
|
|
||||||
|
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
||||||
|
|
||||||
|
#elif ENABLED(BQ_LCD_SMART_CONTROLLER)
|
||||||
|
|
||||||
|
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
||||||
|
|
||||||
|
#elif ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) || ENABLED(AZSMZ_12864)
|
||||||
|
|
||||||
|
#define ULTRA_LCD //general LCD support, also 16x2
|
||||||
|
#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||||
|
#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
|
||||||
|
|
||||||
|
#if ENABLED(miniVIKI)
|
||||||
|
#define LCD_CONTRAST_MIN 75
|
||||||
|
#define LCD_CONTRAST_MAX 115
|
||||||
|
#define DEFAULT_LCD_CONTRAST 95
|
||||||
|
#define U8GLIB_ST7565_64128N
|
||||||
|
#elif ENABLED(VIKI2)
|
||||||
|
#define LCD_CONTRAST_MIN 0
|
||||||
|
#define LCD_CONTRAST_MAX 255
|
||||||
|
#define DEFAULT_LCD_CONTRAST 140
|
||||||
|
#define U8GLIB_ST7565_64128N
|
||||||
|
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
||||||
|
#define LCD_CONTRAST_MIN 90
|
||||||
|
#define LCD_CONTRAST_MAX 130
|
||||||
|
#define DEFAULT_LCD_CONTRAST 110
|
||||||
|
#define U8GLIB_LM6059_AF
|
||||||
|
#define SD_DETECT_INVERTED
|
||||||
|
#elif ENABLED(AZSMZ_12864)
|
||||||
|
#define LCD_CONTRAST_MIN 120
|
||||||
|
#define LCD_CONTRAST_MAX 255
|
||||||
|
#define DEFAULT_LCD_CONTRAST 190
|
||||||
#define U8GLIB_ST7565_64128N
|
#define U8GLIB_ST7565_64128N
|
||||||
|
|
||||||
#elif ENABLED(ANET_KEYPAD_LCD)
|
|
||||||
|
|
||||||
#define REPRAPWORLD_KEYPAD
|
|
||||||
#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
|
|
||||||
#define ADC_KEYPAD
|
|
||||||
#define ADC_KEY_NUM 8
|
|
||||||
#define ULTIPANEL
|
|
||||||
|
|
||||||
// this helps to implement ADC_KEYPAD menus
|
|
||||||
#define ENCODER_PULSES_PER_STEP 1
|
|
||||||
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
|
||||||
#define REVERSE_MENU_DIRECTION
|
|
||||||
|
|
||||||
#elif ENABLED(ANET_FULL_GRAPHICS_LCD)
|
|
||||||
|
|
||||||
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
|
||||||
|
|
||||||
#elif ENABLED(BQ_LCD_SMART_CONTROLLER)
|
|
||||||
|
|
||||||
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
|
||||||
|
|
||||||
#elif ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) || ENABLED(AZSMZ_12864)
|
|
||||||
|
|
||||||
#define ULTRA_LCD //general LCD support, also 16x2
|
|
||||||
#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
|
||||||
#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
|
|
||||||
|
|
||||||
#if ENABLED(miniVIKI)
|
|
||||||
#define LCD_CONTRAST_MIN 75
|
|
||||||
#define LCD_CONTRAST_MAX 115
|
|
||||||
#define DEFAULT_LCD_CONTRAST 95
|
|
||||||
#define U8GLIB_ST7565_64128N
|
|
||||||
#elif ENABLED(VIKI2)
|
|
||||||
#define LCD_CONTRAST_MIN 0
|
|
||||||
#define LCD_CONTRAST_MAX 255
|
|
||||||
#define DEFAULT_LCD_CONTRAST 140
|
|
||||||
#define U8GLIB_ST7565_64128N
|
|
||||||
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
|
||||||
#define LCD_CONTRAST_MIN 90
|
|
||||||
#define LCD_CONTRAST_MAX 130
|
|
||||||
#define DEFAULT_LCD_CONTRAST 110
|
|
||||||
#define U8GLIB_LM6059_AF
|
|
||||||
#define SD_DETECT_INVERTED
|
|
||||||
#elif ENABLED(AZSMZ_12864)
|
|
||||||
#define LCD_CONTRAST_MIN 120
|
|
||||||
#define LCD_CONTRAST_MAX 255
|
|
||||||
#define DEFAULT_LCD_CONTRAST 190
|
|
||||||
#define U8GLIB_ST7565_64128N
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#elif ENABLED(OLED_PANEL_TINYBOY2)
|
|
||||||
|
|
||||||
#define U8GLIB_SSD1306
|
|
||||||
#define ULTIPANEL
|
|
||||||
#define REVERSE_ENCODER_DIRECTION
|
|
||||||
#define REVERSE_MENU_DIRECTION
|
|
||||||
|
|
||||||
#elif ENABLED(RA_CONTROL_PANEL)
|
|
||||||
|
|
||||||
#define LCD_I2C_TYPE_PCA8574
|
|
||||||
#define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander
|
|
||||||
#define ULTIPANEL
|
|
||||||
|
|
||||||
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
|
||||||
|
|
||||||
#define DOGLCD
|
|
||||||
#define U8GLIB_ST7920
|
|
||||||
#define ULTIPANEL
|
|
||||||
|
|
||||||
#elif ENABLED(CR10_STOCKDISPLAY)
|
|
||||||
|
|
||||||
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
|
||||||
#ifndef ST7920_DELAY_1
|
|
||||||
#define ST7920_DELAY_1 DELAY_2_NOP
|
|
||||||
#endif
|
|
||||||
#ifndef ST7920_DELAY_2
|
|
||||||
#define ST7920_DELAY_2 DELAY_2_NOP
|
|
||||||
#endif
|
|
||||||
#ifndef ST7920_DELAY_3
|
|
||||||
#define ST7920_DELAY_3 DELAY_2_NOP
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#elif ENABLED(MKS_12864OLED)
|
|
||||||
|
|
||||||
#define REPRAP_DISCOUNT_SMART_CONTROLLER
|
|
||||||
#define U8GLIB_SH1106
|
|
||||||
|
|
||||||
#elif ENABLED(MKS_MINI_12864)
|
|
||||||
|
|
||||||
#define MINIPANEL
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
|
#elif ENABLED(OLED_PANEL_TINYBOY2)
|
||||||
#define DOGLCD
|
|
||||||
#define ULTIPANEL
|
#define U8GLIB_SSD1306
|
||||||
#define DEFAULT_LCD_CONTRAST 17
|
#define ULTIPANEL
|
||||||
|
#define REVERSE_ENCODER_DIRECTION
|
||||||
|
#define REVERSE_MENU_DIRECTION
|
||||||
|
|
||||||
|
#elif ENABLED(RA_CONTROL_PANEL)
|
||||||
|
|
||||||
|
#define LCD_I2C_TYPE_PCA8574
|
||||||
|
#define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander
|
||||||
|
#define ULTIPANEL
|
||||||
|
|
||||||
|
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
||||||
|
|
||||||
|
#define DOGLCD
|
||||||
|
#define U8GLIB_ST7920
|
||||||
|
#define ULTIPANEL
|
||||||
|
|
||||||
|
#elif ENABLED(CR10_STOCKDISPLAY)
|
||||||
|
|
||||||
|
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
||||||
|
#ifndef ST7920_DELAY_1
|
||||||
|
#define ST7920_DELAY_1 DELAY_2_NOP
|
||||||
|
#endif
|
||||||
|
#ifndef ST7920_DELAY_2
|
||||||
|
#define ST7920_DELAY_2 DELAY_2_NOP
|
||||||
|
#endif
|
||||||
|
#ifndef ST7920_DELAY_3
|
||||||
|
#define ST7920_DELAY_3 DELAY_2_NOP
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Generic support for SSD1306 / SH1106 OLED based LCDs.
|
#elif ENABLED(MKS_12864OLED)
|
||||||
#if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SH1106)
|
|
||||||
#define ULTRA_LCD //general LCD support, also 16x2
|
#define REPRAP_DISCOUNT_SMART_CONTROLLER
|
||||||
#define DOGLCD // Support for I2C LCD 128x64 (Controller SSD1306 / SH1106 graphic Display Family)
|
#define U8GLIB_SH1106
|
||||||
|
|
||||||
|
#elif ENABLED(MKS_MINI_12864)
|
||||||
|
|
||||||
|
#define MINIPANEL
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
|
||||||
|
#define DOGLCD
|
||||||
|
#define ULTIPANEL
|
||||||
|
#define DEFAULT_LCD_CONTRAST 17
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Generic support for SSD1306 / SH1106 OLED based LCDs.
|
||||||
|
#if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SH1106)
|
||||||
|
#define ULTRA_LCD //general LCD support, also 16x2
|
||||||
|
#define DOGLCD // Support for I2C LCD 128x64 (Controller SSD1306 / SH1106 graphic Display Family)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(PANEL_ONE) || ENABLED(U8GLIB_SH1106)
|
||||||
|
|
||||||
|
#define ULTIMAKERCONTROLLER
|
||||||
|
|
||||||
|
#elif ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602)
|
||||||
|
|
||||||
|
#define REPRAP_DISCOUNT_SMART_CONTROLLER
|
||||||
|
#define LCD_WIDTH 16
|
||||||
|
#define LCD_HEIGHT 2
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(LCD_FOR_MELZI)
|
||||||
|
#define DOGLCD
|
||||||
|
#define U8GLIB_ST7920
|
||||||
|
#define REPRAP_DISCOUNT_SMART_CONTROLLER
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(ULTIMAKERCONTROLLER) \
|
||||||
|
|| ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
|
||||||
|
|| ENABLED(G3D_PANEL) \
|
||||||
|
|| ENABLED(RIGIDBOT_PANEL)
|
||||||
|
#define ULTIPANEL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(REPRAPWORLD_KEYPAD)
|
||||||
|
#define NEWPANEL
|
||||||
|
#if ENABLED(ULTIPANEL) && !defined(REPRAPWORLD_KEYPAD_MOVE_STEP)
|
||||||
|
#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLED(PANEL_ONE) || ENABLED(U8GLIB_SH1106)
|
/**
|
||||||
|
* I2C PANELS
|
||||||
|
*/
|
||||||
|
|
||||||
#define ULTIMAKERCONTROLLER
|
#if ENABLED(LCD_I2C_SAINSMART_YWROBOT)
|
||||||
|
|
||||||
#elif ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602)
|
// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library
|
||||||
|
// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home
|
||||||
|
|
||||||
#define REPRAP_DISCOUNT_SMART_CONTROLLER
|
#define LCD_I2C_TYPE_PCF8575
|
||||||
|
#define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander
|
||||||
|
#define ULTIPANEL
|
||||||
|
|
||||||
|
#elif ENABLED(LCD_I2C_PANELOLU2)
|
||||||
|
|
||||||
|
// PANELOLU2 LCD with status LEDs, separate encoder and click inputs
|
||||||
|
|
||||||
|
#define LCD_I2C_TYPE_MCP23017
|
||||||
|
#define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
|
||||||
|
#define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD
|
||||||
|
#define ULTIPANEL
|
||||||
|
|
||||||
|
#elif ENABLED(LCD_I2C_VIKI)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
|
||||||
|
*
|
||||||
|
* This uses the LiquidTWI2 library v1.2.3 or later ( https://github.com/lincomatic/LiquidTWI2 )
|
||||||
|
* Make sure the LiquidTWI2 directory is placed in the Arduino or Sketchbook libraries subdirectory.
|
||||||
|
* Note: The pause/stop/resume LCD button pin should be connected to the Arduino
|
||||||
|
* BTN_ENC pin (or set BTN_ENC to -1 if not used)
|
||||||
|
*/
|
||||||
|
#define LCD_I2C_TYPE_MCP23017
|
||||||
|
#define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
|
||||||
|
#define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later)
|
||||||
|
#define ULTIPANEL
|
||||||
|
|
||||||
|
#define ENCODER_FEEDRATE_DEADZONE 4
|
||||||
|
|
||||||
|
#define STD_ENCODER_PULSES_PER_STEP 1
|
||||||
|
#define STD_ENCODER_STEPS_PER_MENU_ITEM 2
|
||||||
|
|
||||||
|
#elif ENABLED(G3D_PANEL)
|
||||||
|
|
||||||
|
#define STD_ENCODER_PULSES_PER_STEP 2
|
||||||
|
#define STD_ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
|
||||||
|
#elif ENABLED(miniVIKI) || ENABLED(VIKI2) \
|
||||||
|
|| ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
||||||
|
|| ENABLED(AZSMZ_12864) \
|
||||||
|
|| ENABLED(OLED_PANEL_TINYBOY2) \
|
||||||
|
|| ENABLED(BQ_LCD_SMART_CONTROLLER) \
|
||||||
|
|| ENABLED(LCD_I2C_PANELOLU2) \
|
||||||
|
|| ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
|
||||||
|
#define STD_ENCODER_PULSES_PER_STEP 4
|
||||||
|
#define STD_ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef STD_ENCODER_PULSES_PER_STEP
|
||||||
|
#define STD_ENCODER_PULSES_PER_STEP 5
|
||||||
|
#endif
|
||||||
|
#ifndef STD_ENCODER_STEPS_PER_MENU_ITEM
|
||||||
|
#define STD_ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
#endif
|
||||||
|
#ifndef ENCODER_PULSES_PER_STEP
|
||||||
|
#define ENCODER_PULSES_PER_STEP STD_ENCODER_PULSES_PER_STEP
|
||||||
|
#endif
|
||||||
|
#ifndef ENCODER_STEPS_PER_MENU_ITEM
|
||||||
|
#define ENCODER_STEPS_PER_MENU_ITEM STD_ENCODER_STEPS_PER_MENU_ITEM
|
||||||
|
#endif
|
||||||
|
#ifndef ENCODER_FEEDRATE_DEADZONE
|
||||||
|
#define ENCODER_FEEDRATE_DEADZONE 6
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Shift register panels
|
||||||
|
// ---------------------
|
||||||
|
// 2 wire Non-latching LCD SR from:
|
||||||
|
// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
|
||||||
|
|
||||||
|
#if ENABLED(SAV_3DLCD)
|
||||||
|
#define SR_LCD_2W_NL // Non latching 2 wire shift register
|
||||||
|
#define ULTIPANEL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display
|
||||||
|
#ifndef LCD_WIDTH
|
||||||
|
#define LCD_WIDTH 22
|
||||||
|
#endif
|
||||||
|
#ifndef LCD_HEIGHT
|
||||||
|
#define LCD_HEIGHT 5
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(ULTIPANEL)
|
||||||
|
#define NEWPANEL // Disable this if you actually have no click-encoder panel
|
||||||
|
#define ULTRA_LCD
|
||||||
|
#ifndef LCD_WIDTH
|
||||||
|
#define LCD_WIDTH 20
|
||||||
|
#endif
|
||||||
|
#ifndef LCD_HEIGHT
|
||||||
|
#define LCD_HEIGHT 4
|
||||||
|
#endif
|
||||||
|
#elif ENABLED(ULTRA_LCD) // no panel but just LCD
|
||||||
|
#ifndef LCD_WIDTH
|
||||||
#define LCD_WIDTH 16
|
#define LCD_WIDTH 16
|
||||||
|
#endif
|
||||||
|
#ifndef LCD_HEIGHT
|
||||||
#define LCD_HEIGHT 2
|
#define LCD_HEIGHT 2
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(LCD_FOR_MELZI)
|
#if ENABLED(DOGLCD)
|
||||||
#define DOGLCD
|
/* Custom characters defined in font dogm_font_data_Marlin_symbols.h / Marlin_symbols.fon */
|
||||||
#define U8GLIB_ST7920
|
// \x00 intentionally skipped to avoid problems in strings
|
||||||
#define REPRAP_DISCOUNT_SMART_CONTROLLER
|
#define LCD_STR_REFRESH "\x01"
|
||||||
#endif
|
#define LCD_STR_FOLDER "\x02"
|
||||||
|
#define LCD_STR_ARROW_RIGHT "\x03"
|
||||||
|
#define LCD_STR_UPLEVEL "\x04"
|
||||||
|
#define LCD_STR_CLOCK "\x05"
|
||||||
|
#define LCD_STR_FEEDRATE "\x06"
|
||||||
|
#define LCD_STR_BEDTEMP "\x07"
|
||||||
|
#define LCD_STR_THERMOMETER "\x08"
|
||||||
|
#define LCD_STR_DEGREE "\x09"
|
||||||
|
|
||||||
#if ENABLED(ULTIMAKERCONTROLLER) \
|
#define LCD_STR_SPECIAL_MAX '\x09'
|
||||||
|| ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
|
// Maximum here is 0x1F because 0x20 is ' ' (space) and the normal charsets begin.
|
||||||
|| ENABLED(G3D_PANEL) \
|
// Better stay below 0x10 because DISPLAY_CHARSET_HD44780_WESTERN begins here.
|
||||||
|| ENABLED(RIGIDBOT_PANEL)
|
|
||||||
#define ULTIPANEL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(REPRAPWORLD_KEYPAD)
|
// Symbol characters
|
||||||
#define NEWPANEL
|
#define LCD_STR_FILAM_DIA "\xf8"
|
||||||
#if ENABLED(ULTIPANEL) && !defined(REPRAPWORLD_KEYPAD_MOVE_STEP)
|
#define LCD_STR_FILAM_MUL "\xa4"
|
||||||
#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
|
#else
|
||||||
|
/* Custom characters defined in the first 8 characters of the LCD */
|
||||||
|
#define LCD_BEDTEMP_CHAR 0x00 // Print only as a char. This will have 'unexpected' results when used in a string!
|
||||||
|
#define LCD_DEGREE_CHAR 0x01
|
||||||
|
#define LCD_STR_THERMOMETER "\x02" // Still used with string concatenation
|
||||||
|
#define LCD_UPLEVEL_CHAR 0x03
|
||||||
|
#define LCD_STR_REFRESH "\x04"
|
||||||
|
#define LCD_STR_FOLDER "\x05"
|
||||||
|
#define LCD_FEEDRATE_CHAR 0x06
|
||||||
|
#define LCD_CLOCK_CHAR 0x07
|
||||||
|
#define LCD_STR_ARROW_RIGHT ">" /* from the default character set */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default LCD contrast for dogm-like LCD displays
|
||||||
|
*/
|
||||||
|
#if ENABLED(DOGLCD)
|
||||||
|
|
||||||
|
#define HAS_LCD_CONTRAST ( \
|
||||||
|
ENABLED(MAKRPANEL) \
|
||||||
|
|| ENABLED(CARTESIO_UI) \
|
||||||
|
|| ENABLED(VIKI2) \
|
||||||
|
|| ENABLED(AZSMZ_12864) \
|
||||||
|
|| ENABLED(miniVIKI) \
|
||||||
|
|| ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
||||||
|
)
|
||||||
|
|
||||||
|
#if HAS_LCD_CONTRAST
|
||||||
|
#ifndef LCD_CONTRAST_MIN
|
||||||
|
#define LCD_CONTRAST_MIN 0
|
||||||
|
#endif
|
||||||
|
#ifndef LCD_CONTRAST_MAX
|
||||||
|
#define LCD_CONTRAST_MAX 63
|
||||||
|
#endif
|
||||||
|
#ifndef DEFAULT_LCD_CONTRAST
|
||||||
|
#define DEFAULT_LCD_CONTRAST 32
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
// Boot screens
|
||||||
* I2C PANELS
|
#if DISABLED(ULTRA_LCD)
|
||||||
*/
|
#undef SHOW_BOOTSCREEN
|
||||||
|
#elif !defined(BOOTSCREEN_TIMEOUT)
|
||||||
|
#define BOOTSCREEN_TIMEOUT 2500
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLED(LCD_I2C_SAINSMART_YWROBOT)
|
#define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST)
|
||||||
|
|
||||||
// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library
|
// MK2 Multiplexer forces SINGLENOZZLE to be enabled
|
||||||
// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home
|
#if ENABLED(MK2_MULTIPLEXER)
|
||||||
|
#define SINGLENOZZLE
|
||||||
|
#endif
|
||||||
|
|
||||||
#define LCD_I2C_TYPE_PCF8575
|
/**
|
||||||
#define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander
|
* Extruders have some combination of stepper motors and hotends
|
||||||
#define ULTIPANEL
|
* so we separate these concepts into the defines:
|
||||||
|
*
|
||||||
#elif ENABLED(LCD_I2C_PANELOLU2)
|
* EXTRUDERS - Number of Selectable Tools
|
||||||
|
* HOTENDS - Number of hotends, whether connected or separate
|
||||||
// PANELOLU2 LCD with status LEDs, separate encoder and click inputs
|
* E_STEPPERS - Number of actual E stepper motors
|
||||||
|
* E_MANUAL - Number of E steppers for LCD move options
|
||||||
#define LCD_I2C_TYPE_MCP23017
|
* TOOL_E_INDEX - Index to use when getting/setting the tool state
|
||||||
#define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
|
*
|
||||||
#define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD
|
*/
|
||||||
#define ULTIPANEL
|
#if ENABLED(SINGLENOZZLE) || ENABLED(MIXING_EXTRUDER) // One hotend, one thermistor, no XY offset
|
||||||
|
#define HOTENDS 1
|
||||||
#elif ENABLED(LCD_I2C_VIKI)
|
#undef TEMP_SENSOR_1_AS_REDUNDANT
|
||||||
|
#undef HOTEND_OFFSET_X
|
||||||
/**
|
#undef HOTEND_OFFSET_Y
|
||||||
* Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
|
#else // Two hotends
|
||||||
*
|
#define HOTENDS EXTRUDERS
|
||||||
* This uses the LiquidTWI2 library v1.2.3 or later ( https://github.com/lincomatic/LiquidTWI2 )
|
#if ENABLED(SWITCHING_NOZZLE) && !defined(HOTEND_OFFSET_Z)
|
||||||
* Make sure the LiquidTWI2 directory is placed in the Arduino or Sketchbook libraries subdirectory.
|
#define HOTEND_OFFSET_Z { 0 }
|
||||||
* Note: The pause/stop/resume LCD button pin should be connected to the Arduino
|
|
||||||
* BTN_ENC pin (or set BTN_ENC to -1 if not used)
|
|
||||||
*/
|
|
||||||
#define LCD_I2C_TYPE_MCP23017
|
|
||||||
#define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
|
|
||||||
#define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later)
|
|
||||||
#define ULTIPANEL
|
|
||||||
|
|
||||||
#define ENCODER_FEEDRATE_DEADZONE 4
|
|
||||||
|
|
||||||
#define STD_ENCODER_PULSES_PER_STEP 1
|
|
||||||
#define STD_ENCODER_STEPS_PER_MENU_ITEM 2
|
|
||||||
|
|
||||||
#elif ENABLED(G3D_PANEL)
|
|
||||||
|
|
||||||
#define STD_ENCODER_PULSES_PER_STEP 2
|
|
||||||
#define STD_ENCODER_STEPS_PER_MENU_ITEM 1
|
|
||||||
|
|
||||||
#elif ENABLED(miniVIKI) || ENABLED(VIKI2) \
|
|
||||||
|| ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
|
||||||
|| ENABLED(AZSMZ_12864) \
|
|
||||||
|| ENABLED(OLED_PANEL_TINYBOY2) \
|
|
||||||
|| ENABLED(BQ_LCD_SMART_CONTROLLER) \
|
|
||||||
|| ENABLED(LCD_I2C_PANELOLU2) \
|
|
||||||
|| ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
|
|
||||||
#define STD_ENCODER_PULSES_PER_STEP 4
|
|
||||||
#define STD_ENCODER_STEPS_PER_MENU_ITEM 1
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef STD_ENCODER_PULSES_PER_STEP
|
#define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
|
||||||
#define STD_ENCODER_PULSES_PER_STEP 5
|
|
||||||
#endif
|
|
||||||
#ifndef STD_ENCODER_STEPS_PER_MENU_ITEM
|
|
||||||
#define STD_ENCODER_STEPS_PER_MENU_ITEM 1
|
|
||||||
#endif
|
|
||||||
#ifndef ENCODER_PULSES_PER_STEP
|
|
||||||
#define ENCODER_PULSES_PER_STEP STD_ENCODER_PULSES_PER_STEP
|
|
||||||
#endif
|
|
||||||
#ifndef ENCODER_STEPS_PER_MENU_ITEM
|
|
||||||
#define ENCODER_STEPS_PER_MENU_ITEM STD_ENCODER_STEPS_PER_MENU_ITEM
|
|
||||||
#endif
|
|
||||||
#ifndef ENCODER_FEEDRATE_DEADZONE
|
|
||||||
#define ENCODER_FEEDRATE_DEADZONE 6
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Shift register panels
|
#if HOTENDS == 1
|
||||||
// ---------------------
|
#define HOTEND_INDEX 0
|
||||||
// 2 wire Non-latching LCD SR from:
|
#else
|
||||||
// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
|
#define HOTEND_INDEX e
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLED(SAV_3DLCD)
|
#if ENABLED(SWITCHING_EXTRUDER) || ENABLED(MIXING_EXTRUDER) // Unified E axis
|
||||||
#define SR_LCD_2W_NL // Non latching 2 wire shift register
|
#if ENABLED(MIXING_EXTRUDER)
|
||||||
#define ULTIPANEL
|
#define E_STEPPERS MIXING_STEPPERS
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display
|
|
||||||
#ifndef LCD_WIDTH
|
|
||||||
#define LCD_WIDTH 22
|
|
||||||
#endif
|
|
||||||
#ifndef LCD_HEIGHT
|
|
||||||
#define LCD_HEIGHT 5
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(ULTIPANEL)
|
|
||||||
#define NEWPANEL // Disable this if you actually have no click-encoder panel
|
|
||||||
#define ULTRA_LCD
|
|
||||||
#ifndef LCD_WIDTH
|
|
||||||
#define LCD_WIDTH 20
|
|
||||||
#endif
|
|
||||||
#ifndef LCD_HEIGHT
|
|
||||||
#define LCD_HEIGHT 4
|
|
||||||
#endif
|
|
||||||
#elif ENABLED(ULTRA_LCD) // no panel but just LCD
|
|
||||||
#ifndef LCD_WIDTH
|
|
||||||
#define LCD_WIDTH 16
|
|
||||||
#endif
|
|
||||||
#ifndef LCD_HEIGHT
|
|
||||||
#define LCD_HEIGHT 2
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(DOGLCD)
|
|
||||||
/* Custom characters defined in font dogm_font_data_Marlin_symbols.h / Marlin_symbols.fon */
|
|
||||||
// \x00 intentionally skipped to avoid problems in strings
|
|
||||||
#define LCD_STR_REFRESH "\x01"
|
|
||||||
#define LCD_STR_FOLDER "\x02"
|
|
||||||
#define LCD_STR_ARROW_RIGHT "\x03"
|
|
||||||
#define LCD_STR_UPLEVEL "\x04"
|
|
||||||
#define LCD_STR_CLOCK "\x05"
|
|
||||||
#define LCD_STR_FEEDRATE "\x06"
|
|
||||||
#define LCD_STR_BEDTEMP "\x07"
|
|
||||||
#define LCD_STR_THERMOMETER "\x08"
|
|
||||||
#define LCD_STR_DEGREE "\x09"
|
|
||||||
|
|
||||||
#define LCD_STR_SPECIAL_MAX '\x09'
|
|
||||||
// Maximum here is 0x1F because 0x20 is ' ' (space) and the normal charsets begin.
|
|
||||||
// Better stay below 0x10 because DISPLAY_CHARSET_HD44780_WESTERN begins here.
|
|
||||||
|
|
||||||
// Symbol characters
|
|
||||||
#define LCD_STR_FILAM_DIA "\xf8"
|
|
||||||
#define LCD_STR_FILAM_MUL "\xa4"
|
|
||||||
#else
|
#else
|
||||||
/* Custom characters defined in the first 8 characters of the LCD */
|
#define E_STEPPERS 1 // One E stepper
|
||||||
#define LCD_BEDTEMP_CHAR 0x00 // Print only as a char. This will have 'unexpected' results when used in a string!
|
|
||||||
#define LCD_DEGREE_CHAR 0x01
|
|
||||||
#define LCD_STR_THERMOMETER "\x02" // Still used with string concatenation
|
|
||||||
#define LCD_UPLEVEL_CHAR 0x03
|
|
||||||
#define LCD_STR_REFRESH "\x04"
|
|
||||||
#define LCD_STR_FOLDER "\x05"
|
|
||||||
#define LCD_FEEDRATE_CHAR 0x06
|
|
||||||
#define LCD_CLOCK_CHAR 0x07
|
|
||||||
#define LCD_STR_ARROW_RIGHT ">" /* from the default character set */
|
|
||||||
#endif
|
#endif
|
||||||
|
#define E_MANUAL 1
|
||||||
|
#define TOOL_E_INDEX 0
|
||||||
|
#else
|
||||||
|
#define E_STEPPERS EXTRUDERS
|
||||||
|
#define E_MANUAL EXTRUDERS
|
||||||
|
#define TOOL_E_INDEX current_block->active_extruder
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default LCD contrast for dogm-like LCD displays
|
* DISTINCT_E_FACTORS affects how some E factors are accessed
|
||||||
*/
|
*/
|
||||||
#if ENABLED(DOGLCD)
|
#if ENABLED(DISTINCT_E_FACTORS) && E_STEPPERS > 1
|
||||||
|
#define XYZE_N (XYZ + E_STEPPERS)
|
||||||
|
#define E_AXIS_N (E_AXIS + extruder)
|
||||||
|
#else
|
||||||
|
#undef DISTINCT_E_FACTORS
|
||||||
|
#define XYZE_N XYZE
|
||||||
|
#define E_AXIS_N E_AXIS
|
||||||
|
#endif
|
||||||
|
|
||||||
#define HAS_LCD_CONTRAST ( \
|
/**
|
||||||
ENABLED(MAKRPANEL) \
|
* The BLTouch Probe emulates a servo probe
|
||||||
|| ENABLED(CARTESIO_UI) \
|
* and uses "special" angles for its state.
|
||||||
|| ENABLED(VIKI2) \
|
*/
|
||||||
|| ENABLED(AZSMZ_12864) \
|
#if ENABLED(BLTOUCH)
|
||||||
|| ENABLED(miniVIKI) \
|
#ifndef Z_ENDSTOP_SERVO_NR
|
||||||
|| ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
#define Z_ENDSTOP_SERVO_NR 0
|
||||||
)
|
|
||||||
|
|
||||||
#if HAS_LCD_CONTRAST
|
|
||||||
#ifndef LCD_CONTRAST_MIN
|
|
||||||
#define LCD_CONTRAST_MIN 0
|
|
||||||
#endif
|
|
||||||
#ifndef LCD_CONTRAST_MAX
|
|
||||||
#define LCD_CONTRAST_MAX 63
|
|
||||||
#endif
|
|
||||||
#ifndef DEFAULT_LCD_CONTRAST
|
|
||||||
#define DEFAULT_LCD_CONTRAST 32
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef NUM_SERVOS
|
||||||
// Boot screens
|
#define NUM_SERVOS (Z_ENDSTOP_SERVO_NR + 1)
|
||||||
#if DISABLED(ULTRA_LCD)
|
|
||||||
#undef SHOW_BOOTSCREEN
|
|
||||||
#elif !defined(BOOTSCREEN_TIMEOUT)
|
|
||||||
#define BOOTSCREEN_TIMEOUT 2500
|
|
||||||
#endif
|
#endif
|
||||||
|
#undef DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
#define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST)
|
#if NUM_SERVOS == 1
|
||||||
|
#undef SERVO_DELAY
|
||||||
// MK2 Multiplexer forces SINGLENOZZLE to be enabled
|
#define SERVO_DELAY { 50 }
|
||||||
#if ENABLED(MK2_MULTIPLEXER)
|
|
||||||
#define SINGLENOZZLE
|
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef BLTOUCH_DELAY
|
||||||
/**
|
#define BLTOUCH_DELAY 375
|
||||||
* Extruders have some combination of stepper motors and hotends
|
|
||||||
* so we separate these concepts into the defines:
|
|
||||||
*
|
|
||||||
* EXTRUDERS - Number of Selectable Tools
|
|
||||||
* HOTENDS - Number of hotends, whether connected or separate
|
|
||||||
* E_STEPPERS - Number of actual E stepper motors
|
|
||||||
* E_MANUAL - Number of E steppers for LCD move options
|
|
||||||
* TOOL_E_INDEX - Index to use when getting/setting the tool state
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
#if ENABLED(SINGLENOZZLE) || ENABLED(MIXING_EXTRUDER) // One hotend, one thermistor, no XY offset
|
|
||||||
#define HOTENDS 1
|
|
||||||
#undef TEMP_SENSOR_1_AS_REDUNDANT
|
|
||||||
#undef HOTEND_OFFSET_X
|
|
||||||
#undef HOTEND_OFFSET_Y
|
|
||||||
#else // Two hotends
|
|
||||||
#define HOTENDS EXTRUDERS
|
|
||||||
#if ENABLED(SWITCHING_NOZZLE) && !defined(HOTEND_OFFSET_Z)
|
|
||||||
#define HOTEND_OFFSET_Z { 0 }
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
#undef Z_SERVO_ANGLES
|
||||||
|
#define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
|
||||||
|
|
||||||
#define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
|
#define BLTOUCH_DEPLOY 10
|
||||||
|
#define BLTOUCH_STOW 90
|
||||||
|
#define BLTOUCH_SELFTEST 120
|
||||||
|
#define BLTOUCH_RESET 160
|
||||||
|
#define _TEST_BLTOUCH(P) (READ(P##_PIN) != P##_ENDSTOP_INVERTING)
|
||||||
|
|
||||||
#if HOTENDS == 1
|
// Always disable probe pin inverting for BLTouch
|
||||||
#define HOTEND_INDEX 0
|
#undef Z_MIN_PROBE_ENDSTOP_INVERTING
|
||||||
|
#define Z_MIN_PROBE_ENDSTOP_INVERTING false
|
||||||
|
|
||||||
|
#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
|
||||||
|
#undef Z_MIN_ENDSTOP_INVERTING
|
||||||
|
#define Z_MIN_ENDSTOP_INVERTING false
|
||||||
|
#define TEST_BLTOUCH() _TEST_BLTOUCH(Z_MIN)
|
||||||
#else
|
#else
|
||||||
#define HOTEND_INDEX e
|
#define TEST_BLTOUCH() _TEST_BLTOUCH(Z_MIN_PROBE)
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLED(SWITCHING_EXTRUDER) || ENABLED(MIXING_EXTRUDER) // Unified E axis
|
/**
|
||||||
#if ENABLED(MIXING_EXTRUDER)
|
* Set a flag for a servo probe
|
||||||
#define E_STEPPERS MIXING_STEPPERS
|
*/
|
||||||
#else
|
#define HAS_Z_SERVO_ENDSTOP (defined(Z_ENDSTOP_SERVO_NR) && Z_ENDSTOP_SERVO_NR >= 0)
|
||||||
#define E_STEPPERS 1 // One E stepper
|
|
||||||
#endif
|
|
||||||
#define E_MANUAL 1
|
|
||||||
#define TOOL_E_INDEX 0
|
|
||||||
#else
|
|
||||||
#define E_STEPPERS EXTRUDERS
|
|
||||||
#define E_MANUAL EXTRUDERS
|
|
||||||
#define TOOL_E_INDEX current_block->active_extruder
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DISTINCT_E_FACTORS affects how some E factors are accessed
|
* UBL has its own manual probing, so this just causes trouble.
|
||||||
*/
|
*/
|
||||||
#if ENABLED(DISTINCT_E_FACTORS) && E_STEPPERS > 1
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
#define XYZE_N (XYZ + E_STEPPERS)
|
#undef PROBE_MANUALLY
|
||||||
#define E_AXIS_N (E_AXIS + extruder)
|
#endif
|
||||||
#else
|
|
||||||
#undef DISTINCT_E_FACTORS
|
|
||||||
#define XYZE_N XYZE
|
|
||||||
#define E_AXIS_N E_AXIS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The BLTouch Probe emulates a servo probe
|
* Set a flag for any enabled probe
|
||||||
* and uses "special" angles for its state.
|
*/
|
||||||
*/
|
#define PROBE_SELECTED (ENABLED(PROBE_MANUALLY) || ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE))
|
||||||
#if ENABLED(BLTOUCH)
|
|
||||||
#ifndef Z_ENDSTOP_SERVO_NR
|
|
||||||
#define Z_ENDSTOP_SERVO_NR 0
|
|
||||||
#endif
|
|
||||||
#ifndef NUM_SERVOS
|
|
||||||
#define NUM_SERVOS (Z_ENDSTOP_SERVO_NR + 1)
|
|
||||||
#endif
|
|
||||||
#undef DEACTIVATE_SERVOS_AFTER_MOVE
|
|
||||||
#if NUM_SERVOS == 1
|
|
||||||
#undef SERVO_DELAY
|
|
||||||
#define SERVO_DELAY { 50 }
|
|
||||||
#endif
|
|
||||||
#ifndef BLTOUCH_DELAY
|
|
||||||
#define BLTOUCH_DELAY 375
|
|
||||||
#endif
|
|
||||||
#undef Z_SERVO_ANGLES
|
|
||||||
#define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
|
|
||||||
|
|
||||||
#define BLTOUCH_DEPLOY 10
|
/**
|
||||||
#define BLTOUCH_STOW 90
|
* Clear probe pin settings when no probe is selected
|
||||||
#define BLTOUCH_SELFTEST 120
|
*/
|
||||||
#define BLTOUCH_RESET 160
|
#if !PROBE_SELECTED || ENABLED(PROBE_MANUALLY)
|
||||||
#define _TEST_BLTOUCH(P) (READ(P##_PIN) != P##_ENDSTOP_INVERTING)
|
#undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
||||||
|
#undef Z_MIN_PROBE_ENDSTOP
|
||||||
|
#endif
|
||||||
|
|
||||||
// Always disable probe pin inverting for BLTouch
|
#define HAS_SOFTWARE_ENDSTOPS (ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS))
|
||||||
#undef Z_MIN_PROBE_ENDSTOP_INVERTING
|
#define HAS_RESUME_CONTINUE (ENABLED(NEWPANEL) || ENABLED(EMERGENCY_PARSER))
|
||||||
#define Z_MIN_PROBE_ENDSTOP_INVERTING false
|
#define HAS_COLOR_LEDS (ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(NEOPIXEL_LED))
|
||||||
|
|
||||||
#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
|
|
||||||
#undef Z_MIN_ENDSTOP_INVERTING
|
|
||||||
#define Z_MIN_ENDSTOP_INVERTING false
|
|
||||||
#define TEST_BLTOUCH() _TEST_BLTOUCH(Z_MIN)
|
|
||||||
#else
|
|
||||||
#define TEST_BLTOUCH() _TEST_BLTOUCH(Z_MIN_PROBE)
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set a flag for a servo probe
|
|
||||||
*/
|
|
||||||
#define HAS_Z_SERVO_ENDSTOP (defined(Z_ENDSTOP_SERVO_NR) && Z_ENDSTOP_SERVO_NR >= 0)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* UBL has its own manual probing, so this just causes trouble.
|
|
||||||
*/
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
||||||
#undef PROBE_MANUALLY
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set a flag for any enabled probe
|
|
||||||
*/
|
|
||||||
#define PROBE_SELECTED (ENABLED(PROBE_MANUALLY) || ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE))
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clear probe pin settings when no probe is selected
|
|
||||||
*/
|
|
||||||
#if !PROBE_SELECTED || ENABLED(PROBE_MANUALLY)
|
|
||||||
#undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
|
||||||
#undef Z_MIN_PROBE_ENDSTOP
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define HAS_SOFTWARE_ENDSTOPS (ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS))
|
|
||||||
#define HAS_RESUME_CONTINUE (ENABLED(NEWPANEL) || ENABLED(EMERGENCY_PARSER))
|
|
||||||
#define HAS_COLOR_LEDS (ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(NEOPIXEL_LED))
|
|
||||||
|
|
||||||
#endif // CONDITIONALS_LCD_H
|
#endif // CONDITIONALS_LCD_H
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -26,6 +26,9 @@
|
|||||||
* Test configuration values for errors at compile-time.
|
* Test configuration values for errors at compile-time.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifndef _SANITYCHECK_H_
|
||||||
|
#define _SANITYCHECK_H_
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Require gcc 4.7 or newer (first included with Arduino 1.6.8) for C++11 features.
|
* Require gcc 4.7 or newer (first included with Arduino 1.6.8) for C++11 features.
|
||||||
*/
|
*/
|
||||||
@ -1361,5 +1364,6 @@ static_assert(COUNT(sanity_arr_1) <= XYZE_N, "DEFAULT_AXIS_STEPS_PER_UNIT has to
|
|||||||
static_assert(COUNT(sanity_arr_2) <= XYZE_N, "DEFAULT_MAX_FEEDRATE has too many elements.");
|
static_assert(COUNT(sanity_arr_2) <= XYZE_N, "DEFAULT_MAX_FEEDRATE has too many elements.");
|
||||||
static_assert(COUNT(sanity_arr_3) <= XYZE_N, "DEFAULT_MAX_ACCELERATION has too many elements.");
|
static_assert(COUNT(sanity_arr_3) <= XYZE_N, "DEFAULT_MAX_ACCELERATION has too many elements.");
|
||||||
|
|
||||||
|
|
||||||
#include "../HAL/HAL_SanityCheck.h" // get CPU specific checks
|
#include "../HAL/HAL_SanityCheck.h" // get CPU specific checks
|
||||||
|
|
||||||
|
#endif // _SANITYCHECK_H_
|
||||||
|
|||||||
@ -20,6 +20,11 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifndef _VERSION_H_
|
||||||
|
#define _VERSION_H_
|
||||||
|
|
||||||
|
#include "MarlinConfig.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This file is the standard Marlin version identifier file, all fields can be
|
* This file is the standard Marlin version identifier file, all fields can be
|
||||||
* overriden by the ones defined on _Version.h by using the Configuration.h
|
* overriden by the ones defined on _Version.h by using the Configuration.h
|
||||||
@ -48,7 +53,7 @@
|
|||||||
* here we define this default string as the date where the latest release
|
* here we define this default string as the date where the latest release
|
||||||
* version was tagged.
|
* version was tagged.
|
||||||
*/
|
*/
|
||||||
#define STRING_DISTRIBUTION_DATE "2017-07-27 12:00"
|
#define STRING_DISTRIBUTION_DATE "2017-10-19 12:00"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Required minimum Configuration.h and Configuration_adv.h file versions.
|
* Required minimum Configuration.h and Configuration_adv.h file versions.
|
||||||
@ -92,3 +97,5 @@
|
|||||||
#define WEBSITE_URL "http://marlinfw.org"
|
#define WEBSITE_URL "http://marlinfw.org"
|
||||||
|
|
||||||
#endif // USE_AUTOMATIC_VERSIONING
|
#endif // USE_AUTOMATIC_VERSIONING
|
||||||
|
|
||||||
|
#endif // _VERSION_H_
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user