Merge pull request #72 from BCN3D/develop

Merge develop into master
BCN3D · Nov 23, 2021 · 4bb8a0e · 4bb8a0e
2 parents 438f949 + 61c27ee
commit 4bb8a0e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
@@ -8903,25 +8903,6 @@ inline void gcode_G293(){//BCN3D Mesh Bed leveling piezo
   const float x_probe_mesh_points[3] = {start_x, start_x + shift_x, start_x + shift_x*2};
   const float y_probe_mesh_points[3] = {start_y, start_y + shift_y, start_y + shift_y*2};
 
-
-	current_position[X_AXIS] += x_gap_avoid_collision_l;
-	planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], MMM_TO_MMS(9000), 0);
-
-
-	active_extruder=1;
-	set_axis_is_at_home(X_AXIS); 
-	SERIAL_PROTOCOLLN(current_position[X_AXIS]);
-	planner.set_position_mm(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS],current_position[E_AXIS]);
-	current_position[X_AXIS]-=x_gap_avoid_collision_r;
-	planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], MMM_TO_MMS(9000), 1);
-
-	active_extruder=0;
-	set_axis_is_at_home(X_AXIS);
-	current_position[X_AXIS]+=x_gap_avoid_collision_l;
-	planner.set_position_mm(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS],current_position[E_AXIS]); // We are now at position
-	planner.synchronize();
-
-
 	SERIAL_PROTOCOLPGM("Zvalue after home: ");
 	SERIAL_PROTOCOLLN(current_position[Z_AXIS]);
   float mesh_z_points[3][3];
@@ -11375,7 +11356,13 @@ inline void gcode_M75() { print_job_timer.start(); }
 /**
  * M76: Pause print timer
  */
-inline void gcode_M76() { print_job_timer.pause(); }
+inline void gcode_M76() { 
+  #ifdef BCN3D_MOD
+  return;
+  #else
+  print_job_timer.pause(); 
+  #endif
+}
 
 /**
  * M77: Stop print timer

diff --git a/Marlin/Version.h b/Marlin/Version.h
@@ -36,7 +36,7 @@
    * Marlin release version identifier
    */
 
-  #define SHORT_BUILD_VERSION "v0.11.4"
+  #define SHORT_BUILD_VERSION "v0.12.0"
 
   /**
    * Verbose version identifier which should contain a reference to the location

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,11 @@
+## [v0.12.0] - 2021-11-23
+### Fixed
+- Mesh Mapping G293 does not move the right extruder close to the silicon cloth.
+
+### Changed
+- M76 old functionality deprecated, now used to pause printjobs via Stratos Slicer.
+- Updated Marlin version to v0.12.0.
+
 ## [v0.11.4] - 2021-10-28
 ### Added
 - M505 created. Does a M500 to save in EEPROM and then sends a message to the embedded for resetting the controller safely.
@@ -20,3 +28,4 @@
 
 [v0.11.3]: https://github.com/BCN3D/Marlin/releases/tag/v0.11.3
 [v0.11.4]: https://github.com/BCN3D/Marlin/releases/tag/v0.11.4
+[v0.12.0]: https://github.com/BCN3D/Marlin/releases/tag/v0.12.0