浏览代码

Fix M503 helper functions following TMC updates (#10197)

Bob-the-Kuhn 7 年前
父节点
当前提交
8870f9b1da
共有 1 个文件被更改,包括 38 次插入38 次删除
  1. 38
    38
      Marlin/src/module/configuration_store.cpp

+ 38
- 38
Marlin/src/module/configuration_store.cpp 查看文件

@@ -1893,15 +1893,15 @@ void MarlinSettings::reset(PORTARG_SOLO) {
1893 1893
   #define CONFIG_ECHO_START do{ if (!forReplay) SERIAL_ECHO_START_P(port); }while(0)
1894 1894
 
1895 1895
   #if HAS_TRINAMIC
1896
-    void say_M906() { SERIAL_ECHOPGM_P(port, "  M906 "); }
1897
-    void say_M913() { SERIAL_ECHOPGM_P(port, "  M913 "); }
1896
+    void say_M906(PORTARG_SOLO) { SERIAL_ECHOPGM_P(port, "  M906 "); }
1897
+    void say_M913(PORTARG_SOLO) { SERIAL_ECHOPGM_P(port, "  M913 "); }
1898 1898
     #if ENABLED(SENSORLESS_HOMING)
1899
-      void say_M914() { SERIAL_ECHOPGM_P(port, "  M914 "); }
1899
+      void say_M914(PORTARG_SOLO) { SERIAL_ECHOPGM_P(port, "  M914 "); }
1900 1900
     #endif
1901 1901
   #endif
1902 1902
 
1903 1903
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
1904
-    void say_M603() { SERIAL_ECHOPGM_P(port, "  M603 "); }
1904
+    #define say_M603(PORTARG_SOLO) { SERIAL_ECHOPGM_P(port, "  M603 "); }
1905 1905
   #endif
1906 1906
 
1907 1907
   /**
@@ -2382,47 +2382,47 @@ void MarlinSettings::reset(PORTARG_SOLO) {
2382 2382
       }
2383 2383
       CONFIG_ECHO_START;
2384 2384
       #if X_IS_TRINAMIC
2385
-        say_M906();
2385
+        say_M906(PORTVAR_SOLO);
2386 2386
         SERIAL_ECHOLNPAIR_P(port, "X", stepperX.getCurrent());
2387 2387
       #endif
2388 2388
       #if X2_IS_TRINAMIC
2389
-        say_M906();
2389
+        say_M906(PORTVAR_SOLO);
2390 2390
         SERIAL_ECHOLNPAIR_P(port, "I1 X", stepperX2.getCurrent());
2391 2391
       #endif
2392 2392
       #if Y_IS_TRINAMIC
2393
-        say_M906();
2393
+        say_M906(PORTVAR_SOLO);
2394 2394
         SERIAL_ECHOLNPAIR_P(port, "Y", stepperY.getCurrent());
2395 2395
       #endif
2396 2396
       #if Y2_IS_TRINAMIC
2397
-        say_M906();
2397
+        say_M906(PORTVAR_SOLO);
2398 2398
         SERIAL_ECHOLNPAIR_P(port, "I1 Y", stepperY2.getCurrent());
2399 2399
       #endif
2400 2400
       #if Z_IS_TRINAMIC
2401
-        say_M906();
2401
+        say_M906(PORTVAR_SOLO);
2402 2402
         SERIAL_ECHOLNPAIR_P(port, "Z", stepperZ.getCurrent());
2403 2403
       #endif
2404 2404
       #if Z2_IS_TRINAMIC
2405
-        say_M906();
2405
+        say_M906(PORTVAR_SOLO);
2406 2406
         SERIAL_ECHOLNPAIR_P(port, "I1 Z", stepperZ2.getCurrent());
2407 2407
       #endif
2408 2408
       #if E0_IS_TRINAMIC
2409
-        say_M906();
2409
+        say_M906(PORTVAR_SOLO);
2410 2410
         SERIAL_ECHOLNPAIR_P(port, "T0 E", stepperE0.getCurrent());
2411 2411
       #endif
2412 2412
       #if E_STEPPERS > 1 && E1_IS_TRINAMIC
2413
-        say_M906();
2413
+        say_M906(PORTVAR_SOLO);
2414 2414
         SERIAL_ECHOLNPAIR_P(port, "T1 E", stepperE1.getCurrent());
2415 2415
       #endif
2416 2416
       #if E_STEPPERS > 2 && E2_IS_TRINAMIC
2417
-        say_M906();
2417
+        say_M906(PORTVAR_SOLO);
2418 2418
         SERIAL_ECHOLNPAIR_P(port, "T2 E", stepperE2.getCurrent());
2419 2419
       #endif
2420 2420
       #if E_STEPPERS > 3 && E3_IS_TRINAMIC
2421
-        say_M906();
2421
+        say_M906(PORTVAR_SOLO);
2422 2422
         SERIAL_ECHOLNPAIR_P(port, "T3 E", stepperE3.getCurrent());
2423 2423
       #endif
2424 2424
       #if E_STEPPERS > 4 && E4_IS_TRINAMIC
2425
-        say_M906();
2425
+        say_M906(PORTVAR_SOLO);
2426 2426
         SERIAL_ECHOLNPAIR_P(port, "T4 E", stepperE4.getCurrent());
2427 2427
       #endif
2428 2428
       SERIAL_EOL_P(port);
@@ -2436,47 +2436,47 @@ void MarlinSettings::reset(PORTARG_SOLO) {
2436 2436
       }
2437 2437
       CONFIG_ECHO_START;
2438 2438
       #if X_IS_TRINAMIC
2439
-        say_M913();
2439
+        say_M913(PORTVAR_SOLO);
2440 2440
         SERIAL_ECHOLNPAIR_P(port, "X", TMC_GET_PWMTHRS(X, X));
2441 2441
       #endif
2442 2442
       #if X2_IS_TRINAMIC
2443
-        say_M913();
2443
+        say_M913(PORTVAR_SOLO);
2444 2444
         SERIAL_ECHOLNPAIR_P(port, "I1 X", TMC_GET_PWMTHRS(X, X2));
2445 2445
       #endif
2446 2446
       #if Y_IS_TRINAMIC
2447
-        say_M913();
2447
+        say_M913(PORTVAR_SOLO);
2448 2448
         SERIAL_ECHOLNPAIR_P(port, "Y", TMC_GET_PWMTHRS(Y, Y));
2449 2449
       #endif
2450 2450
       #if Y2_IS_TRINAMIC
2451
-        say_M913();
2451
+        say_M913(PORTVAR_SOLO);
2452 2452
         SERIAL_ECHOLNPAIR_P(port, "I1 Y", TMC_GET_PWMTHRS(Y, Y2));
2453 2453
       #endif
2454 2454
       #if Z_IS_TRINAMIC
2455
-        say_M913();
2455
+        say_M913(PORTVAR_SOLO);
2456 2456
         SERIAL_ECHOLNPAIR_P(port, "Z", TMC_GET_PWMTHRS(Z, Z));
2457 2457
       #endif
2458 2458
       #if Z2_IS_TRINAMIC
2459
-        say_M913();
2459
+        say_M913(PORTVAR_SOLO);
2460 2460
         SERIAL_ECHOLNPAIR_P(port, "I1 Z", TMC_GET_PWMTHRS(Z, Z2));
2461 2461
       #endif
2462 2462
       #if E0_IS_TRINAMIC
2463
-        say_M913();
2463
+        say_M913(PORTVAR_SOLO);
2464 2464
         SERIAL_ECHOLNPAIR_P(port, "T0 E", TMC_GET_PWMTHRS(E, E0));
2465 2465
       #endif
2466 2466
       #if E_STEPPERS > 1 && E1_IS_TRINAMIC
2467
-        say_M913();
2467
+        say_M913(PORTVAR_SOLO);
2468 2468
         SERIAL_ECHOLNPAIR_P(port, "T1 E", TMC_GET_PWMTHRS(E, E1));
2469 2469
       #endif
2470 2470
       #if E_STEPPERS > 2 && E2_IS_TRINAMIC
2471
-        say_M913();
2471
+        say_M913(PORTVAR_SOLO);
2472 2472
         SERIAL_ECHOLNPAIR_P(port, "T2 E", TMC_GET_PWMTHRS(E, E2));
2473 2473
       #endif
2474 2474
       #if E_STEPPERS > 3 && E3_IS_TRINAMIC
2475
-        say_M913();
2475
+        say_M913(PORTVAR_SOLO);
2476 2476
         SERIAL_ECHOLNPAIR_P(port, "T3 E", TMC_GET_PWMTHRS(E, E3));
2477 2477
       #endif
2478 2478
       #if E_STEPPERS > 4 && E4_IS_TRINAMIC
2479
-        say_M913();
2479
+        say_M913(PORTVAR_SOLO);
2480 2480
         SERIAL_ECHOLNPAIR_P(port, "T4 E", TMC_GET_PWMTHRS(E, E4));
2481 2481
       #endif
2482 2482
       SERIAL_EOL_P(port);
@@ -2492,31 +2492,31 @@ void MarlinSettings::reset(PORTARG_SOLO) {
2492 2492
         CONFIG_ECHO_START;
2493 2493
         #ifdef X_HOMING_SENSITIVITY
2494 2494
           #if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS)
2495
-            say_M914();
2495
+            say_M914(PORTVAR_SOLO);
2496 2496
             SERIAL_ECHOLNPAIR_P(port, "X", stepperX.sgt());
2497 2497
           #endif
2498 2498
           #if ENABLED(X2_IS_TMC2130)
2499
-            say_M914();
2499
+            say_M914(PORTVAR_SOLO);
2500 2500
             SERIAL_ECHOLNPAIR_P(port, "I1 X", stepperX2.sgt());
2501 2501
           #endif
2502 2502
         #endif
2503 2503
         #ifdef Y_HOMING_SENSITIVITY
2504 2504
           #if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS)
2505
-            say_M914();
2505
+            say_M914(PORTVAR_SOLO);
2506 2506
             SERIAL_ECHOLNPAIR_P(port, "Y", stepperY.sgt());
2507 2507
           #endif
2508 2508
           #if ENABLED(Y2_IS_TMC2130)
2509
-            say_M914();
2509
+            say_M914(PORTVAR_SOLO);
2510 2510
             SERIAL_ECHOLNPAIR_P(port, "I1 Y", stepperY2.sgt());
2511 2511
           #endif
2512 2512
         #endif
2513 2513
         #ifdef Z_HOMING_SENSITIVITY
2514 2514
           #if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS)
2515
-            say_M914();
2515
+            say_M914(PORTVAR_SOLO);
2516 2516
             SERIAL_ECHOLNPAIR_P(port, "Z", stepperZ.sgt());
2517 2517
           #endif
2518 2518
           #if ENABLED(Z2_IS_TMC2130)
2519
-            say_M914();
2519
+            say_M914(PORTVAR_SOLO);
2520 2520
             SERIAL_ECHOLNPAIR_P(port, "I1 Z", stepperZ2.sgt());
2521 2521
           #endif
2522 2522
         #endif
@@ -2559,30 +2559,30 @@ void MarlinSettings::reset(PORTARG_SOLO) {
2559 2559
       }
2560 2560
       CONFIG_ECHO_START;
2561 2561
       #if EXTRUDERS == 1
2562
-        say_M603();
2562
+        say_M603(PORTVAR_SOLO);
2563 2563
         SERIAL_ECHOPAIR_P(port, "L", LINEAR_UNIT(filament_change_load_length[0]));
2564 2564
         SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[0]));
2565 2565
       #else
2566
-        say_M603();
2566
+        say_M603(PORTVAR_SOLO);
2567 2567
         SERIAL_ECHOPAIR_P(port, "T0 L", LINEAR_UNIT(filament_change_load_length[0]));
2568 2568
         SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[0]));
2569 2569
         CONFIG_ECHO_START;
2570
-        say_M603();
2570
+        say_M603(PORTVAR_SOLO);
2571 2571
         SERIAL_ECHOPAIR_P(port, "T1 L", LINEAR_UNIT(filament_change_load_length[1]));
2572 2572
         SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[1]));
2573 2573
         #if EXTRUDERS > 2
2574 2574
           CONFIG_ECHO_START;
2575
-          say_M603();
2575
+          say_M603(PORTVAR_SOLO);
2576 2576
           SERIAL_ECHOPAIR_P(port, "T2 L", LINEAR_UNIT(filament_change_load_length[2]));
2577 2577
           SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[2]));
2578 2578
           #if EXTRUDERS > 3
2579 2579
             CONFIG_ECHO_START;
2580
-            say_M603();
2580
+            say_M603(PORTVAR_SOLO);
2581 2581
             SERIAL_ECHOPAIR_P(port, "T3 L", LINEAR_UNIT(filament_change_load_length[3]));
2582 2582
             SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[3]));
2583 2583
             #if EXTRUDERS > 4
2584 2584
               CONFIG_ECHO_START;
2585
-              say_M603();
2585
+              say_M603(PORTVAR_SOLO);
2586 2586
               SERIAL_ECHOPAIR_P(port, "T4 L", LINEAR_UNIT(filament_change_load_length[4]));
2587 2587
               SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[4]));
2588 2588
             #endif // EXTRUDERS > 4

正在加载...
取消
保存