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

Update inc files for parity with 1.1.x

Browse source
This commit is contained in:
Scott Lahteine 2017-12-16 20:20:06 -06:00
parent f79026acc1
commit 957bbab57f
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Marlin/src/inc/Conditionals_LCD.h
View file

@ -71,18 +71,18 @@
#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store. #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
#if ENABLED(miniVIKI) #if ENABLED(miniVIKI)
#define LCD_CONTRAST_MIN 75 #define LCD_CONTRAST_MIN 75
#define LCD_CONTRAST_MAX 115 #define LCD_CONTRAST_MAX 115
#define DEFAULT_LCD_CONTRAST 95 #define DEFAULT_LCD_CONTRAST 95
#define U8GLIB_ST7565_64128N #define U8GLIB_ST7565_64128N
#elif ENABLED(VIKI2) #elif ENABLED(VIKI2)
#define LCD_CONTRAST_MIN 0 #define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 255 #define LCD_CONTRAST_MAX 255
#define DEFAULT_LCD_CONTRAST 140 #define DEFAULT_LCD_CONTRAST 140
#define U8GLIB_ST7565_64128N #define U8GLIB_ST7565_64128N
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define LCD_CONTRAST_MIN 90 #define LCD_CONTRAST_MIN 90
#define LCD_CONTRAST_MAX 130 #define LCD_CONTRAST_MAX 130
#define DEFAULT_LCD_CONTRAST 110 #define DEFAULT_LCD_CONTRAST 110
#define U8GLIB_LM6059_AF #define U8GLIB_LM6059_AF
#define SD_DETECT_INVERTED #define SD_DETECT_INVERTED
@ -317,7 +317,7 @@
#define LCD_STR_FILAM_DIA "\xf8" #define LCD_STR_FILAM_DIA "\xf8"
#define LCD_STR_FILAM_MUL "\xa4" #define LCD_STR_FILAM_MUL "\xa4"
#else #else
/* Custom characters defined in the first 8 characters of the LCD */ // 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_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_DEGREE_CHAR 0x01
#define LCD_STR_THERMOMETER "\x02" // Still used with string concatenation #define LCD_STR_THERMOMETER "\x02" // Still used with string concatenation

4
Marlin/src/inc/Conditionals_post.h
View file

@ -96,7 +96,7 @@
#define CORE_AXIS_1 B_AXIS #define CORE_AXIS_1 B_AXIS
#define CORE_AXIS_2 C_AXIS #define CORE_AXIS_2 C_AXIS
#endif #endif
#if (ENABLED(COREYX) || ENABLED(COREZX) || ENABLED(COREZY)) #if ENABLED(COREYX) || ENABLED(COREZX) || ENABLED(COREZY)
#define CORESIGN(n) (-(n)) #define CORESIGN(n) (-(n))
#else #else
#define CORESIGN(n) (n) #define CORESIGN(n) (n)
@ -985,7 +985,7 @@
#define HAS_LEVELING (HAS_ABL || ENABLED(MESH_BED_LEVELING)) #define HAS_LEVELING (HAS_ABL || ENABLED(MESH_BED_LEVELING))
#define HAS_AUTOLEVEL (HAS_ABL && DISABLED(PROBE_MANUALLY)) #define HAS_AUTOLEVEL (HAS_ABL && DISABLED(PROBE_MANUALLY))
#define HAS_MESH (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING)) #define HAS_MESH (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
#define PLANNER_LEVELING (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING)) #define PLANNER_LEVELING (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING) || UBL_SEGMENTED || ENABLED(SKEW_CORRECTION))
#define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)) #define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
#if HAS_PROBING_PROCEDURE #if HAS_PROBING_PROCEDURE
#define PROBE_BED_WIDTH abs(RIGHT_PROBE_BED_POSITION - (LEFT_PROBE_BED_POSITION)) #define PROBE_BED_WIDTH abs(RIGHT_PROBE_BED_POSITION - (LEFT_PROBE_BED_POSITION))

4
Marlin/src/inc/SanityCheck.h
View file

@ -1262,7 +1262,7 @@ static_assert(1 >= 0
#if !(PIN_EXISTS(NEOPIXEL) && NEOPIXEL_PIXELS > 0) #if !(PIN_EXISTS(NEOPIXEL) && NEOPIXEL_PIXELS > 0)
#error "NEOPIXEL_LED requires NEOPIXEL_PIN and NEOPIXEL_PIXELS." #error "NEOPIXEL_LED requires NEOPIXEL_PIN and NEOPIXEL_PIXELS."
#endif #endif
#elif ENABLED(PRINTER_EVENT_LEDS) && DISABLED(BLINKM) && DISABLED(PCA9632) #elif ENABLED(PRINTER_EVENT_LEDS) && DISABLED(BLINKM) && DISABLED(PCA9632) && DISABLED(NEOPIXEL_LED)
#error "PRINTER_EVENT_LEDS requires BLINKM, PCA9632, RGB_LED, RGBW_LED or NEOPIXEL_LED." #error "PRINTER_EVENT_LEDS requires BLINKM, PCA9632, RGB_LED, RGBW_LED or NEOPIXEL_LED."
#endif #endif
@ -1466,7 +1466,7 @@ static_assert(1 >= 0
|| ENABLED( E1_IS_TMC2208 ) \ || ENABLED( E1_IS_TMC2208 ) \
|| ENABLED( E2_IS_TMC2208 ) \ || ENABLED( E2_IS_TMC2208 ) \
|| ENABLED( E3_IS_TMC2208 ) ) || ENABLED( E3_IS_TMC2208 ) )
#error "Choose at least one TMC2208 stepper." #error "HAVE_TMC2208 requires at least one TMC2208 stepper to be set."
#endif #endif
#if ENABLED(HYBRID_THRESHOLD) && DISABLED(STEALTHCHOP) #if ENABLED(HYBRID_THRESHOLD) && DISABLED(STEALTHCHOP)