|
@@ -565,16 +565,8 @@ void Config_ResetDefault() {
|
565
|
565
|
#endif
|
566
|
566
|
|
567
|
567
|
volumetric_enabled = false;
|
568
|
|
- filament_size[0] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
569
|
|
- #if EXTRUDERS > 1
|
570
|
|
- filament_size[1] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
571
|
|
- #if EXTRUDERS > 2
|
572
|
|
- filament_size[2] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
573
|
|
- #if EXTRUDERS > 3
|
574
|
|
- filament_size[3] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
575
|
|
- #endif
|
576
|
|
- #endif
|
577
|
|
- #endif
|
|
568
|
+ for (int q=0; q<COUNT(filament_size); q++)
|
|
569
|
+ filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
578
|
570
|
calculate_volumetric_multipliers();
|
579
|
571
|
|
580
|
572
|
SERIAL_ECHO_START;
|
|
@@ -826,39 +818,45 @@ void Config_PrintSettings(bool forReplay) {
|
826
|
818
|
|
827
|
819
|
#endif // FWRETRACT
|
828
|
820
|
|
829
|
|
- if (volumetric_enabled) {
|
830
|
|
- if (!forReplay) {
|
831
|
|
- CONFIG_ECHO_START;
|
832
|
|
- SERIAL_ECHOLNPGM("Filament settings:");
|
833
|
|
- }
|
|
821
|
+ /**
|
|
822
|
+ * Volumetric extrusion M200
|
|
823
|
+ */
|
|
824
|
+ if (!forReplay) {
|
|
825
|
+ CONFIG_ECHO_START;
|
|
826
|
+ SERIAL_ECHOPGM("Filament settings:");
|
|
827
|
+ if (volumetric_enabled)
|
|
828
|
+ SERIAL_EOL;
|
|
829
|
+ else
|
|
830
|
+ SERIAL_ECHOLNPGM(" Disabled");
|
|
831
|
+ }
|
834
|
832
|
|
|
833
|
+ CONFIG_ECHO_START;
|
|
834
|
+ SERIAL_ECHOPAIR(" M200 D", filament_size[0]);
|
|
835
|
+ SERIAL_EOL;
|
|
836
|
+ #if EXTRUDERS > 1
|
835
|
837
|
CONFIG_ECHO_START;
|
836
|
|
- SERIAL_ECHOPAIR(" M200 D", filament_size[0]);
|
|
838
|
+ SERIAL_ECHOPAIR(" M200 T1 D", filament_size[1]);
|
837
|
839
|
SERIAL_EOL;
|
838
|
|
-
|
839
|
|
- #if EXTRUDERS > 1
|
|
840
|
+ #if EXTRUDERS > 2
|
840
|
841
|
CONFIG_ECHO_START;
|
841
|
|
- SERIAL_ECHOPAIR(" M200 T1 D", filament_size[1]);
|
|
842
|
+ SERIAL_ECHOPAIR(" M200 T2 D", filament_size[2]);
|
842
|
843
|
SERIAL_EOL;
|
843
|
|
- #if EXTRUDERS > 2
|
|
844
|
+ #if EXTRUDERS > 3
|
844
|
845
|
CONFIG_ECHO_START;
|
845
|
|
- SERIAL_ECHOPAIR(" M200 T2 D", filament_size[2]);
|
|
846
|
+ SERIAL_ECHOPAIR(" M200 T3 D", filament_size[3]);
|
846
|
847
|
SERIAL_EOL;
|
847
|
|
- #if EXTRUDERS > 3
|
848
|
|
- CONFIG_ECHO_START;
|
849
|
|
- SERIAL_ECHOPAIR(" M200 T3 D", filament_size[3]);
|
850
|
|
- SERIAL_EOL;
|
851
|
|
- #endif
|
852
|
848
|
#endif
|
853
|
849
|
#endif
|
|
850
|
+ #endif
|
854
|
851
|
|
855
|
|
- } else {
|
856
|
|
- if (!forReplay) {
|
857
|
|
- CONFIG_ECHO_START;
|
858
|
|
- SERIAL_ECHOLNPGM("Filament settings: Disabled");
|
859
|
|
- }
|
|
852
|
+ if (!volumetric_enabled) {
|
|
853
|
+ CONFIG_ECHO_START;
|
|
854
|
+ SERIAL_ECHOLNPGM(" M200 D0");
|
860
|
855
|
}
|
861
|
856
|
|
|
857
|
+ /**
|
|
858
|
+ * Auto Bed Leveling
|
|
859
|
+ */
|
862
|
860
|
#ifdef ENABLE_AUTO_BED_LEVELING
|
863
|
861
|
#ifdef CUSTOM_M_CODES
|
864
|
862
|
if (!forReplay) {
|