Browse Source

Merge pull request #5696 from thinkyhead/rc_volumetric_default

Allow enabling volumetric filament on config load
Scott Lahteine 7 years ago
parent
commit
9b5515926a

+ 10
- 0
Marlin/Configuration_adv.h View File

@@ -1085,4 +1085,14 @@
1085 1085
  */
1086 1086
 //#define EXTENDED_CAPABILITIES_REPORT
1087 1087
 
1088
+
1089
+/**
1090
+ * Volumetric extrusion default state
1091
+ * Activate to make volumetric extrusion the default method,
1092
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1093
+ *
1094
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1095
+ */ 
1096
+//#define VOLUMETRIC_DEFAULT_ON
1097
+
1088 1098
 #endif // CONFIGURATION_ADV_H

+ 7
- 1
Marlin/Marlin_main.cpp View File

@@ -388,7 +388,13 @@ int feedrate_percentage = 100, saved_feedrate_percentage,
388 388
     flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100);
389 389
 
390 390
 bool axis_relative_modes[] = AXIS_RELATIVE_MODES,
391
-     volumetric_enabled = false;
391
+     volumetric_enabled = 
392
+      #if ENABLED(VOLUMETRIC_DEFAULT_ON)
393
+        true
394
+      #else
395
+        false
396
+      #endif
397
+      ;
392 398
 float filament_size[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_NOMINAL_FILAMENT_DIA),
393 399
       volumetric_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(1.0);
394 400
 

+ 7
- 1
Marlin/configuration_store.cpp View File

