bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🧑‍💻 Apply axis conditionals

Browse Source
This commit is contained in:
Scott Lahteine
2022-01-02 09:22:36 -06:00
committed by Scott Lahteine
parent a732427329
commit 9956e62674
28 changed files with 215 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
View File

@ -45,7 +45,7 @@
#if PIN_EXISTS(MT_DET_2)
bool mt_det2_sta;
#endif
#if HAS_X_MIN || HAS_X_MAX
#if X_HOME_DIR
bool endstopx1_sta;
#else
constexpr static bool endstopx1_sta = true;
@ -55,7 +55,7 @@
#else
constexpr static bool endstopx2_sta = true;
#endif
#if HAS_Y_MIN || HAS_Y_MAX
#if HAS_Y_AXIS && Y_HOME_DIR
bool endstopy1_sta;
#else
constexpr static bool endstopy1_sta = true;
@ -65,7 +65,7 @@
#else
constexpr static bool endstopy2_sta = true;
#endif
#if HAS_Z_MIN || HAS_Z_MAX
#if HAS_Z_AXIS && Z_HOME_DIR
bool endstopz1_sta;
#else
constexpr static bool endstopz1_sta = true;

17
Marlin/src/lcd/extui/nextion/nextion_tft.cpp
View File

@ -430,25 +430,24 @@ void NextionTFT::PanelInfo(uint8_t req) {
break;
case 36: // Endstop Info
#if HAS_X_MIN
#if X_HOME_TO_MIN
SEND_VALasTXT("x1", READ(X_MIN_PIN) != X_MIN_ENDSTOP_INVERTING ? "triggered" : "open");
#endif
#if HAS_X_MAX
#elif X_HOME_TO_MAX
SEND_VALasTXT("x2", READ(X_MAX_PIN) != X_MAX_ENDSTOP_INVERTING ? "triggered" : "open");
#endif
#if HAS_Y_MIN
#if Y_HOME_TO_MIN
SEND_VALasTXT("y1", READ(Y_MIN_PIN) != Y_MIN_ENDSTOP_INVERTING ? "triggered" : "open");
#elif Y_HOME_TO_MAX
SEND_VALasTXT("y2", READ(X_MAX_PIN) != Y_MAX_ENDSTOP_INVERTING ? "triggered" : "open");
#endif
#if HAS_Z_MIN
#if Z_HOME_TO_MIN
SEND_VALasTXT("z1", READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING ? "triggered" : "open");
#endif
#if HAS_Z_MAX
#elif Z_HOME_TO_MAX
SEND_VALasTXT("z2", READ(Z_MAX_PIN) != Z_MAX_ENDSTOP_INVERTING ? "triggered" : "open");
#endif
#if HAS_Z2_MIN
SEND_VALasTXT("z2", READ(Z2_MIN_PIN) != Z2_MIN_ENDSTOP_INVERTING ? "triggered" : "open");
#endif
#if HAS_Z2_MAX
#elif HAS_Z2_MAX
SEND_VALasTXT("z2", READ(Z2_MAX_PIN) != Z2_MAX_ENDSTOP_INVERTING ? "triggered" : "open");
#endif
#if HAS_BED_PROBE