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

Merge pull request #7219 from thinkyhead/bf_update_git_scripts

Browse Source 
Update Marlin+git helper scripts
This commit is contained in:
Scott Lahteine
2017-07-03 01:49:27 -05:00
committed by GitHub
parent 94c965fad6 6a3967ee33
commit 57fff2e95e
14 changed files with 108 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin_main.cpp
View File

@ -2299,7 +2299,7 @@ static void clean_up_after_endstop_or_probe_move() {
* - Raise to the BETWEEN height
* - Return the probed Z position
*/
float probe_pt(const float &x, const float &y, const bool stow/*=true*/, const int verbose_level/*=1*/) {
float probe_pt(const float &x, const float &y, const bool stow, const uint8_t verbose_level) {
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR(">>> probe_pt(", x);
@ -4228,10 +4228,14 @@ void home_all_axes() { gcode_G28(true); }
*
* A Abort current leveling procedure
*
* W Write a mesh point. (Ignored during leveling.)
* X Required X for mesh point
* Y Required Y for mesh point
* Z Z for mesh point. Otherwise, current Z minus Z probe offset.
* Extra parameters with BILINEAR only:
*
* W Write a mesh point. (If G29 is idle.)
* I X index for mesh point
* J Y index for mesh point
* X X for mesh point, overrides I
* Y Y for mesh point, overrides J
* Z Z for mesh point. Otherwise, raw current Z.
*
* Without PROBE_MANUALLY:
*
@ -13031,6 +13035,10 @@ void setup() {
lcd_init();
#ifndef CUSTOM_BOOTSCREEN_TIMEOUT
#define CUSTOM_BOOTSCREEN_TIMEOUT 2500
#endif
#if ENABLED(SHOW_BOOTSCREEN)
#if ENABLED(DOGLCD) // On DOGM the first bootscreen is already drawn
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN)

2
Marlin/ubl_G29.cpp
View File

@ -51,7 +51,7 @@
extern float meshedit_done;
extern long babysteps_done;
extern float probe_pt(const float &x, const float &y, bool, int);
extern float probe_pt(const float &x, const float &y, const bool, const uint8_t);
extern bool set_probe_deployed(bool);
extern void set_bed_leveling_enabled(bool);
typedef void (*screenFunc_t)();