MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

One or the other?

Browse Source
This commit is contained in:
Scott Lahteine 2017-12-09 03:34:41 -06:00
parent a20eacaa48
commit 5cce532a29
2 changed files with 338 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/ubl.h
View File

@ -326,8 +326,11 @@
return i < GRID_MAX_POINTS_Y ? pgm_read_float(&_mesh_index_to_ypos[i]) : MESH_MIN_Y + i * (MESH_Y_DIST); return i < GRID_MAX_POINTS_Y ? pgm_read_float(&_mesh_index_to_ypos[i]) : MESH_MIN_Y + i * (MESH_Y_DIST);
} }
#if UBL_SEGMENTED
static bool prepare_segmented_line_to(const float (&rtarget)[XYZE], const float &feedrate); static bool prepare_segmented_line_to(const float (&rtarget)[XYZE], const float &feedrate);
static void line_to_destination_cartesian(const float &fr, uint8_t e); #else
static void line_to_destination_cartesian(const float &fr, const uint8_t e);
#endif
#define _CMPZ(a,b) (z_values[a][b] == z_values[a][b+1]) #define _CMPZ(a,b) (z_values[a][b] == z_values[a][b+1])
#define CMPZ(a) (_CMPZ(a, 0) && _CMPZ(a, 1)) #define CMPZ(a) (_CMPZ(a, 0) && _CMPZ(a, 1))

14
Marlin/ubl_motion.cpp
View File

@ -36,7 +36,9 @@
extern void set_current_from_destination(); extern void set_current_from_destination();
#endif #endif
void unified_bed_leveling::line_to_destination_cartesian(const float &feed_rate, uint8_t extruder) { #if !UBL_SEGMENTED
void unified_bed_leveling::line_to_destination_cartesian(const float &feed_rate, const uint8_t extruder) {
/** /**
* Much of the nozzle movement will be within the same cell. So we will do as little computation * Much of the nozzle movement will be within the same cell. So we will do as little computation
* as possible to determine if this is the case. If this move is within the same cell, we will * as possible to determine if this is the case. If this move is within the same cell, we will
@ -402,15 +404,7 @@
set_current_from_destination(); set_current_from_destination();
} }
#if UBL_SEGMENTED #else // UBL_SEGMENTED
// macro to inline copy exactly 4 floats, don't rely on sizeof operator
#define COPY_XYZE( target, source ) { \
target[X_AXIS] = source[X_AXIS]; \
target[Y_AXIS] = source[Y_AXIS]; \
target[Z_AXIS] = source[Z_AXIS]; \
target[E_AXIS] = source[E_AXIS]; \
}
#if IS_SCARA // scale the feed rate from mm/s to degrees/s #if IS_SCARA // scale the feed rate from mm/s to degrees/s
static float scara_feed_factor, scara_oldA, scara_oldB; static float scara_feed_factor, scara_oldA, scara_oldB;