@@ -824,7 +824,13 @@ void Config_ResetDefault() {
824 824
     retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE;
825 825
   #endif
826 826
 
827
-  volumetric_enabled = false;
827
+  volumetric_enabled =
828
+  #if ENABLED(VOLUMETRIC_DEFAULT_ON)
829
+    true
830
+  #else
831
+    false
832
+  #endif
833
+  ;
828 834
   for (uint8_t q = 0; q < COUNT(filament_size); q++)
829 835
     filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
830 836
 

+ 9
- 0
Marlin/example_configurations/Cartesio/Configuration_adv.h View File

@@ -1080,4 +1080,13 @@
1080 1080
  */
1081 1081
 //#define EXTENDED_CAPABILITIES_REPORT
1082 1082
 
1083
+/**
1084
+ * Volumetric extrusion default state
1085
+ * Activate to make volumetric extrusion the default method,
1086
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1087
+ *
1088
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1089
+ */ 
1090
+//#define VOLUMETRIC_DEFAULT_ON
1091
+
1083 1092
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Felix/Configuration_adv.h View File

@@ -1085,4 +1085,13 @@
1085 1085
  */
1086 1086
 //#define EXTENDED_CAPABILITIES_REPORT
1087 1087
 
1088
+/**
1089
+ * Volumetric extrusion default state
1090
+ * Activate to make volumetric extrusion the default method,
1091
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1092
+ *
1093
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1094
+ */ 
1095
+//#define VOLUMETRIC_DEFAULT_ON
1096
+
1088 1097
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

@@ -1085,4 +1085,13 @@
1085 1085
  */
1086 1086
 //#define EXTENDED_CAPABILITIES_REPORT
1087 1087
 
1088
+/**
1089
+ * Volumetric extrusion default state
1090
+ * Activate to make volumetric extrusion the default method,
1091
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1092
+ *
1093
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1094
+ */ 
1095
+//#define VOLUMETRIC_DEFAULT_ON
1096
+
1088 1097
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Hephestos_2/Configuration_adv.h View File

@@ -1068,4 +1068,13 @@
1068 1068
  */
1069 1069
 //#define EXTENDED_CAPABILITIES_REPORT
1070 1070
 
1071
+/**
1072
+ * Volumetric extrusion default state
1073
+ * Activate to make volumetric extrusion the default method,
1074
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1075
+ *
1076
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1077
+ */ 
1078
+//#define VOLUMETRIC_DEFAULT_ON
1079
+
1071 1080
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/K8200/Configuration_adv.h View File

@@ -1093,4 +1093,13 @@
1093 1093
  */
1094 1094
 //#define EXTENDED_CAPABILITIES_REPORT
1095 1095
 
1096
+/**
1097
+ * Volumetric extrusion default state
1098
+ * Activate to make volumetric extrusion the default method,
1099
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1100
+ *
1101
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1102
+ */ 
1103
+//#define VOLUMETRIC_DEFAULT_ON
1104
+
1096 1105
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/K8400/Configuration_adv.h View File

@@ -1080,4 +1080,13 @@
1080 1080
  */
1081 1081
 //#define EXTENDED_CAPABILITIES_REPORT
1082 1082
 
1083
+/**
1084
+ * Volumetric extrusion default state
1085
+ * Activate to make volumetric extrusion the default method,
1086
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1087
+ *
1088
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1089
+ */ 
1090
+//#define VOLUMETRIC_DEFAULT_ON
1091
+
1083 1092
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

@@ -1085,4 +1085,13 @@
1085 1085
  */
1086 1086
 //#define EXTENDED_CAPABILITIES_REPORT
1087 1087
 
1088
+/**
1089
+ * Volumetric extrusion default state
1090
+ * Activate to make volumetric extrusion the default method,
1091
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1092
+ *
1093
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1094
+ */ 
1095
+//#define VOLUMETRIC_DEFAULT_ON
1096
+
1088 1097
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/SCARA/Configuration_adv.h View File

@@ -1085,4 +1085,13 @@
1085 1085
  */
1086 1086
 //#define EXTENDED_CAPABILITIES_REPORT
1087 1087
 
1088
+/**
1089
+ * Volumetric extrusion default state
1090
+ * Activate to make volumetric extrusion the default method,
1091
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1092
+ *
1093
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1094
+ */ 
1095
+//#define VOLUMETRIC_DEFAULT_ON
1096
+
1088 1097
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

@@ -1088,4 +1088,13 @@
1088 1088
  */
1089 1089
 //#define EXTENDED_CAPABILITIES_REPORT
1090 1090
 
1091
+/**
1092
+ * Volumetric extrusion default state
1093
+ * Activate to make volumetric extrusion the default method,
1094
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1095
+ *
1096
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1097
+ */ 
1098
+//#define VOLUMETRIC_DEFAULT_ON
1099
+
1091 1100
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

@@ -1085,4 +1085,13 @@
1085 1085
  */
1086 1086
 //#define EXTENDED_CAPABILITIES_REPORT
1087 1087
 
1088
+/**
1089
+ * Volumetric extrusion default state
1090
+ * Activate to make volumetric extrusion the default method,
1091
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1092
+ *
1093
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1094
+ */ 
1095
+//#define VOLUMETRIC_DEFAULT_ON
1096
+
1088 1097
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

@@ -1087,4 +1087,13 @@
1087 1087
  */
1088 1088
 //#define EXTENDED_CAPABILITIES_REPORT
1089 1089
 
1090
+/**
1091
+ * Volumetric extrusion default state
1092
+ * Activate to make volumetric extrusion the default method,
1093
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1094
+ *
1095
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1096
+ */ 
1097
+//#define VOLUMETRIC_DEFAULT_ON
1098
+
1090 1099
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

@@ -1087,4 +1087,13 @@
1087 1087
  */
1088 1088
 //#define EXTENDED_CAPABILITIES_REPORT
1089 1089
 
1090
+/**
1091
+ * Volumetric extrusion default state
1092
+ * Activate to make volumetric extrusion the default method,
1093
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1094
+ *
1095
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1096
+ */ 
1097
+//#define VOLUMETRIC_DEFAULT_ON
1098
+
1090 1099
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

@@ -1092,4 +1092,13 @@
1092 1092
  */
1093 1093
 //#define EXTENDED_CAPABILITIES_REPORT
1094 1094
 
1095
+/**
1096
+ * Volumetric extrusion default state
1097
+ * Activate to make volumetric extrusion the default method,
1098
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1099
+ *
1100
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1101
+ */ 
1102
+//#define VOLUMETRIC_DEFAULT_ON
1103
+
1095 1104
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

@@ -1087,4 +1087,13 @@
1087 1087
  */
1088 1088
 //#define EXTENDED_CAPABILITIES_REPORT
1089 1089
 
1090
+/**
1091
+ * Volumetric extrusion default state
1092
+ * Activate to make volumetric extrusion the default method,
1093
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1094
+ *
1095
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1096
+ */ 
1097
+//#define VOLUMETRIC_DEFAULT_ON
1098
+
1090 1099
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/makibox/Configuration_adv.h View File

@@ -1085,4 +1085,13 @@
1085 1085
  */
1086 1086
 //#define EXTENDED_CAPABILITIES_REPORT
1087 1087
 
1088
+/**
1089
+ * Volumetric extrusion default state
1090
+ * Activate to make volumetric extrusion the default method,
1091
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1092
+ *
1093
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1094
+ */ 
1095
+//#define VOLUMETRIC_DEFAULT_ON
1096
+
1088 1097
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

@@ -1085,4 +1085,13 @@
1085 1085
  */
1086 1086
 //#define EXTENDED_CAPABILITIES_REPORT
1087 1087
 
1088
+/**
1089
+ * Volumetric extrusion default state
1090
+ * Activate to make volumetric extrusion the default method,
1091
+ * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
1092
+ *
1093
+ * M200 D0 to disable, M200 Dn to set a new diameter.
1094
+ */ 
1095
+//#define VOLUMETRIC_DEFAULT_ON
1096
+
1088 1097
 #endif // CONFIGURATION_ADV_H

Loading…
Cancel
Save