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

Merge pull request #7591 from thinkyhead/bf1_misc_patches

Browse source 
M111: no args reports current flags
This commit is contained in:
Scott Lahteine 2017-08-31 15:19:29 -05:00 committed by GitHub
parent 41e4de62b3 8a184a526a
commit 367e1b54ba
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Marlin/Conditionals_post.h
View file

@ -28,6 +28,10 @@
#ifndef CONDITIONALS_POST_H #ifndef CONDITIONALS_POST_H
#define CONDITIONALS_POST_H #define CONDITIONALS_POST_H
#define IS_SCARA (ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA))
#define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
#define IS_CARTESIAN !IS_KINEMATIC
/** /**
* Axis lengths and center * Axis lengths and center
*/ */
@ -43,6 +47,12 @@
#define Y_BED_SIZE Y_MAX_LENGTH #define Y_BED_SIZE Y_MAX_LENGTH
#endif #endif
// Require 0,0 bed center for Delta and SCARA
#if IS_KINEMATIC
#define BED_CENTER_AT_0_0
#endif
// Define center values for future use
#if ENABLED(BED_CENTER_AT_0_0) #if ENABLED(BED_CENTER_AT_0_0)
#define X_CENTER 0 #define X_CENTER 0
#define Y_CENTER 0 #define Y_CENTER 0
@ -52,6 +62,7 @@
#endif #endif
#define Z_CENTER ((Z_MIN_POS + Z_MAX_POS) / 2) #define Z_CENTER ((Z_MIN_POS + Z_MAX_POS) / 2)
// Get the linear boundaries of the bed
#define X_MIN_BED (X_CENTER - (X_BED_SIZE) / 2) #define X_MIN_BED (X_CENTER - (X_BED_SIZE) / 2)
#define X_MAX_BED (X_CENTER + (X_BED_SIZE) / 2) #define X_MAX_BED (X_CENTER + (X_BED_SIZE) / 2)
#define Y_MIN_BED (Y_CENTER - (Y_BED_SIZE) / 2) #define Y_MIN_BED (Y_CENTER - (Y_BED_SIZE) / 2)
@ -85,10 +96,6 @@
#endif #endif
#endif #endif
#define IS_SCARA (ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA))
#define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
#define IS_CARTESIAN !IS_KINEMATIC
/** /**
* No adjustable bed on non-cartesians * No adjustable bed on non-cartesians
*/ */

21
Marlin/Marlin_main.cpp
View file

@ -5567,7 +5567,7 @@ void home_all_axes() { gcode_G28(true); }
N++; N++;
} }
zero_std_dev_old = zero_std_dev; zero_std_dev_old = zero_std_dev;
zero_std_dev = round(sqrt(S2 / N) * 1000.0) / 1000.0 + 0.00001; zero_std_dev = round(SQRT(S2 / N) * 1000.0) / 1000.0 + 0.00001;
// Solve matrices // Solve matrices
@ -7753,16 +7753,17 @@ inline void gcode_M110() {
* M111: Set the debug level * M111: Set the debug level
*/ */
inline void gcode_M111() { inline void gcode_M111() {
marlin_debug_flags = parser.byteval('S', (uint8_t)DEBUG_NONE); if (parser.seen('S')) marlin_debug_flags = parser.byteval('S');
const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO; const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO,
const static char str_debug_2[] PROGMEM = MSG_DEBUG_INFO; str_debug_2[] PROGMEM = MSG_DEBUG_INFO,
const static char str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS; str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS,
const static char str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN; str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN,
const static char str_debug_16[] PROGMEM = MSG_DEBUG_COMMUNICATION; str_debug_16[] PROGMEM = MSG_DEBUG_COMMUNICATION
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
const static char str_debug_32[] PROGMEM = MSG_DEBUG_LEVELING; , str_debug_32[] PROGMEM = MSG_DEBUG_LEVELING
#endif #endif
;
const static char* const debug_strings[] PROGMEM = { const static char* const debug_strings[] PROGMEM = {
str_debug_1, str_debug_2, str_debug_4, str_debug_8, str_debug_16 str_debug_1, str_debug_2, str_debug_4, str_debug_8, str_debug_16