3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cleanup Nozzle class, fix XY vs Z move order

Browse source
This commit is contained in:
Scott Lahteine 2017-11-03 20:50:44 -05:00
parent 95296191a2
commit 267c247da7
3 changed files with 151 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Marlin/point_t.h
View file

@ -31,22 +31,9 @@
* @param x The x-coordinate of the point.
* @param y The y-coordinate of the point.
* @param z The z-coordinate of the point.
* @param e The e-coordinate of the point.
*/
struct point_t {
float x;
float y;
float z;
float e;
/**
* @brief Two dimensional point constructor
*
* @param x The x-coordinate of the point.
* @param y The y-coordinate of the point.
*/
point_t(float const x, float const y)
: point_t(x, y, NAN, NAN) {}
float x, y, z;
/**
* @brief Three dimensional point constructor
@ -55,23 +42,16 @@ struct point_t {
* @param y The y-coordinate of the point.
* @param z The z-coordinate of the point.
*/
point_t(float const x, float const y, float const z)
: point_t(x, y, z, NAN) {}
point_t(const float x, const float y, const float z) : x(x), y(y), z(z) {}
/**
* @brief Tree dimensional point constructor with extrusion length
* @brief Two dimensional point constructor
*
* @param x The x-coordinate of the point.
* @param y The y-coordinate of the point.
* @param z The z-coordinate of the point.
* @param e The e-coordinate of the point.
*/
point_t(float const x, float const y, float const z, float const e) {
this->x = x;
this->y = y;
this->z = z;
this->e = e;
}
point_t(const float x, const float y) : point_t(x, y, NAN) {}
};
#endif // __POINT_T__