From d32fde3bddb913a5d34560fec711f1fb87c686c6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 14 May 2016 17:37:42 -0700 Subject: [PATCH] Update comments, rename next_ping_ms, followup to #3797 --- Marlin/Configuration_adv.h | 2 +- Marlin/Marlin_main.cpp | 8 ++++---- Marlin/example_configurations/Felix/Configuration_adv.h | 4 ++-- .../example_configurations/Hephestos/Configuration_adv.h | 4 ++-- .../Hephestos_2/Configuration_adv.h | 4 ++-- Marlin/example_configurations/K8200/Configuration_adv.h | 4 ++-- .../example_configurations/RigidBot/Configuration_adv.h | 4 ++-- Marlin/example_configurations/SCARA/Configuration_adv.h | 4 ++-- Marlin/example_configurations/TAZ4/Configuration_adv.h | 4 ++-- Marlin/example_configurations/WITBOX/Configuration_adv.h | 4 ++-- .../delta/biv2.5/Configuration_adv.h | 4 ++-- .../delta/generic/Configuration_adv.h | 4 ++-- .../delta/kossel_mini/Configuration_adv.h | 4 ++-- .../delta/kossel_pro/Configuration_adv.h | 4 ++-- .../delta/kossel_xl/Configuration_adv.h | 4 ++-- Marlin/example_configurations/makibox/Configuration_adv.h | 4 ++-- .../tvrrug/Round2/Configuration_adv.h | 4 ++-- Marlin/planner_bezier.cpp | 6 +++--- Marlin/temperature.cpp | 3 ++- Marlin/ultralcd.cpp | 2 +- 20 files changed, 41 insertions(+), 40 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 1e70d78f040d..a2a1ea14bf3f 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -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 diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index be83f3099013..5623c109c489 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7610,14 +7610,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(); } @@ -7867,7 +7867,7 @@ void idle( host_keepalive(); lcd_update(); #if ENABLED(PRINTCOUNTER) - print_job_timer.tick(); + print_job_timer.tick(); #endif } diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 58256be885fb..3f784aac1ece 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index 2d5a149c8249..ab25822cd289 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h index 04bf2b1bcf23..fbafa6579fba 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 2eccfff5561d..04e9eb7a1140 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 6b0c88bf32cb..13b4b997f4a0 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 5bd27cd6090d..420609271e9c 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index f113ece3735b..033f475f6030 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index 2d5a149c8249..ab25822cd289 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index d3bf8d8bbe53..99c1b422da61 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 094f54b0a339..4774739509e3 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 81a9f9aa88a3..98e302a724ad 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 89e3ef3b42c9..d01cb46ae531 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index 37bddc291c59..2f6d37e65699 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index 4a513926742c..e8a9d9d585ec 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -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 diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index 4c4458ecbe4c..56767f1133ba 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -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 diff --git a/Marlin/planner_bezier.cpp b/Marlin/planner_bezier.cpp index ad80c6b1989f..b789b3db539e 100644 --- a/Marlin/planner_bezier.cpp +++ b/Marlin/planner_bezier.cpp @@ -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(); } diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index 86197003e749..ebebc3bd2c00 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -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]; diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 4d7f80b95d2a..dd99b2961fe7 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -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--) {