wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Update float conversion

Browse Source
This commit is contained in:
Knutwurst
2021-06-12 16:15:47 +02:00
parent 4172c90f07
commit 2bf9fc57cc
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration_adv.h
View File

@@ -635,7 +635,7 @@
#define Z_HOME_BUMP_MM 2 #define Z_HOME_BUMP_MM 2
#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate) #define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate)
//#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially //#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially
//#define HOMING_BACKOFF_MM { 2, 2, 2 } // (mm) Move away from the endstops after homing #define HOMING_BACKOFF_MM { 2, 2, 0 } // (mm) Move away from the endstops after homing
// When G28 is called, this option will make Y home before X // When G28 is called, this option will make Y home before X
//#define HOME_Y_BEFORE_X //#define HOME_Y_BEFORE_X

4
Marlin/src/inc/Version.h
View File

@@ -41,10 +41,10 @@
* here we define this default string as the date where the latest release * here we define this default string as the date where the latest release
* version was tagged. * version was tagged.
*/ */
#define CUSTOM_BUILD_VERSION "1.2.0-beta.4" #define CUSTOM_BUILD_VERSION "1.2.0-b_4.3"
#ifndef STRING_DISTRIBUTION_DATE #ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2021-06-05" #define STRING_DISTRIBUTION_DATE "2021-06-06"
#endif #endif
/** /**

14
Marlin/src/lcd/anycubic_touchscreen.cpp
View File

@@ -114,7 +114,7 @@ char _conv[8];
for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) { for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) {
for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) { for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
z_values[x][y] = (float)-2.0; z_values[x][y] = float(-2.0);
} }
} }
refresh_bed_level(); refresh_bed_level();
@@ -1990,7 +1990,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
{ {
queue.enqueue_now_P(PSTR("G28")); queue.enqueue_now_P(PSTR("G28"));
} else { } else {
destination.z = (float)(5.0); destination.z = float(5.0);
prepare_line_to_destination(); prepare_line_to_destination();
feedrate_mm_s = MMM_TO_MMS(3600.0f); feedrate_mm_s = MMM_TO_MMS(3600.0f);
@@ -1999,14 +1999,14 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
destination.y = _GET_MESH_Y(y); destination.y = _GET_MESH_Y(y);
prepare_line_to_destination(); prepare_line_to_destination();
destination.z = (float)(EXT_LEVEL_HIGH); destination.z = float(EXT_LEVEL_HIGH);
prepare_line_to_destination(); prepare_line_to_destination();
report_current_position(); report_current_position();
} }
} }
HARDWARE_SERIAL_PROTOCOLPGM("A29V "); HARDWARE_SERIAL_PROTOCOLPGM("A29V ");
HARDWARE_SERIAL_PROTOCOL_F((float)(Zvalue), 2); HARDWARE_SERIAL_PROTOCOL_F(float(Zvalue), 2);
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
} }
break; break;
@@ -2034,7 +2034,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
refresh_bed_level(); refresh_bed_level();
HARDWARE_SERIAL_PROTOCOLPGM("A31V "); HARDWARE_SERIAL_PROTOCOLPGM("A31V ");
HARDWARE_SERIAL_PROTOCOL_F((float)(probe.offset.z), 2); HARDWARE_SERIAL_PROTOCOL_F(float(probe.offset.z), 2);
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
} }
@@ -2042,7 +2042,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
{ {
SAVE_zprobe_zoffset = probe.offset.z; SAVE_zprobe_zoffset = probe.offset.z;
HARDWARE_SERIAL_PROTOCOLPGM("A31V "); HARDWARE_SERIAL_PROTOCOLPGM("A31V ");
HARDWARE_SERIAL_PROTOCOL_F((float)(SAVE_zprobe_zoffset), 2); HARDWARE_SERIAL_PROTOCOL_F(float(SAVE_zprobe_zoffset), 2);
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
} }
@@ -2078,7 +2078,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
if(CodeSeen('V')) if(CodeSeen('V'))
{ {
//z_values[x][y] = (float)constrain(CodeValue()/100,-10,10); //z_values[x][y] = (float)constrain(CodeValue()/100,-10,10);
float new_z_value = (float)constrain(CodeValue()/100,-10,10); float new_z_value = float(constrain(CodeValue()/100,-10,10));
z_values[x][y] = new_z_value; z_values[x][y] = new_z_value;
set_bed_leveling_enabled(true); set_bed_leveling_enabled(true);
refresh_bed_level(); refresh_bed_level();