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

Omit unused UBL motion code

Browse source
This commit is contained in:
Scott Lahteine 2017-12-09 07:55:55 -06:00
parent 3255712343
commit 6d0678d963
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/src/feature/bedlevel/ubl/ubl.h
View file

@ -321,8 +321,11 @@ class unified_bed_leveling {
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);
} }
static void line_to_destination_cartesian(const float &fr, const uint8_t e); #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);
#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))

6
Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
View file

@ -41,6 +41,8 @@
extern void set_current_from_destination(); extern void set_current_from_destination();
#endif #endif
#if !UBL_SEGMENTED
void unified_bed_leveling::line_to_destination_cartesian(const float &feed_rate, const uint8_t extruder) { 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
@ -405,7 +407,7 @@
set_current_from_destination(); set_current_from_destination();
} }
#if UBL_SEGMENTED #else // UBL_SEGMENTED
#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;
@ -621,6 +623,6 @@
} // cell loop } // cell loop
} }
#endif // UBL_SEGMENTED #endif // UBL_SEGMENTED
#endif // AUTO_BED_LEVELING_UBL #endif // AUTO_BED_LEVELING_UBL