Skip to content

Commit

Permalink
* changed it to 201.3 (from 204.3) as this seems a better match for a…
Browse files Browse the repository at this point in the history
…xis limits rather than tool-path (Euclidean) limits.
  • Loading branch information
markmaker committed Oct 29, 2020
1 parent 556c5e1 commit aab670e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion firmware/tinyg/Debug/tinyg.hex
Expand Up @@ -3878,7 +3878,7 @@
:10F2500009F479C020F46E31710551F106C46133AF
:10F26000710509F47AC06233710509F480C0FDC3E9
:10F270006337710509F495C040F46C33710571F082
:10F280006237710509F487C0F0C36C3C710509F45D
:10F280006237710509F487C0F0C3693C710509F460
:10F290008EC06039714009F4B7C0E7C31092EC2CFE
:10F2A0005092472D8091F9378F5F8093F937B2C123
:10F2B0005092EC2C5092472D8091F9378F5F8093BC
Expand Down
2 changes: 1 addition & 1 deletion firmware/tinyg/canonical_machine.c
Expand Up @@ -846,7 +846,7 @@ stat_t cm_get_firmware()

stat_t cm_set_jerk(float offset[], float flag[])
{
// M204.3: Set axes jerk limits, transiently.
// M201.3: Set axes jerk limits, transiently.
for (uint8_t axis = AXIS_X; axis < AXES; axis++) {
if (fp_TRUE(flag[axis])) {
// convert from unit/s^3 to unit/min^3 and divide by the multiplier.
Expand Down
4 changes: 2 additions & 2 deletions firmware/tinyg/canonical_machine.h
Expand Up @@ -392,7 +392,7 @@ enum cmNextAction { // these are in order to optimized CASE statement
NEXT_ACTION_STRAIGHT_PROBE, // G38.2
NEXT_ACTION_GET_POSITION, // M114
NEXT_ACTION_GET_FIRMWARE, // M115
NEXT_ACTION_SET_JERK, // M204.3
NEXT_ACTION_SET_JERK, // M201.3
NEXT_ACTION_WAIT_FOR_COMPLETION // M400

};
Expand Down Expand Up @@ -601,7 +601,7 @@ stat_t cm_resume_origin_offsets(void); // G92.3

stat_t cm_get_position(void); // M114
stat_t cm_get_firmware(void); // M115
stat_t cm_set_jerk(float offset[], float flag[]); // M204.3
stat_t cm_set_jerk(float offset[], float flag[]); // M201.3
stat_t cm_wait_for_completion(void); // M400

// Free Space Motion (4.3.4)
Expand Down
2 changes: 1 addition & 1 deletion firmware/tinyg/default/tinyg.hex
Expand Up @@ -3878,7 +3878,7 @@
:10F2500009F479C020F46E31710551F106C46133AF
:10F26000710509F47AC06233710509F480C0FDC3E9
:10F270006337710509F495C040F46C33710571F082
:10F280006237710509F487C0F0C36C3C710509F45D
:10F280006237710509F487C0F0C3693C710509F460
:10F290008EC06039714009F4B7C0E7C31092EC2CFE
:10F2A0005092472D8091F9378F5F8093F937B2C123
:10F2B0005092EC2C5092472D8091F9378F5F8093BC
Expand Down
2 changes: 1 addition & 1 deletion firmware/tinyg/gcode_parser.c
Expand Up @@ -367,7 +367,7 @@ static stat_t _parse_gcode_block(char_t *buf)
case 51: SET_MODAL (MODAL_GROUP_M9, spindle_override_enable, true); // conditionally true
case 114: SET_NON_MODAL (next_action, NEXT_ACTION_GET_POSITION);
case 115: SET_NON_MODAL (next_action, NEXT_ACTION_GET_FIRMWARE);
case 204: {
case 201: {
switch (_point(value)) {
case 3: SET_NON_MODAL (next_action, NEXT_ACTION_SET_JERK);
default: status = STAT_MCODE_COMMAND_UNSUPPORTED;
Expand Down

0 comments on commit aab670e

Please sign in to comment.