I ended up with:
Code:
void SET_FEED_RATE(double rate)
{
// send a code status NML message with the F word setting
send_code_status_msg(rate);
if(canon.feed_mode) {
START_SPEED_FEED_SYNCH(canon.spindle_num, rate, 1);
canon.linearFeedRate = rate;
} else {
/* convert from /min to /sec */
rate /= 60.0;
/* convert to traj units (mm & deg) if needed */
double newLinearFeedRate = FROM_PROG_LEN(rate),
newAngularFeedRate = FROM_PROG_ANG(rate);
if(newLinearFeedRate != canon.linearFeedRate
|| newAngularFeedRate != canon.angularFeedRate)
flush_segments();
canon.linearFeedRate = newLinearFeedRate;
canon.angularFeedRate = newAngularFeedRate;
}
}
Which seemed to work the same.
Pushed to the testing branch.
Thanks for the fast code review!
Chris
