Skip to content

Commit ab42819

Browse files
committed
tailored error message
1 parent 4ef26df commit ab42819

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

Marlin/src/pins/lpc1768/env_validate.h

+7-4
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,17 @@
2222
#ifndef ENV_VALIDATE_H
2323
#define ENV_VALIDATE_H
2424

25-
#if DISABLED(REQUIRE_EITHER_LPC1768_OR_LPC1769)
26-
#if ENABLED(REQUIRE_LPC1769) && NOT_TARGET(MCU_LPC1769)
25+
#if NOT_TARGET(MCU_LPC1768, MCU_LPC1769)
26+
#if ENABLED(ALLOW_LPC1768_OR_9)
27+
#error "Oops! Make sure you have the LPC1768 or LPC1769 environment selected in your IDE."
28+
#elif ENABLED(REQUIRE_LPC1769)
2729
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
28-
#elif DISABLED(REQUIRE_LPC1769) && NOT_TARGET(MCU_LPC1768)
30+
#else
2931
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
3032
#endif
3133
#endif
3234

35+
#undef ALLOW_LPC1768_OR_9
3336
#undef REQUIRE_LPC1769
34-
#undef REQUIRE_EITHER_LPC1768_OR_LPC1769
37+
3538
#endif // ENV_VALIDATE_H

Marlin/src/pins/lpc1768/pins_MKS_SBASE.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* Makerbase MKS SBASE pin assignments
2626
*/
2727

28-
#define REQUIRE_EITHER_LPC1768_OR_LPC1769
28+
#define ALLOW_LPC1768_OR_9
2929
#include "env_validate.h"
3030

3131
#ifndef BOARD_INFO_NAME

Marlin/src/pins/lpc1769/env_validate.h

+6-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@
2222
#ifndef ENV_VALIDATE_H
2323
#define ENV_VALIDATE_H
2424

25-
#if NOT_TARGET(MCU_LPC1769) && DISABLED(REQUIRE_EITHER_LPC1768_OR_LPC1769)
25+
#if ENABLED(ALLOW_LPC1768_OR_9) && NOT_TARGET(MCU_LPC1768, MCU_LPC1769)
26+
#error "Oops! Make sure you have the LPC1768 or LPC1769 environment selected in your IDE."
27+
#elif NOT_TARGET(MCU_LPC1769)
2628
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
2729
#endif
2830

29-
#undef REQUIRE_EITHER_LPC1768_OR_LPC1769
30-
#endif //ENV_VALIDATE_H
31+
#undef ALLOW_LPC1768_OR_9
32+
33+
#endif // ENV_VALIDATE_H

Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* See https://smoothieware.github.io/Webif-pack/documentation/web/html/smoothieboard.html
2727
*/
2828

29-
#define REQUIRE_EITHER_LPC1768_OR_LPC1769
29+
#define ALLOW_LPC1768_OR_9
3030
#include "env_validate.h"
3131

3232
#define BOARD_INFO_NAME "Smoothieboard"

0 commit comments

Comments
 (0)