Commit 6b4b67c2 authored by Franco (nextime) Lanza's avatar Franco (nextime) Lanza

Merge branch 'master' into nextime

parents c31f3841 18664abd
Pipeline #85 skipped
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
* either sets a Sane Default, or results in No Change to the existing value. * either sets a Sane Default, or results in No Change to the existing value.
* *
*/ */
#include "base.h" #include "base.h"
#define EEPROM_VERSION "MKV428" #define EEPROM_VERSION "MKV428"
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
* "G" Codes * "G" Codes
* *
* G0 -> G1 except for laser where G0 is "move without firing" * G0 -> G1 except for laser where G0 is "move without firing"
* G1 - Coordinated Movement X Y Z E, for laser move by firing * G1 - Coordinated Movement X Y Z E F(feedrate) P(Purge), for laser move by firing
* G2 - CW ARC * G2 - CW ARC
* G3 - CCW ARC * G3 - CCW ARC
* G4 - Dwell S[seconds] or P[milliseconds], delay in Second or Millisecond * G4 - Dwell S[seconds] or P[milliseconds], delay in Second or Millisecond
...@@ -209,6 +209,7 @@ ...@@ -209,6 +209,7 @@
*/ */
#include "base.h" #include "base.h"
#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM) #if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
#include <Wire.h> #include <Wire.h>
#endif #endif
......
...@@ -1870,6 +1870,8 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio ...@@ -1870,6 +1870,8 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
delta_tower3_y = (delta_radius + tower_adj[5]) * sin((90 + tower_adj[2]) * M_PI/180); delta_tower3_y = (delta_radius + tower_adj[5]) * sin((90 + tower_adj[2]) * M_PI/180);
} }
#if ENABLED(Z_PROBE_ENDSTOP)
bool Equal_AB(const float A, const float B, const float prec = ac_prec) { bool Equal_AB(const float A, const float B, const float prec = ac_prec) {
if (abs(A - B) <= prec) return true; if (abs(A - B) <= prec) return true;
return false; return false;
...@@ -1920,16 +1922,6 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio ...@@ -1920,16 +1922,6 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
} }
} }
// Reset calibration results to zero.
static void reset_bed_level() {
if (DEBUGGING(INFO)) ECHO_LM(INFO, "reset_bed_level");
for (int y = 0; y < AUTO_BED_LEVELING_GRID_POINTS; y++) {
for (int x = 0; x < AUTO_BED_LEVELING_GRID_POINTS; x++) {
bed_level[x][y] = 0.0;
}
}
}
static void deploy_z_probe() { static void deploy_z_probe() {
if (DEBUGGING(INFO)) DEBUG_POS("deploy_z_probe", current_position); if (DEBUGGING(INFO)) DEBUG_POS("deploy_z_probe", current_position);
...@@ -2638,6 +2630,18 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio ...@@ -2638,6 +2630,18 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
ECHO_E; ECHO_E;
} }
#endif
// Reset calibration results to zero.
static void reset_bed_level() {
if (DEBUGGING(INFO)) ECHO_LM(INFO, "reset_bed_level");
for (int y = 0; y < AUTO_BED_LEVELING_GRID_POINTS; y++) {
for (int x = 0; x < AUTO_BED_LEVELING_GRID_POINTS; x++) {
bed_level[x][y] = 0.0;
}
}
}
static void home_delta_axis() { static void home_delta_axis() {
set_destination_to_current(); set_destination_to_current();
...@@ -5626,6 +5630,7 @@ inline void gcode_M81() { ...@@ -5626,6 +5630,7 @@ inline void gcode_M81() {
laser_peripherals_off(); laser_peripherals_off();
#endif #endif
#endif #endif
delay_ms(1000); // Wait 1 second before switching off delay_ms(1000); // Wait 1 second before switching off
#if HAS(SUICIDE) #if HAS(SUICIDE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment