jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump

Browse Source
This commit is contained in:
InsanityAutomation
2019-09-08 19:57:39 -04:00
parent ed5cc1a0c0
commit 9291b46600
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration.h
+5 -7
View File
@@ -15,8 +15,8 @@
//#define MachineCR20Pro
//#define MachineCR10
//#define MachineCR10S
//#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66
#define MachineCRX
#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66
//#define MachineCRX
//#define MachineCR10Max
//#define MachineS4
//#define MachineS5
@@ -33,7 +33,7 @@
//#define GraphicLCD //Full graphics LCD for Ender 4, CR-X or CR10SPro
//#define ForceCRXDisplay
#define Force10SProDisplay
//#define Force10SProDisplay
//#define AddonFilSensor //Adds a filamnt runout sensor to the CR20 or Ender 4
//#define lerdgeFilSensor //Using lerdge filament sensor, which is opposite polarity to stock
@@ -102,7 +102,7 @@
*/
//#define ABL_EZABL // TH3D EZABL or Any NO Sensor
//#define ABL_NCSW //Creality ABL or Any NC Sensor
#define ABL_BLTOUCH
//#define ABL_BLTOUCH
//#define CREALITY_ABL_MOUNT //Using creality ABL mount
//#define E3D_DUALFAN_MOUNT // Using HD Modular mount as above with 2 5015 blowers and sensor on the right
@@ -225,8 +225,6 @@
#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard))
#define SHOW_BOOTSCREEN
#endif
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
#define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2
/**
* *** VENDORS PLEASE READ ***
@@ -1981,7 +1979,7 @@
//===========================================================================
//========================= Unified Bed Leveling ============================
//===========================================================================
#define MIN_PROBE_EDGE 1
#define MESH_INSET MIN_PROBE_EDGE
#if NONE(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, OrigLCD) || ENABLED(GraphicLCD)
#define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh
#endif
Marlin/src/gcode/bedlevel/G42.cpp
+6 -4
View File
@@ -47,10 +47,12 @@ void GcodeSuite::G42() {
set_destination_from_current();
if (hasI) destination[X_AXIS] = _GET_MESH_X(ix);
if (hasJ) destination[Y_AXIS] = _GET_MESH_Y(iy);
if (parser.boolval('P')) {
if (hasI) destination[X_AXIS] -= zprobe_offset[X_AXIS];
if (hasJ) destination[Y_AXIS] -= zprobe_offset[Y_AXIS];
}
#if HAS_BED_PROBE
if (parser.boolval('P')) {
if (hasI) destination[X_AXIS] -= zprobe_offset[X_AXIS];
if (hasJ) destination[Y_AXIS] -= zprobe_offset[Y_AXIS];
}
#endif
const float fval = parser.linearval('F');
if (fval > 0.0) feedrate_mm_s = MMM_TO_MMS(fval);
Marlin/src/inc/Version.h
+1 -1
View File
@@ -38,7 +38,7 @@
/**
* Marlin release version identifier
*/
#define SHORT_BUILD_VERSION "2.0_DW2"
#define SHORT_BUILD_VERSION "2.0_DW3"
/**
* Verbose version identifier which should contain a reference to the location
Marlin/src/module/configuration_store.cpp
+1 -3
View File
@@ -616,9 +616,7 @@ void MarlinSettings::postprocess() {
_FIELD_TEST(zprobe_offset[Z_AXIS]);
#if !HAS_BED_PROBE
const float zprobe_offset[X_AXIS] = 0;
const float zprobe_offset[Y_AXIS] = 0;
const float zprobe_offset[Z_AXIS] = 0;
const float zprobe_offset[XYZ] = {0};
#endif
EEPROM_WRITE(zprobe_offset[X_AXIS]);
EEPROM_WRITE(zprobe_offset[Y_AXIS]);