|
@@ -699,14 +699,17 @@ void Config_PrintSettings(bool forReplay) {
|
699
|
699
|
SERIAL_ECHOLNPGM("PID settings:");
|
700
|
700
|
SERIAL_ECHO_START;
|
701
|
701
|
}
|
|
702
|
+ #if defined(PIDTEMP) && defined(PIDTEMPBED)
|
|
703
|
+ SERIAL_EOL;
|
|
704
|
+ #endif
|
702
|
705
|
#ifdef PIDTEMP
|
703
|
|
- SERIAL_ECHOPAIR(" M301 P", PID_PARAM(Kp, 0)); // for compatibility with hosts, only echos values for E0
|
|
706
|
+ SERIAL_ECHOPAIR(" M301 P", PID_PARAM(Kp, 0)); // for compatibility with hosts, only echos values for E0
|
704
|
707
|
SERIAL_ECHOPAIR(" I", unscalePID_i(PID_PARAM(Ki, 0)));
|
705
|
708
|
SERIAL_ECHOPAIR(" D", unscalePID_d(PID_PARAM(Kd, 0)));
|
706
|
709
|
SERIAL_EOL;
|
707
|
710
|
#endif
|
708
|
711
|
#ifdef PIDTEMPBED
|
709
|
|
- SERIAL_ECHOPAIR(" M304 P", bedKp); // for compatibility with hosts, only echos values for E0
|
|
712
|
+ SERIAL_ECHOPAIR(" M304 P", bedKp); // for compatibility with hosts, only echos values for E0
|
710
|
713
|
SERIAL_ECHOPAIR(" I", unscalePID_i(bedKi));
|
711
|
714
|
SERIAL_ECHOPAIR(" D", unscalePID_d(bedKd));
|
712
|
715
|
SERIAL_EOL;
|
|
@@ -720,7 +723,7 @@ void Config_PrintSettings(bool forReplay) {
|
720
|
723
|
SERIAL_ECHOLNPGM("Retract: S=Length (mm) F:Speed (mm/m) Z: ZLift (mm)");
|
721
|
724
|
SERIAL_ECHO_START;
|
722
|
725
|
}
|
723
|
|
- SERIAL_ECHOPAIR(" M207 S", retract_length);
|
|
726
|
+ SERIAL_ECHOPAIR(" M207 S", retract_length);
|
724
|
727
|
SERIAL_ECHOPAIR(" F", retract_feedrate*60);
|
725
|
728
|
SERIAL_ECHOPAIR(" Z", retract_zlift);
|
726
|
729
|
SERIAL_EOL;
|
|
@@ -729,7 +732,7 @@ void Config_PrintSettings(bool forReplay) {
|
729
|
732
|
SERIAL_ECHOLNPGM("Recover: S=Extra length (mm) F:Speed (mm/m)");
|
730
|
733
|
SERIAL_ECHO_START;
|
731
|
734
|
}
|
732
|
|
- SERIAL_ECHOPAIR(" M208 S", retract_recover_length);
|
|
735
|
+ SERIAL_ECHOPAIR(" M208 S", retract_recover_length);
|
733
|
736
|
SERIAL_ECHOPAIR(" F", retract_recover_feedrate*60);
|
734
|
737
|
SERIAL_EOL;
|
735
|
738
|
SERIAL_ECHO_START;
|
|
@@ -737,7 +740,7 @@ void Config_PrintSettings(bool forReplay) {
|
737
|
740
|
SERIAL_ECHOLNPGM("Auto-Retract: S=0 to disable, 1 to interpret extrude-only moves as retracts or recoveries");
|
738
|
741
|
SERIAL_ECHO_START;
|
739
|
742
|
}
|
740
|
|
- SERIAL_ECHOPAIR(" M209 S", (unsigned long)(autoretract_enabled ? 1 : 0));
|
|
743
|
+ SERIAL_ECHOPAIR(" M209 S", (unsigned long)(autoretract_enabled ? 1 : 0));
|
741
|
744
|
SERIAL_EOL;
|
742
|
745
|
|
743
|
746
|
#if EXTRUDERS > 1
|
|
@@ -761,20 +764,20 @@ void Config_PrintSettings(bool forReplay) {
|
761
|
764
|
SERIAL_ECHOLNPGM("Filament settings:");
|
762
|
765
|
SERIAL_ECHO_START;
|
763
|
766
|
}
|
764
|
|
- SERIAL_ECHOPAIR(" M200 D", filament_size[0]);
|
|
767
|
+ SERIAL_ECHOPAIR(" M200 D", filament_size[0]);
|
765
|
768
|
SERIAL_EOL;
|
766
|
769
|
|
767
|
770
|
#if EXTRUDERS > 1
|
768
|
771
|
SERIAL_ECHO_START;
|
769
|
|
- SERIAL_ECHOPAIR(" M200 T1 D", filament_size[1]);
|
|
772
|
+ SERIAL_ECHOPAIR(" M200 T1 D", filament_size[1]);
|
770
|
773
|
SERIAL_EOL;
|
771
|
774
|
#if EXTRUDERS > 2
|
772
|
775
|
SERIAL_ECHO_START;
|
773
|
|
- SERIAL_ECHOPAIR(" M200 T2 D", filament_size[2]);
|
|
776
|
+ SERIAL_ECHOPAIR(" M200 T2 D", filament_size[2]);
|
774
|
777
|
SERIAL_EOL;
|
775
|
778
|
#if EXTRUDERS > 3
|
776
|
779
|
SERIAL_ECHO_START;
|
777
|
|
- SERIAL_ECHOPAIR(" M200 T3 D", filament_size[3]);
|
|
780
|
+ SERIAL_ECHOPAIR(" M200 T3 D", filament_size[3]);
|
778
|
781
|
SERIAL_EOL;
|
779
|
782
|
#endif
|
780
|
783
|
#endif
|
|
@@ -793,7 +796,7 @@ void Config_PrintSettings(bool forReplay) {
|
793
|
796
|
SERIAL_ECHOLNPGM("Z-Probe Offset (mm):");
|
794
|
797
|
SERIAL_ECHO_START;
|
795
|
798
|
}
|
796
|
|
- SERIAL_ECHOPAIR(" M", (unsigned long)CUSTOM_M_CODE_SET_Z_PROBE_OFFSET);
|
|
799
|
+ SERIAL_ECHOPAIR(" M", (unsigned long)CUSTOM_M_CODE_SET_Z_PROBE_OFFSET);
|
797
|
800
|
SERIAL_ECHOPAIR(" Z", -zprobe_zoffset);
|
798
|
801
|
#else
|
799
|
802
|
if (!forReplay) {
|