Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-26 17:23:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Messing with work offset reporting. Passes all g54-offset regression tests

Browse Source
This commit is contained in:
Alden Hart
2017-02-07 06:01:47 -05:00
parent 0fc5762876
commit e21e583eb0
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/canonical_machine.cpp
+9 -7
View File
@@ -414,10 +414,12 @@ void cm_set_model_linenum(const uint32_t linenum)
* If you don;t want that, just set absolute_override false in the function call.
*/
float cm_get_active_coord_offset(const uint8_t axis, const cmAbsoluteOverride absolute_override)
float cm_get_active_coord_offset(const uint8_t axis, const bool use_absolute_override)
{
if (cm->gm.absolute_override == absolute_override) { // no offset if in absolute override mode
return (0.0);
if (use_absolute_override) {
if (cm->gm.absolute_override == use_absolute_override) { // no offset if in absolute override mode
return (0.0);
}
}
float offset = cm->offset[cm->gm.coord_system][axis] + cm->tl_offset[axis];
if (cm->gmx.origin_offset_enable == true) {
@@ -439,7 +441,7 @@ float cm_get_work_offset(const GCodeState_t *gcode_state, const uint8_t axis)
void cm_set_work_offsets(GCodeState_t *gcode_state)
{
for (uint8_t axis = AXIS_X; axis < AXES; axis++) {
gcode_state->work_offset[axis] = cm_get_active_coord_offset(axis, (cmAbsoluteOverride)false);
gcode_state->work_offset[axis] = cm_get_active_coord_offset(axis, false);
}
}
@@ -468,7 +470,7 @@ float cm_get_work_position(const GCodeState_t *gcode_state, const uint8_t axis)
float position;
if (gcode_state == MODEL) {
position = cm->gmx.position[axis] - cm_get_active_coord_offset(axis, (cmAbsoluteOverride)false);
position = cm->gmx.position[axis] - cm_get_active_coord_offset(axis, false);
} else {
position = mp_get_runtime_work_position(axis);
}
@@ -706,7 +708,7 @@ void cm_set_model_target(const float target[], const bool flags[])
continue; // skip axis if not flagged for update or its disabled
} else if ((cm->a[axis].axis_mode == AXIS_STANDARD) || (cm->a[axis].axis_mode == AXIS_INHIBITED)) {
if (cm->gm.distance_mode == ABSOLUTE_DISTANCE_MODE) {
cm->gm.target[axis] = cm_get_active_coord_offset(axis, cm->gm.absolute_override) + _to_millimeters(target[axis]);
cm->gm.target[axis] = cm_get_active_coord_offset(axis, true) + _to_millimeters(target[axis]);
} else {
cm->gm.target[axis] += _to_millimeters(target[axis]);
}
@@ -721,7 +723,7 @@ void cm_set_model_target(const float target[], const bool flags[])
tmp = _calc_ABC(axis, target);
}
if (cm->gm.distance_mode == ABSOLUTE_DISTANCE_MODE) {
cm->gm.target[axis] = tmp + cm_get_active_coord_offset(axis, cm->gm.absolute_override); // sacidu93's fix to Issue #22
cm->gm.target[axis] = tmp + cm_get_active_coord_offset(axis, true); // sacidu93's fix to Issue #22
} else {
cm->gm.target[axis] += tmp;
}
g2core/canonical_machine.h
+1 -1
View File
@@ -333,7 +333,7 @@ void cm_set_absolute_override(GCodeState_t *gcode_state, const uint8_t absolute_
void cm_set_model_linenum(const uint32_t linenum);
// Coordinate systems and offsets
float cm_get_active_coord_offset(const uint8_t axis, const cmAbsoluteOverride absolute_override);
float cm_get_active_coord_offset(const uint8_t axis, const bool use_absolute_override);
float cm_get_work_offset(const GCodeState_t *gcode_state, const uint8_t axis);
void cm_set_work_offsets(GCodeState_t *gcode_state);
float cm_get_absolute_position(const GCodeState_t *gcode_state, const uint8_t axis);
g2core/g2core.cppproj
+2 -2
View File
@@ -73,7 +73,7 @@
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
<ToolType>com.atmel.avrdbg.tool.atmelice</ToolType>
<ToolNumber>J41800030015</ToolNumber>
<ToolNumber>J41800036434</ToolNumber>
<ToolName>Atmel-ICE</ToolName>
</com_atmel_avrdbg_tool_atmelice>
<UseGdb>True</UseGdb>
@@ -100,7 +100,7 @@
<HWProgramCounterSampling>True</HWProgramCounterSampling>
</PercepioTrace>
<preserveEEPROM>true</preserveEEPROM>
<avrtoolserialnumber>J41800030015</avrtoolserialnumber>
<avrtoolserialnumber>J41800036434</avrtoolserialnumber>
<avrdeviceexpectedsignature>0x284E0A60</avrdeviceexpectedsignature>
<avrtoolinterfaceclock>10000000</avrtoolinterfaceclock>
<custom>