Browse Source

Merge Complete M200 output with M503 (PR#2506)

Richard Wackerbarth 10 years ago
parent
commit
47ae96ce15
2 changed files with 31 additions and 33 deletions
  1. 2
    2
      Marlin/Marlin_main.cpp
  2. 29
    31
      Marlin/configuration_store.cpp

+ 2
- 2
Marlin/Marlin_main.cpp View File

@@ -3082,7 +3082,7 @@ inline void gcode_M42() {
3082 3082
     if (code_seen('P') && pin_status >= 0 && pin_status <= 255)
3083 3083
       pin_number = code_value_short();
3084 3084
 
3085
-    for (int8_t i = 0; i < COUNT(sensitive_pins); i++) {
3085
+    for (uint8_t i = 0; i < COUNT(sensitive_pins); i++) {
3086 3086
       if (sensitive_pins[i] == pin_number) {
3087 3087
         pin_number = -1;
3088 3088
         break;
@@ -4222,7 +4222,7 @@ inline void gcode_M226() {
4222 4222
 
4223 4223
     if (pin_state >= -1 && pin_state <= 1) {
4224 4224
 
4225
-      for (int8_t i = 0; i < COUNT(sensitive_pins); i++) {
4225
+      for (uint8_t i = 0; i < COUNT(sensitive_pins); i++) {
4226 4226
         if (sensitive_pins[i] == pin_number) {
4227 4227
           pin_number = -1;
4228 4228
           break;

+ 29
- 31
Marlin/configuration_store.cpp View File

@@ -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) {

Loading…
Cancel
Save