SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7212 from thinkyhead/bf_m48_real_probe

Browse source 
M48 needs a real probe
This commit is contained in:
Scott Lahteine 2017-07-02 16:22:47 -05:00 committed by GitHub
commit 015839fc50
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/Marlin_main.cpp
View file

@ -906,12 +906,6 @@ void setup_killpin() {
#endif #endif
void setup_homepin(void) {
#if HAS_HOME
SET_INPUT_PULLUP(HOME_PIN);
#endif
}
void setup_powerhold() { void setup_powerhold() {
#if HAS_SUICIDE #if HAS_SUICIDE
OUT_WRITE(SUICIDE_PIN, HIGH); OUT_WRITE(SUICIDE_PIN, HIGH);
@ -13008,7 +13002,9 @@ void setup() {
OUT_WRITE(SOL1_PIN, LOW); // turn it off OUT_WRITE(SOL1_PIN, LOW); // turn it off
#endif #endif
setup_homepin(); #if HAS_HOME
SET_INPUT_PULLUP(HOME_PIN);
#endif
#if PIN_EXISTS(STAT_LED_RED) #if PIN_EXISTS(STAT_LED_RED)
OUT_WRITE(STAT_LED_RED_PIN, LOW); // turn it off OUT_WRITE(STAT_LED_RED_PIN, LOW); // turn it off

6
Marlin/SanityCheck.h
View file

@ -599,12 +599,14 @@ static_assert(1 >= 0
#else #else
#error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo." #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
#endif #endif
#elif ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
#error "Z_MIN_PROBE_REPEATABILITY_TEST requires a probe: FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
#endif #endif
#endif #endif
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST) && !HAS_BED_PROBE
#error "Z_MIN_PROBE_REPEATABILITY_TEST requires a probe: FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
#endif
/** /**
* Allow only one bed leveling option to be defined * Allow only one bed leveling option to be defined
*/ */