Split up Conditionals.h into two files
Rather than include twice, which is tricky but may confuse
This commit is contained in:
parent
8684570f68
commit
93ea281061
21 changed files with 307 additions and 283 deletions
|
@ -26,266 +26,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONDITIONALS_H
|
#ifndef CONDITIONALS_H
|
||||||
|
|
||||||
/**
|
|
||||||
* Miscellaneous
|
|
||||||
*/
|
|
||||||
#ifndef M_PI
|
|
||||||
#define M_PI 3.1415926536
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This value is used by M109 when tying to calculate a ballpark safe margin
|
|
||||||
* to prevent wait-forever situation.
|
|
||||||
*/
|
|
||||||
#ifndef EXTRUDE_MINTEMP
|
|
||||||
#define EXTRUDE_MINTEMP 170
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CONFIGURATION_LCD // Get the LCD defines which are needed first
|
|
||||||
#define CONFIGURATION_LCD
|
|
||||||
|
|
||||||
#define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
|
|
||||||
|
|
||||||
#if ENABLED(CARTESIO_UI)
|
|
||||||
#define DOGLCD
|
|
||||||
#define ULTIPANEL
|
|
||||||
#define NEWPANEL
|
|
||||||
#define DEFAULT_LCD_CONTRAST 90
|
|
||||||
#define LCD_CONTRAST_MIN 60
|
|
||||||
#define LCD_CONTRAST_MAX 140
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
|
|
||||||
#define DOGLCD
|
|
||||||
#define ULTIPANEL
|
|
||||||
#define NEWPANEL
|
|
||||||
#define DEFAULT_LCD_CONTRAST 17
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
|
||||||
#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
|
|
||||||
#elif ENABLED(VIKI2)
|
|
||||||
#define DEFAULT_LCD_CONTRAST 40
|
|
||||||
#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
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ENCODER_PULSES_PER_STEP 4
|
|
||||||
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
|
||||||
#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
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
|
|
||||||
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
|
||||||
|
|
||||||
#ifndef ENCODER_PULSES_PER_STEP
|
|
||||||
#define ENCODER_PULSES_PER_STEP 4
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ENCODER_STEPS_PER_MENU_ITEM
|
|
||||||
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef LONG_FILENAME_HOST_SUPPORT
|
|
||||||
#define LONG_FILENAME_HOST_SUPPORT
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
|
|
||||||
#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) \
|
|
||||||
|| ENABLED(REPRAPWORLD_KEYPAD)
|
|
||||||
#define ULTIPANEL
|
|
||||||
#define NEWPANEL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(RA_CONTROL_PANEL)
|
|
||||||
#define LCD_I2C_TYPE_PCA8574
|
|
||||||
#define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander
|
|
||||||
#define ULTIPANEL
|
|
||||||
#define NEWPANEL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
|
||||||
#define DOGLCD
|
|
||||||
#define U8GLIB_ST7920
|
|
||||||
#define ULTIPANEL
|
|
||||||
#define NEWPANEL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
* I2C PANELS
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if ENABLED(LCD_I2C_SAINSMART_YWROBOT)
|
|
||||||
// This uses the LiquidCrystal_I2C library ( https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home )
|
|
||||||
// Make sure it is placed in the Arduino libraries directory.
|
|
||||||
#define LCD_I2C_TYPE_PCF8575
|
|
||||||
#define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander
|
|
||||||
#define ULTIPANEL
|
|
||||||
#define NEWPANEL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// PANELOLU2 LCD with status LEDs, separate encoder and click inputs
|
|
||||||
#if ENABLED(LCD_I2C_PANELOLU2)
|
|
||||||
#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
|
|
||||||
|
|
||||||
#ifndef ENCODER_PULSES_PER_STEP
|
|
||||||
#define ENCODER_PULSES_PER_STEP 4
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ENCODER_STEPS_PER_MENU_ITEM
|
|
||||||
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ULTIPANEL
|
|
||||||
#define NEWPANEL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
|
|
||||||
#if ENABLED(LCD_I2C_VIKI)
|
|
||||||
// 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 NEWPANEL
|
|
||||||
#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
|
|
||||||
#define NEWPANEL
|
|
||||||
#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 //enable this if you have a click-encoder panel
|
|
||||||
#define ULTRA_LCD
|
|
||||||
#ifndef LCD_WIDTH
|
|
||||||
#define LCD_WIDTH 20
|
|
||||||
#endif
|
|
||||||
#ifndef LCD_HEIGHT
|
|
||||||
#define LCD_HEIGHT 4
|
|
||||||
#endif
|
|
||||||
#else //no panel but just LCD
|
|
||||||
#if ENABLED(ULTRA_LCD)
|
|
||||||
#ifndef LCD_WIDTH
|
|
||||||
#define LCD_WIDTH 16
|
|
||||||
#endif
|
|
||||||
#ifndef LCD_HEIGHT
|
|
||||||
#define LCD_HEIGHT 2
|
|
||||||
#endif
|
|
||||||
#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.
|
|
||||||
#else
|
|
||||||
/* Custom characters defined in the first 8 characters of the LCD */
|
|
||||||
#define LCD_STR_BEDTEMP "\x00" // Print only as a char. This will have 'unexpected' results when used in a string!
|
|
||||||
#define LCD_STR_DEGREE "\x01"
|
|
||||||
#define LCD_STR_THERMOMETER "\x02"
|
|
||||||
#define LCD_STR_UPLEVEL "\x03"
|
|
||||||
#define LCD_STR_REFRESH "\x04"
|
|
||||||
#define LCD_STR_FOLDER "\x05"
|
|
||||||
#define LCD_STR_FEEDRATE "\x06"
|
|
||||||
#define LCD_STR_CLOCK "\x07"
|
|
||||||
#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(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
|
|
||||||
|
|
||||||
#ifndef BOOTSCREEN_TIMEOUT
|
|
||||||
#define BOOTSCREEN_TIMEOUT 2500
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#else // CONFIGURATION_LCD
|
|
||||||
|
|
||||||
#define CONDITIONALS_H
|
#define CONDITIONALS_H
|
||||||
|
|
||||||
#include "pins.h"
|
#include "pins.h"
|
||||||
|
@ -293,6 +33,9 @@
|
||||||
#ifndef USBCON
|
#ifndef USBCON
|
||||||
#define HardwareSerial_h // trick to disable the standard HWserial
|
#define HardwareSerial_h // trick to disable the standard HWserial
|
||||||
#endif
|
#endif
|
||||||
|
#include "Arduino.h"
|
||||||
|
|
||||||
|
#include "macros.h"
|
||||||
|
|
||||||
#if ENABLED(EMERGENCY_PARSER)
|
#if ENABLED(EMERGENCY_PARSER)
|
||||||
#define EMERGENCY_PARSER_CAPABILITIES " EMERGENCY_CODES:M108,M112,M410"
|
#define EMERGENCY_PARSER_CAPABILITIES " EMERGENCY_CODES:M108,M112,M410"
|
||||||
|
@ -300,8 +43,6 @@
|
||||||
#define EMERGENCY_PARSER_CAPABILITIES ""
|
#define EMERGENCY_PARSER_CAPABILITIES ""
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Arduino.h"
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set ENDSTOPPULLUPS for unused endstop switches
|
* Set ENDSTOPPULLUPS for unused endstop switches
|
||||||
*/
|
*/
|
||||||
|
@ -747,6 +488,7 @@
|
||||||
#define HAS_E3_STEP (PIN_EXISTS(E3_STEP))
|
#define HAS_E3_STEP (PIN_EXISTS(E3_STEP))
|
||||||
#define HAS_E4_STEP (PIN_EXISTS(E4_STEP))
|
#define HAS_E4_STEP (PIN_EXISTS(E4_STEP))
|
||||||
#define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
|
#define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
|
||||||
|
#define HAS_BUZZER (PIN_EXISTS(BEEPER) || ENABLED(LCD_USE_I2C_BUZZER))
|
||||||
|
|
||||||
#define HAS_MOTOR_CURRENT_PWM (PIN_EXISTS(MOTOR_CURRENT_PWM_XY) || PIN_EXISTS(MOTOR_CURRENT_PWM_Z) || PIN_EXISTS(MOTOR_CURRENT_PWM_E))
|
#define HAS_MOTOR_CURRENT_PWM (PIN_EXISTS(MOTOR_CURRENT_PWM_XY) || PIN_EXISTS(MOTOR_CURRENT_PWM_Z) || PIN_EXISTS(MOTOR_CURRENT_PWM_E))
|
||||||
|
|
||||||
|
@ -754,6 +496,14 @@
|
||||||
|
|
||||||
#define HAS_THERMALLY_PROTECTED_BED (HAS_TEMP_BED && HAS_HEATER_BED && ENABLED(THERMAL_PROTECTION_BED))
|
#define HAS_THERMALLY_PROTECTED_BED (HAS_TEMP_BED && HAS_HEATER_BED && ENABLED(THERMAL_PROTECTION_BED))
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This value is used by M109 when trying to calculate a ballpark safe margin
|
||||||
|
* to prevent wait-forever situation.
|
||||||
|
*/
|
||||||
|
#ifndef EXTRUDE_MINTEMP
|
||||||
|
#define EXTRUDE_MINTEMP 170
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper Macros for heaters and extruder fan
|
* Helper Macros for heaters and extruder fan
|
||||||
*/
|
*/
|
||||||
|
@ -801,7 +551,9 @@
|
||||||
#endif
|
#endif
|
||||||
#define WRITE_FAN_N(n, v) WRITE_FAN##n(v)
|
#define WRITE_FAN_N(n, v) WRITE_FAN##n(v)
|
||||||
|
|
||||||
#define HAS_BUZZER (PIN_EXISTS(BEEPER) || defined(LCD_USE_I2C_BUZZER))
|
/**
|
||||||
|
* Servos and probes
|
||||||
|
*/
|
||||||
|
|
||||||
#if HAS_SERVOS
|
#if HAS_SERVOS
|
||||||
#ifndef Z_ENDSTOP_SERVO_NR
|
#ifndef Z_ENDSTOP_SERVO_NR
|
||||||
|
@ -923,5 +675,4 @@
|
||||||
#define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING
|
#define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif //CONFIGURATION_LCD
|
|
||||||
#endif //CONDITIONALS_H
|
#endif //CONDITIONALS_H
|
||||||
|
|
270
Marlin/Conditionals_LCD.h
Normal file
270
Marlin/Conditionals_LCD.h
Normal file
|
@ -0,0 +1,270 @@
|
||||||
|
/**
|
||||||
|
* Marlin 3D Printer Firmware
|
||||||
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
|
*
|
||||||
|
* Based on Sprinter and grbl.
|
||||||
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Conditionals_LCD.h
|
||||||
|
* LCD Defines that depend on configuration but are not editable.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef CONDITIONALS_LCD_H // Get the LCD defines which are needed first
|
||||||
|
#define CONDITIONALS_LCD_H
|
||||||
|
|
||||||
|
#define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
|
||||||
|
|
||||||
|
#if ENABLED(CARTESIO_UI)
|
||||||
|
#define DOGLCD
|
||||||
|
#define ULTIPANEL
|
||||||
|
#define NEWPANEL
|
||||||
|
#define DEFAULT_LCD_CONTRAST 90
|
||||||
|
#define LCD_CONTRAST_MIN 60
|
||||||
|
#define LCD_CONTRAST_MAX 140
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
|
||||||
|
#define DOGLCD
|
||||||
|
#define ULTIPANEL
|
||||||
|
#define NEWPANEL
|
||||||
|
#define DEFAULT_LCD_CONTRAST 17
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
||||||
|
#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
|
||||||
|
#elif ENABLED(VIKI2)
|
||||||
|
#define DEFAULT_LCD_CONTRAST 40
|
||||||
|
#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
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define ENCODER_PULSES_PER_STEP 4
|
||||||
|
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
#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
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
|
||||||
|
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
||||||
|
|
||||||
|
#ifndef ENCODER_PULSES_PER_STEP
|
||||||
|
#define ENCODER_PULSES_PER_STEP 4
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ENCODER_STEPS_PER_MENU_ITEM
|
||||||
|
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef LONG_FILENAME_HOST_SUPPORT
|
||||||
|
#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
|
||||||
|
#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) \
|
||||||
|
|| ENABLED(REPRAPWORLD_KEYPAD)
|
||||||
|
#define ULTIPANEL
|
||||||
|
#define NEWPANEL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(RA_CONTROL_PANEL)
|
||||||
|
#define LCD_I2C_TYPE_PCA8574
|
||||||
|
#define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander
|
||||||
|
#define ULTIPANEL
|
||||||
|
#define NEWPANEL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
||||||
|
#define DOGLCD
|
||||||
|
#define U8GLIB_ST7920
|
||||||
|
#define ULTIPANEL
|
||||||
|
#define NEWPANEL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* I2C PANELS
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if ENABLED(LCD_I2C_SAINSMART_YWROBOT)
|
||||||
|
// This uses the LiquidCrystal_I2C library ( https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home )
|
||||||
|
// Make sure it is placed in the Arduino libraries directory.
|
||||||
|
#define LCD_I2C_TYPE_PCF8575
|
||||||
|
#define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander
|
||||||
|
#define ULTIPANEL
|
||||||
|
#define NEWPANEL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// PANELOLU2 LCD with status LEDs, separate encoder and click inputs
|
||||||
|
#if ENABLED(LCD_I2C_PANELOLU2)
|
||||||
|
#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
|
||||||
|
|
||||||
|
#ifndef ENCODER_PULSES_PER_STEP
|
||||||
|
#define ENCODER_PULSES_PER_STEP 4
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ENCODER_STEPS_PER_MENU_ITEM
|
||||||
|
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define ULTIPANEL
|
||||||
|
#define NEWPANEL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
|
||||||
|
#if ENABLED(LCD_I2C_VIKI)
|
||||||
|
// 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 NEWPANEL
|
||||||
|
#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
|
||||||
|
#define NEWPANEL
|
||||||
|
#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 //enable this if you have a click-encoder panel
|
||||||
|
#define ULTRA_LCD
|
||||||
|
#ifndef LCD_WIDTH
|
||||||
|
#define LCD_WIDTH 20
|
||||||
|
#endif
|
||||||
|
#ifndef LCD_HEIGHT
|
||||||
|
#define LCD_HEIGHT 4
|
||||||
|
#endif
|
||||||
|
#else //no panel but just LCD
|
||||||
|
#if ENABLED(ULTRA_LCD)
|
||||||
|
#ifndef LCD_WIDTH
|
||||||
|
#define LCD_WIDTH 16
|
||||||
|
#endif
|
||||||
|
#ifndef LCD_HEIGHT
|
||||||
|
#define LCD_HEIGHT 2
|
||||||
|
#endif
|
||||||
|
#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.
|
||||||
|
#else
|
||||||
|
/* Custom characters defined in the first 8 characters of the LCD */
|
||||||
|
#define LCD_STR_BEDTEMP "\x00" // Print only as a char. This will have 'unexpected' results when used in a string!
|
||||||
|
#define LCD_STR_DEGREE "\x01"
|
||||||
|
#define LCD_STR_THERMOMETER "\x02"
|
||||||
|
#define LCD_STR_UPLEVEL "\x03"
|
||||||
|
#define LCD_STR_REFRESH "\x04"
|
||||||
|
#define LCD_STR_FOLDER "\x05"
|
||||||
|
#define LCD_STR_FEEDRATE "\x06"
|
||||||
|
#define LCD_STR_CLOCK "\x07"
|
||||||
|
#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(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
|
||||||
|
|
||||||
|
#ifndef BOOTSCREEN_TIMEOUT
|
||||||
|
#define BOOTSCREEN_TIMEOUT 2500
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif //CONDITIONALS_LCD_H
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||||
|
|
||||||
#include "Conditionals.h"
|
#include "Conditionals_LCD.h"
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
@ -34,6 +34,9 @@
|
||||||
#define SET_BIT(n,b,value) (n) ^= ((-value)^(n)) & (_BV(b))
|
#define SET_BIT(n,b,value) (n) ^= ((-value)^(n)) & (_BV(b))
|
||||||
|
|
||||||
// Macros for maths shortcuts
|
// Macros for maths shortcuts
|
||||||
|
#ifndef M_PI
|
||||||
|
#define M_PI 3.14159265358979323846
|
||||||
|
#endif
|
||||||
#define RADIANS(d) ((d)*M_PI/180.0)
|
#define RADIANS(d) ((d)*M_PI/180.0)
|
||||||
#define DEGREES(r) ((r)*180.0/M_PI)
|
#define DEGREES(r) ((r)*180.0/M_PI)
|
||||||
#define HYPOT(x,y) sqrt(sq(x)+sq(y))
|
#define HYPOT(x,y) sqrt(sq(x)+sq(y))
|
||||||
|
|
Reference in a new issue