Fix: When there are both G90 and G91, the cross-light offset will be configured incorrectly

huang-w-y · scotthsl · commit 9bf2233c0262 · 2024-06-17T11:51:50.000+08:00
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
@@ -117,12 +117,13 @@ void GcodeSuite::get_destination_from_command() {
                 destination[i] += laser_crosslight_offset[i];
                 laser->ClearXyOffsetApplicationByIndex(i);
               }
-              if (!laser->GetXyOffsetApplication()) {
-                laser->SetWeakLightOriginMode(true);
-              }
+              // if (!laser->GetXyOffsetApplication()) {
+              //   laser->SetWeakLightOriginMode(true);
+              // }
             }
             else{
               destination[i] += laser_crosslight_offset[i];
+              laser->ClearXyOffsetApplicationByIndex(i);
             }
           }
         }
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
@@ -51,7 +51,7 @@
    * here we define this default string as the date where the latest release
    * version was tagged.
    */
-  #define STRING_DISTRIBUTION_DATE "2024-0528"
+  #define STRING_DISTRIBUTION_DATE "2024-0603"
 
   /**
    * Required minimum Configuration.h and Configuration_adv.h file versions.

Original file line number	Diff line number	Diff line change
`@@ -117,12 +117,13 @@ void GcodeSuite::get_destination_from_command() {`
`117`	`117`	`destination[i] += laser_crosslight_offset[i];`
`118`	`118`	`laser->ClearXyOffsetApplicationByIndex(i);`
`119`	`119`	`}`
`120`		`- if (!laser->GetXyOffsetApplication()) {`
`121`		`- laser->SetWeakLightOriginMode(true);`
`122`		`- }`
	`120`	`+ // if (!laser->GetXyOffsetApplication()) {`
	`121`	`+ // laser->SetWeakLightOriginMode(true);`
	`122`	`+ // }`
`123`	`123`	`}`
`124`	`124`	`else{`
`125`	`125`	`destination[i] += laser_crosslight_offset[i];`
	`126`	`+ laser->ClearXyOffsetApplicationByIndex(i);`
`126`	`127`	`}`
`127`	`128`	`}`
`128`	`129`	`}`