SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3761 from thinkyhead/rc_plan_arc_idle

Browse source 
Apply config changes, tweak comments, next_ping_ms => next_idle_ms
This commit is contained in:
Scott Lahteine 2016-05-19 17:10:17 -07:00
commit 61de6daf1d
20 changed files with 41 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration_adv.h
View file

@ -452,7 +452,7 @@
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets. Needs ~2666 bytes
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

8
Marlin/Marlin_main.cpp
View file

@ -7597,14 +7597,14 @@ void prepare_move() {
float feed_rate = feedrate * feedrate_multiplier / 60 / 100.0;
millis_t next_ping_ms = millis() + 200UL;
millis_t next_idle_ms = millis() + 200UL;
for (i = 1; i < segments; i++) { // Iterate (segments-1) times
thermalManager.manage_heater();
millis_t now = millis();
if (ELAPSED(now, next_ping_ms)) {
next_ping_ms = now + 200UL;
if (ELAPSED(now, next_idle_ms)) {
next_idle_ms = now + 200UL;
idle();
}
@ -7854,7 +7854,7 @@ void idle(
host_keepalive();
lcd_update();
#if ENABLED(PRINTCOUNTER)
print_job_timer.tick();
print_job_timer.tick();
#endif
}

4
Marlin/example_configurations/Felix/Configuration_adv.h
View file

@ -448,11 +448,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/Hephestos/Configuration_adv.h
View file

@ -448,11 +448,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/Hephestos_2/Configuration_adv.h
View file

@ -448,11 +448,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/K8200/Configuration_adv.h
View file

@ -454,11 +454,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 2; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/RigidBot/Configuration_adv.h
View file

@ -448,11 +448,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/SCARA/Configuration_adv.h
View file

@ -448,11 +448,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/TAZ4/Configuration_adv.h
View file

@ -456,11 +456,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/WITBOX/Configuration_adv.h
View file

@ -448,11 +448,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
View file

@ -450,11 +450,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/delta/generic/Configuration_adv.h
View file

@ -450,11 +450,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
View file

@ -449,11 +449,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
View file

@ -454,11 +454,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
View file

@ -450,11 +450,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/makibox/Configuration_adv.h
View file

@ -448,11 +448,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

4
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
View file

@ -448,11 +448,11 @@
// @section extras
// Arc interpretation settings:
#define ARC_SUPPORT // Disabling this saves ~2660bytes
#define ARC_SUPPORT // Disabling this saves ~2738 bytes
#define MM_PER_ARC_SEGMENT 1
#define N_ARC_CORRECTION 25
// Support for G5 with XYZE destination and IJPQ offsets
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement

6
Marlin/planner_bezier.cpp
View file

@ -118,14 +118,14 @@ void cubic_b_spline(const float position[NUM_AXIS], const float target[NUM_AXIS]
bez_target[Y_AXIS] = position[Y_AXIS];
float step = MAX_STEP;
millis_t next_ping_ms = millis() + 200UL;
millis_t next_idle_ms = millis() + 200UL;
while (t < 1.0) {
thermalManager.manage_heater();
millis_t now = millis();
if (ELAPSED(now, next_ping_ms)) {
next_ping_ms = now + 200UL;
if (ELAPSED(now, next_idle_ms)) {
next_idle_ms = now + 200UL;
idle();
}

3
Marlin/temperature.cpp
View file

@ -516,6 +516,7 @@ float Temperature::get_pid_output(int e) {
/**
* Manage heating activities for extruder hot-ends and a heated bed
* - Acquire updated temperature readings
* - Also resets the watchdog timer
* - Invoke thermal runaway protection
* - Manage extruder auto-fan
* - Apply filament width to the extrusion rate (may move)
@ -525,7 +526,7 @@ void Temperature::manage_heater() {
if (!temp_meas_ready) return;
updateTemperaturesFromRawValues();
updateTemperaturesFromRawValues(); // also resets the watchdog
#if ENABLED(HEATER_0_USES_MAX6675)
float ct = current_temperature[0];

2
Marlin/ultralcd.cpp
View file

@ -2247,7 +2247,7 @@ void lcd_update() {
}
#endif //ULTIPANEL
// Here we arrive every ~100ms when ideling often enough.
// We arrive here every ~100ms when idling often enough.
// Instead of tracking the changes simply redraw the Info Screen ~1 time a second.
static int8_t lcd_status_update_delay = 1; // first update one loop delayed
if (currentMenu == lcd_status_screen && !lcd_status_update_delay--) {