Apply FIXFLOAT macro
This commit is contained in:
parent
6cac0f43eb
commit
4487d22d56
|
@ -2287,7 +2287,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
SERIAL_PROTOCOLPGM(" Y: ");
|
SERIAL_PROTOCOLPGM(" Y: ");
|
||||||
SERIAL_PROTOCOL_F(y, 3);
|
SERIAL_PROTOCOL_F(y, 3);
|
||||||
SERIAL_PROTOCOLPGM(" Z: ");
|
SERIAL_PROTOCOLPGM(" Z: ");
|
||||||
SERIAL_PROTOCOL_F(measured_z - -zprobe_zoffset + 0.0001, 3);
|
SERIAL_PROTOCOL_F(FIXFLOAT(measured_z - -zprobe_zoffset), 3);
|
||||||
SERIAL_EOL;
|
SERIAL_EOL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4499,11 +4499,11 @@ inline void gcode_G28() {
|
||||||
float measured_z = probe_pt(X_probe_location, Y_probe_location, stow, 1);
|
float measured_z = probe_pt(X_probe_location, Y_probe_location, stow, 1);
|
||||||
|
|
||||||
SERIAL_PROTOCOLPGM("Bed X: ");
|
SERIAL_PROTOCOLPGM("Bed X: ");
|
||||||
SERIAL_PROTOCOL(X_probe_location + 0.0001);
|
SERIAL_PROTOCOL(FIXFLOAT(X_probe_location));
|
||||||
SERIAL_PROTOCOLPGM(" Y: ");
|
SERIAL_PROTOCOLPGM(" Y: ");
|
||||||
SERIAL_PROTOCOL(Y_probe_location + 0.0001);
|
SERIAL_PROTOCOL(FIXFLOAT(Y_probe_location));
|
||||||
SERIAL_PROTOCOLPGM(" Z: ");
|
SERIAL_PROTOCOLPGM(" Z: ");
|
||||||
SERIAL_PROTOCOLLN(measured_z - -zprobe_zoffset + 0.0001);
|
SERIAL_PROTOCOLLN(FIXFLOAT(measured_z - -zprobe_zoffset));
|
||||||
|
|
||||||
clean_up_after_endstop_or_probe_move();
|
clean_up_after_endstop_or_probe_move();
|
||||||
|
|
||||||
|
|
|
@ -138,5 +138,6 @@
|
||||||
#define NEAR(x,y) NEAR_ZERO((x)-(y))
|
#define NEAR(x,y) NEAR_ZERO((x)-(y))
|
||||||
|
|
||||||
#define RECIPROCAL(x) (NEAR_ZERO(x) ? 0.0 : 1.0 / (x))
|
#define RECIPROCAL(x) (NEAR_ZERO(x) ? 0.0 : 1.0 / (x))
|
||||||
|
#define FIXFLOAT(f) (f + 0.00001)
|
||||||
|
|
||||||
#endif //__MACROS_H
|
#endif //__MACROS_H
|
||||||
|
|
|
@ -543,7 +543,7 @@ static void lcd_implementation_status_screen() {
|
||||||
if (page.page == 0) {
|
if (page.page == 0) {
|
||||||
strcpy(xstring, ftostr4sign(current_position[X_AXIS]));
|
strcpy(xstring, ftostr4sign(current_position[X_AXIS]));
|
||||||
strcpy(ystring, ftostr4sign(current_position[Y_AXIS]));
|
strcpy(ystring, ftostr4sign(current_position[Y_AXIS]));
|
||||||
strcpy(zstring, ftostr52sp(current_position[Z_AXIS] + 0.00001));
|
strcpy(zstring, ftostr52sp(FIXFLOAT(current_position[Z_AXIS])));
|
||||||
#if ENABLED(FILAMENT_LCD_DISPLAY) && DISABLED(SDSUPPORT)
|
#if ENABLED(FILAMENT_LCD_DISPLAY) && DISABLED(SDSUPPORT)
|
||||||
strcpy(wstring, ftostr12ns(filament_width_meas));
|
strcpy(wstring, ftostr12ns(filament_width_meas));
|
||||||
strcpy(mstring, itostr3(100.0 * volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
|
strcpy(mstring, itostr3(100.0 * volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
|
||||||
|
|
|
@ -729,7 +729,7 @@ static void lcd_implementation_status_screen() {
|
||||||
|
|
||||||
lcd.setCursor(LCD_WIDTH - 8, 1);
|
lcd.setCursor(LCD_WIDTH - 8, 1);
|
||||||
_draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink);
|
_draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink);
|
||||||
lcd.print(ftostr52sp(current_position[Z_AXIS] + 0.00001));
|
lcd.print(ftostr52sp(FIXFLOAT(current_position[Z_AXIS])));
|
||||||
|
|
||||||
#endif // LCD_HEIGHT > 2
|
#endif // LCD_HEIGHT > 2
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue