zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Init tare pin once

Browse source
This commit is contained in:
Scott Lahteine 2020-12-27 16:23:18 -06:00
parent f423edd938
commit 45996fd20a
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/MarlinCore.cpp
View file

@ -193,7 +193,7 @@
#include "feature/runout.h" #include "feature/runout.h"
#endif #endif
#if HAS_Z_SERVO_PROBE #if EITHER(PROBE_TARE, HAS_Z_SERVO_PROBE)
#include "module/probe.h" #include "module/probe.h"
#endif #endif
@ -1119,6 +1119,10 @@ void setup() {
SETUP_RUN(ui.reset_status()); // Load welcome message early. (Retained if no errors exist.) SETUP_RUN(ui.reset_status()); // Load welcome message early. (Retained if no errors exist.)
#endif #endif
#if ENABLED(PROBE_TARE)
SETUP_RUN(probe.tare_init());
#endif
#if BOTH(SDSUPPORT, SDCARD_EEPROM_EMULATION) #if BOTH(SDSUPPORT, SDCARD_EEPROM_EMULATION)
SETUP_RUN(card.mount()); // Mount media with settings before first_load SETUP_RUN(card.mount()); // Mount media with settings before first_load
#endif #endif

14
Marlin/src/module/probe.cpp
View file

@ -510,6 +510,16 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
} }
#if ENABLED(PROBE_TARE) #if ENABLED(PROBE_TARE)
/**
* @brief Init the tare pin
*
* @details Init tare pin to ON state for a strain gauge, otherwise OFF
*/
void Probe::tare_init() {
OUT_WRITE(PROBE_TARE_PIN, !PROBE_TARE_STATE);
}
/** /**
* @brief Tare the Z probe * @brief Tare the Z probe
* *
@ -526,9 +536,9 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
#endif #endif
SERIAL_ECHOLNPGM("Taring probe"); SERIAL_ECHOLNPGM("Taring probe");
OUT_WRITE(PROBE_TARE_PIN, PROBE_TARE_STATE); WRITE(PROBE_TARE_PIN, PROBE_TARE_STATE);
delay(PROBE_TARE_TIME); delay(PROBE_TARE_TIME);
OUT_WRITE(PROBE_TARE_PIN, !PROBE_TARE_STATE); WRITE(PROBE_TARE_PIN, !PROBE_TARE_STATE);
delay(PROBE_TARE_DELAY); delay(PROBE_TARE_DELAY);
endstops.hit_on_purpose(); endstops.hit_on_purpose();

1
Marlin/src/module/probe.h
View file

@ -211,6 +211,7 @@ public:
#endif #endif
#if ENABLED(PROBE_TARE) #if ENABLED(PROBE_TARE)
static void tare_init();
static bool tare(); static bool tare();
#endif #endif