瀏覽代碼

Fix up conditions, comments

Scott Lahteine 4 年之前
父節點
當前提交
b36163d53a

+ 7
- 13
Marlin/src/inc/SanityCheck.h 查看文件

39
 #define TEST2 1
39
 #define TEST2 1
40
 #define TEST3 0
40
 #define TEST3 0
41
 #define TEST4 true
41
 #define TEST4 true
42
-#if ENABLED(TEST0)
42
+#if ENABLED(TEST0) || !ENABLED(TEST2) || ENABLED(TEST3)
43
   #error "ENABLED is borked!"
43
   #error "ENABLED is borked!"
44
 #endif
44
 #endif
45
-#if DISABLED(TEST1)
46
-  #error "DISABLED is borked!"
47
-#endif
48
-#if !ENABLED(TEST2)
49
-  #error "ENABLED is borked!"
45
+#if BOTH(TEST0, TEST1)
46
+  #error "BOTH is borked!"
50
 #endif
47
 #endif
51
-#if ENABLED(TEST3)
52
-  #error "ENABLED is borked!"
53
-#endif
54
-#if DISABLED(TEST4)
48
+#if DISABLED(TEST1) || !DISABLED(TEST3) || DISABLED(TEST4) || DISABLED(TEST0, TEST1, TEST2, TEST4) || !DISABLED(TEST0, TEST3)
55
   #error "DISABLED is borked!"
49
   #error "DISABLED is borked!"
56
 #endif
50
 #endif
57
 #if !ANY(TEST1, TEST2, TEST3, TEST4) || ANY(TEST0, TEST3)
51
 #if !ANY(TEST1, TEST2, TEST3, TEST4) || ANY(TEST0, TEST3)
58
   #error "ANY is borked!"
52
   #error "ANY is borked!"
59
 #endif
53
 #endif
60
-#if DISABLED(TEST0, TEST1, TEST2, TEST4)
61
-  #error "DISABLED is borked!"
54
+#if NONE(TEST0, TEST1, TEST2, TEST4) || !NONE(TEST0, TEST3)
55
+  #error "NONE is borked!"
62
 #endif
56
 #endif
63
 #undef TEST1
57
 #undef TEST1
64
 #undef TEST2
58
 #undef TEST2
2202
   + (ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(IS_RRD_FG_SC)) \
2196
   + (ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(IS_RRD_FG_SC)) \
2203
   + (ENABLED(ULTRA_LCD) && DISABLED(IS_ULTRA_LCD)) \
2197
   + (ENABLED(ULTRA_LCD) && DISABLED(IS_ULTRA_LCD)) \
2204
   + (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
2198
   + (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
2205
-  + (ENABLED(MINIPANEL) && DISABLED(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
2199
+  + (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
2206
   + (ENABLED(MKS_MINI_12864) && DISABLED(MKS_LCD12864)) \
2200
   + (ENABLED(MKS_MINI_12864) && DISABLED(MKS_LCD12864)) \
2207
   + (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
2201
   + (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
2208
   + (ENABLED(ULTIPANEL) && DISABLED(IS_ULTIPANEL)) \
2202
   + (ENABLED(ULTIPANEL) && DISABLED(IS_ULTIPANEL)) \

+ 1
- 1
Marlin/src/pins/ramps/pins_RAMPS_PLUS.h 查看文件

74
 #undef E0_CS_PIN
74
 #undef E0_CS_PIN
75
 #undef E1_CS_PIN
75
 #undef E1_CS_PIN
76
 
76
 
77
-#if ENABLED(ULTRA_LCD, REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(NEWPANEL, PANEL_ONE)
77
+#if ENABLED(ULTRA_LCD) && NONE(REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(NEWPANEL, PANEL_ONE)
78
   #if DISABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
78
   #if DISABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
79
     #undef LCD_PINS_RS
79
     #undef LCD_PINS_RS
80
     #define LCD_PINS_RS                       42  // 3DYMY boards pin 16 -> 42
80
     #define LCD_PINS_RS                       42  // 3DYMY boards pin 16 -> 42

+ 1
- 1
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h 查看文件

174
   #define LCD_PINS_D6                         32
174
   #define LCD_PINS_D6                         32
175
   #define LCD_PINS_D7                         30
175
   #define LCD_PINS_D7                         30
176
 
176
 
177
-#elif ENABLED(BOARD_REV_1_5, ULTRA_LCD)
177
+#elif BOTH(BOARD_REV_1_5, ULTRA_LCD)
178
 
178
 
179
   #define BEEPER_PIN                          18
179
   #define BEEPER_PIN                          18
180
 
180
 

+ 1
- 1
buildroot/share/vscode/avrdude.conf 查看文件

151
 #
151
 #
152
 # INSTRUCTION FORMATS
152
 # INSTRUCTION FORMATS
153
 #
153
 #
154
-#    Instruction formats are specified as a comma seperated list of
154
+#    Instruction formats are specified as a comma separated list of
155
 #    string values containing information (bit specifiers) about each
155
 #    string values containing information (bit specifiers) about each
156
 #    of the 32 bits of the instruction.  Bit specifiers may be one of
156
 #    of the 32 bits of the instruction.  Bit specifiers may be one of
157
 #    the following formats:
157
 #    the following formats:

+ 1
- 1
buildroot/share/vscode/avrdude_linux.conf 查看文件

151
 #
151
 #
152
 # INSTRUCTION FORMATS
152
 # INSTRUCTION FORMATS
153
 #
153
 #
154
-#    Instruction formats are specified as a comma seperated list of
154
+#    Instruction formats are specified as a comma separated list of
155
 #    string values containing information (bit specifiers) about each
155
 #    string values containing information (bit specifiers) about each
156
 #    of the 32 bits of the instruction.  Bit specifiers may be one of
156
 #    of the 32 bits of the instruction.  Bit specifiers may be one of
157
 #    the following formats:
157
 #    the following formats:

+ 1
- 1
buildroot/share/vscode/avrdude_macOS.conf 查看文件

151
 #
151
 #
152
 # INSTRUCTION FORMATS
152
 # INSTRUCTION FORMATS
153
 #
153
 #
154
-#    Instruction formats are specified as a comma seperated list of
154
+#    Instruction formats are specified as a comma separated list of
155
 #    string values containing information (bit specifiers) about each
155
 #    string values containing information (bit specifiers) about each
156
 #    of the 32 bits of the instruction.  Bit specifiers may be one of
156
 #    of the 32 bits of the instruction.  Bit specifiers may be one of
157
 #    the following formats:
157
 #    the following formats:

Loading…
取消
儲存