Przeglądaj źródła

Update inc files for parity with 1.1.x

Scott Lahteine 7 lat temu
rodzic
commit
957bbab57f

+ 8
- 8
Marlin/src/inc/Conditionals_LCD.h Wyświetl plik

71
   #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
71
   #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
72
 
72
 
73
   #if ENABLED(miniVIKI)
73
   #if ENABLED(miniVIKI)
74
-    #define LCD_CONTRAST_MIN  75
75
-    #define LCD_CONTRAST_MAX 115
76
-    #define DEFAULT_LCD_CONTRAST 95
74
+    #define LCD_CONTRAST_MIN      75
75
+    #define LCD_CONTRAST_MAX     115
76
+    #define DEFAULT_LCD_CONTRAST  95
77
     #define U8GLIB_ST7565_64128N
77
     #define U8GLIB_ST7565_64128N
78
   #elif ENABLED(VIKI2)
78
   #elif ENABLED(VIKI2)
79
-    #define LCD_CONTRAST_MIN 0
80
-    #define LCD_CONTRAST_MAX 255
79
+    #define LCD_CONTRAST_MIN       0
80
+    #define LCD_CONTRAST_MAX     255
81
     #define DEFAULT_LCD_CONTRAST 140
81
     #define DEFAULT_LCD_CONTRAST 140
82
     #define U8GLIB_ST7565_64128N
82
     #define U8GLIB_ST7565_64128N
83
   #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
83
   #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
84
-    #define LCD_CONTRAST_MIN  90
85
-    #define LCD_CONTRAST_MAX 130
84
+    #define LCD_CONTRAST_MIN      90
85
+    #define LCD_CONTRAST_MAX     130
86
     #define DEFAULT_LCD_CONTRAST 110
86
     #define DEFAULT_LCD_CONTRAST 110
87
     #define U8GLIB_LM6059_AF
87
     #define U8GLIB_LM6059_AF
88
     #define SD_DETECT_INVERTED
88
     #define SD_DETECT_INVERTED
317
   #define LCD_STR_FILAM_DIA   "\xf8"
317
   #define LCD_STR_FILAM_DIA   "\xf8"
318
   #define LCD_STR_FILAM_MUL   "\xa4"
318
   #define LCD_STR_FILAM_MUL   "\xa4"
319
 #else
319
 #else
320
-  /* Custom characters defined in the first 8 characters of the LCD */
320
+  // Custom characters defined in the first 8 characters of the LCD
321
   #define LCD_BEDTEMP_CHAR     0x00  // Print only as a char. This will have 'unexpected' results when used in a string!
321
   #define LCD_BEDTEMP_CHAR     0x00  // Print only as a char. This will have 'unexpected' results when used in a string!
322
   #define LCD_DEGREE_CHAR      0x01
322
   #define LCD_DEGREE_CHAR      0x01
323
   #define LCD_STR_THERMOMETER "\x02" // Still used with string concatenation
323
   #define LCD_STR_THERMOMETER "\x02" // Still used with string concatenation

+ 2
- 2
Marlin/src/inc/Conditionals_post.h Wyświetl plik

96
     #define CORE_AXIS_1 B_AXIS
96
     #define CORE_AXIS_1 B_AXIS
97
     #define CORE_AXIS_2 C_AXIS
97
     #define CORE_AXIS_2 C_AXIS
98
   #endif
98
   #endif
99
-  #if (ENABLED(COREYX) || ENABLED(COREZX) || ENABLED(COREZY))
99
+  #if ENABLED(COREYX) || ENABLED(COREZX) || ENABLED(COREZY)
100
     #define CORESIGN(n) (-(n))
100
     #define CORESIGN(n) (-(n))
101
   #else
101
   #else
102
     #define CORESIGN(n) (n)
102
     #define CORESIGN(n) (n)
985
 #define HAS_LEVELING   (HAS_ABL || ENABLED(MESH_BED_LEVELING))
985
 #define HAS_LEVELING   (HAS_ABL || ENABLED(MESH_BED_LEVELING))
986
 #define HAS_AUTOLEVEL  (HAS_ABL && DISABLED(PROBE_MANUALLY))
986
 #define HAS_AUTOLEVEL  (HAS_ABL && DISABLED(PROBE_MANUALLY))
987
 #define HAS_MESH       (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
987
 #define HAS_MESH       (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
988
-#define PLANNER_LEVELING      (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING))
988
+#define PLANNER_LEVELING      (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING) || UBL_SEGMENTED || ENABLED(SKEW_CORRECTION))
989
 #define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
989
 #define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
990
 #if HAS_PROBING_PROCEDURE
990
 #if HAS_PROBING_PROCEDURE
991
   #define PROBE_BED_WIDTH abs(RIGHT_PROBE_BED_POSITION - (LEFT_PROBE_BED_POSITION))
991
   #define PROBE_BED_WIDTH abs(RIGHT_PROBE_BED_POSITION - (LEFT_PROBE_BED_POSITION))

+ 2
- 2
Marlin/src/inc/SanityCheck.h Wyświetl plik

1262
   #if !(PIN_EXISTS(NEOPIXEL) && NEOPIXEL_PIXELS > 0)
1262
   #if !(PIN_EXISTS(NEOPIXEL) && NEOPIXEL_PIXELS > 0)
1263
     #error "NEOPIXEL_LED requires NEOPIXEL_PIN and NEOPIXEL_PIXELS."
1263
     #error "NEOPIXEL_LED requires NEOPIXEL_PIN and NEOPIXEL_PIXELS."
1264
   #endif
1264
   #endif
1265
-#elif ENABLED(PRINTER_EVENT_LEDS) && DISABLED(BLINKM) && DISABLED(PCA9632)
1265
+#elif ENABLED(PRINTER_EVENT_LEDS) && DISABLED(BLINKM) && DISABLED(PCA9632) && DISABLED(NEOPIXEL_LED)
1266
   #error "PRINTER_EVENT_LEDS requires BLINKM, PCA9632, RGB_LED, RGBW_LED or NEOPIXEL_LED."
1266
   #error "PRINTER_EVENT_LEDS requires BLINKM, PCA9632, RGB_LED, RGBW_LED or NEOPIXEL_LED."
1267
 #endif
1267
 #endif
1268
 
1268
 
1466
     || ENABLED( E1_IS_TMC2208 ) \
1466
     || ENABLED( E1_IS_TMC2208 ) \
1467
     || ENABLED( E2_IS_TMC2208 ) \
1467
     || ENABLED( E2_IS_TMC2208 ) \
1468
     || ENABLED( E3_IS_TMC2208 ) )
1468
     || ENABLED( E3_IS_TMC2208 ) )
1469
-  #error "Choose at least one TMC2208 stepper."
1469
+  #error "HAVE_TMC2208 requires at least one TMC2208 stepper to be set."
1470
 #endif
1470
 #endif
1471
 
1471
 
1472
 #if ENABLED(HYBRID_THRESHOLD) && DISABLED(STEALTHCHOP)
1472
 #if ENABLED(HYBRID_THRESHOLD) && DISABLED(STEALTHCHOP)

Ładowanie…
Anuluj
Zapisz