3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1913 from mkbel/fix_spelling

Browse Source 
Fix spelling.
This commit is contained in:
DRracer 2019-06-13 15:12:30 +02:00 committed by GitHub
commit 55dc78546b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Marlin_main.cpp
View File

@ -8229,7 +8229,7 @@ void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_poi
float bed_zero_ref_y = (-0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER); float bed_zero_ref_y = (-0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER);
float mesh_home_z_search = 4; float mesh_home_z_search = 4;
float measure_z_heigth = 0.2f; float measure_z_height = 0.2f;
float row[x_points_num]; float row[x_points_num];
int ix = 0; int ix = 0;
int iy = 0; int iy = 0;
@ -8264,7 +8264,7 @@ void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_poi
} }
st_synchronize(); st_synchronize();
*/ */
destination[Z_AXIS] = measure_z_heigth; destination[Z_AXIS] = measure_z_height;
plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], Z_LIFT_FEEDRATE, active_extruder);
for(int8_t i=0; i < NUM_AXIS; i++) { for(int8_t i=0; i < NUM_AXIS; i++) {
current_position[i] = destination[i]; current_position[i] = destination[i];

12
Firmware/first_lay_cal.cpp
View File

@ -128,19 +128,19 @@ void lay1cal_before_meander()
//! @brief Count extrude length //! @brief Count extrude length
//! //!
//! @param layer_heigth layer heigth in mm //! @param layer_height layer height in mm
//! @param extrusion_width extrusion width in mm //! @param extrusion_width extrusion width in mm
//! @param extrusion_length extrusion length in mm //! @param extrusion_length extrusion length in mm
//! @return filament length in mm which needs to be extruded to form line //! @return filament length in mm which needs to be extruded to form line
static constexpr float count_e(float layer_heigth, float extrusion_width, float extrusion_length) static constexpr float count_e(float layer_height, float extrusion_width, float extrusion_length)
{ {
return (extrusion_length * layer_heigth * extrusion_width / (M_PI * pow(1.75, 2) / 4)); return (extrusion_length * layer_height * extrusion_width / (M_PI * pow(1.75, 2) / 4));
} }
static const float width = 0.4; //!< line width static const float width = 0.4; //!< line width
static const float length = 20 - width; //!< line length static const float length = 20 - width; //!< line length
static const float heigth = 0.2; //!< layer height TODO This is wrong, as current Z height is 0.15 mm static const float height = 0.2; //!< layer height TODO This is wrong, as current Z height is 0.15 mm
static const float extr = count_e(heigth, width, length); //!< E axis movement needed to print line static const float extr = count_e(height, width, length); //!< E axis movement needed to print line
//! @brief Print meander //! @brief Print meander
//! @param cmd_buffer character buffer needed to format gcodes //! @param cmd_buffer character buffer needed to format gcodes
@ -199,7 +199,7 @@ void lay1cal_meander(char *cmd_buffer)
//! @param i iteration //! @param i iteration
void lay1cal_square(char *cmd_buffer, uint8_t i) void lay1cal_square(char *cmd_buffer, uint8_t i)
{ {
const float extr_short_segment = count_e(heigth, width, width); const float extr_short_segment = count_e(height, width, width);
static const char fmt1[] PROGMEM = "G1 X%d Y%-.2f E%-.3f"; static const char fmt1[] PROGMEM = "G1 X%d Y%-.2f E%-.3f";
static const char fmt2[] PROGMEM = "G1 Y%-.2f E%-.3f"; static const char fmt2[] PROGMEM = "G1 Y%-.2f E%-.3f";