Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Idle during long arcs #3751

Merged
merged 2 commits into from
May 14, 2016
Merged

Idle during long arcs #3751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b74af78
Make arc support (G2/G3) configurable
AnHardt May 13, 2016
8a4376d
Idle during long arcs
AnHardt May 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
16 changes: 15 additions & 1 deletion Marlin/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,9 @@ void stop();
void get_available_commands();
void process_next_command();

#if ENABLED(ARC_SUPPORT)
void plan_arc(float target[NUM_AXIS], float* offset, uint8_t clockwise);
#endif

void serial_echopair_P(const char* s_P, int v) { serialprintPGM(s_P); SERIAL_ECHO(v); }
void serial_echopair_P(const char* s_P, long v) { serialprintPGM(s_P); SERIAL_ECHO(v); }
Expand Down Expand Up @@ -2461,6 +2463,7 @@ inline void gcode_G0_G1() {
* G2: Clockwise Arc
* G3: Counterclockwise Arc
*/
#if ENABLED(ARC_SUPPORT)
inline void gcode_G2_G3(bool clockwise) {
if (IsRunning()) {

Expand All @@ -2487,6 +2490,7 @@ inline void gcode_G2_G3(bool clockwise) {
refresh_cmd_timeout();
}
}
#endif

/**
* G4: Dwell S<seconds> or P<milliseconds>
Expand Down Expand Up @@ -6484,7 +6488,7 @@ void process_next_command() {
break;

// G2, G3
#if DISABLED(SCARA)
#if ENABLED(ARC_SUPPORT) && DISABLED(SCARA)
case 2: // G2 - CW ARC
case 3: // G3 - CCW ARC
gcode_G2_G3(codenum == 2);
Expand Down Expand Up @@ -7423,6 +7427,7 @@ void prepare_move() {
set_current_to_destination();
}

#if ENABLED(ARC_SUPPORT)
/**
* Plan an arc in 2 dimensions
*
Expand Down Expand Up @@ -7509,8 +7514,16 @@ void plan_arc(

float feed_rate = feedrate * feedrate_multiplier / 60 / 100.0;

millis_t previous_ms = millis();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can shave this millis() call and init the var as 0.

Copy link
Contributor Author

@AnHardt AnHardt May 13, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why should i want that.
That would call idle() one time at the beginning of the loop, where we don't need it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It depends on the perspective..
It was a suggestion.


for (i = 1; i < segments; i++) { // Iterate (segments-1) times

millis_t now = millis();
if (now - previous_ms > 200UL) {
previous_ms = now;
idle();
}

if (++count < N_ARC_CORRECTION) {
// Apply vector rotation matrix to previous r_X / 1
r_new_Y = r_X * sin_T + r_Y * cos_T;
Expand Down Expand Up @@ -7564,6 +7577,7 @@ void plan_arc(
// in any intermediate location.
set_current_to_destination();
}
#endif

#if HAS_CONTROLLERFAN

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Felix/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Hephestos/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Hephestos_2/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/K8200/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/RigidBot/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/SCARA/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/TAZ4/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/WITBOX/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/delta/generic/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/makibox/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
// @section extras

// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25

Expand Down