浏览代码

Update comments, rename next_ping_ms, followup to #3797

Scott Lahteine 8 年前
父节点
当前提交
8218558953

+ 1
- 1
Marlin/Configuration_adv.h 查看文件

@@ -452,7 +452,7 @@
452 452
 #define MM_PER_ARC_SEGMENT 1
453 453
 #define N_ARC_CORRECTION 25
454 454
 
455
-// Support for G5 with XYZE destination and IJPQ offsets. Needs ~2666 bytes
455
+// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
456 456
 //#define BEZIER_CURVE_SUPPORT
457 457
 
458 458
 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
- 4
Marlin/Marlin_main.cpp 查看文件

@@ -7597,14 +7597,14 @@ void prepare_move() {
7597 7597
 
7598 7598
     float feed_rate = feedrate * feedrate_multiplier / 60 / 100.0;
7599 7599
 
7600
-    millis_t next_ping_ms = millis() + 200UL;
7600
+    millis_t next_idle_ms = millis() + 200UL;
7601 7601
 
7602 7602
     for (i = 1; i < segments; i++) { // Iterate (segments-1) times
7603 7603
 
7604 7604
       thermalManager.manage_heater();
7605 7605
       millis_t now = millis();
7606
-      if (ELAPSED(now, next_ping_ms)) {
7607
-        next_ping_ms = now + 200UL;
7606
+      if (ELAPSED(now, next_idle_ms)) {
7607
+        next_idle_ms = now + 200UL;
7608 7608
         idle();
7609 7609
       }
7610 7610
 
@@ -7854,7 +7854,7 @@ void idle(
7854 7854
   host_keepalive();
7855 7855
   lcd_update();
7856 7856
   #if ENABLED(PRINTCOUNTER)
7857
-      print_job_timer.tick();
7857
+    print_job_timer.tick();
7858 7858
   #endif
7859 7859
 }
7860 7860
 

+ 2
- 2
Marlin/example_configurations/Felix/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/Hephestos/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/Hephestos_2/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/K8200/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/RigidBot/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/SCARA/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/TAZ4/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/WITBOX/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/delta/generic/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/makibox/Configuration_adv.h 查看文件

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

+ 2
- 2
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h 查看文件

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

+ 3
- 3
Marlin/planner_bezier.cpp 查看文件

@@ -118,14 +118,14 @@ void cubic_b_spline(const float position[NUM_AXIS], const float target[NUM_AXIS]
118 118
   bez_target[Y_AXIS] = position[Y_AXIS];
119 119
   float step = MAX_STEP;
120 120
 
121
-  millis_t next_ping_ms = millis() + 200UL;
121
+  millis_t next_idle_ms = millis() + 200UL;
122 122
 
123 123
   while (t < 1.0) {
124 124
 
125 125
     thermalManager.manage_heater();
126 126
     millis_t now = millis();
127
-    if (ELAPSED(now, next_ping_ms)) {
128
-      next_ping_ms = now + 200UL;
127
+    if (ELAPSED(now, next_idle_ms)) {
128
+      next_idle_ms = now + 200UL;
129 129
       idle();
130 130
     }
131 131
 

+ 2
- 1
Marlin/temperature.cpp 查看文件

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

+ 1
- 1
Marlin/ultralcd.cpp 查看文件

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

正在加载...
取消
保存