Browse Source

Use cs.autoretract_enabled from ConfigurationStore.

Marek Bel 6 năm trước cách đây
mục cha
commit
7e593e6922

+ 1 - 1
Firmware/ConfigurationStore.cpp

@@ -138,7 +138,7 @@ void Config_PrintSettings(uint8_t level)
 		),
 		),
 		echomagic, echomagic, retract_length, retract_feedrate*60, retract_zlift,
 		echomagic, echomagic, retract_length, retract_feedrate*60, retract_zlift,
 		echomagic, echomagic, retract_recover_length, retract_recover_feedrate*60,
 		echomagic, echomagic, retract_recover_length, retract_recover_feedrate*60,
-		echomagic, echomagic, (autoretract_enabled ? 1 : 0)
+		echomagic, echomagic, (cs.autoretract_enabled ? 1 : 0)
 	);
 	);
 #if EXTRUDERS > 1
 #if EXTRUDERS > 1
 	printf_P(PSTR("%SMulti-extruder settings:\n%S   Swap retract length (mm):    %.2f\n%S   Swap rec. addl. length (mm): %.2f\n"),
 	printf_P(PSTR("%SMulti-extruder settings:\n%S   Swap retract length (mm):    %.2f\n%S   Swap rec. addl. length (mm): %.2f\n"),

+ 0 - 1
Firmware/Marlin.h

@@ -287,7 +287,6 @@ extern unsigned char fanSpeedSoftPwm;
 #endif
 #endif
 
 
 #ifdef FWRETRACT
 #ifdef FWRETRACT
-extern bool autoretract_enabled;
 extern bool retracted[EXTRUDERS];
 extern bool retracted[EXTRUDERS];
 extern float retract_length, retract_length_swap, retract_feedrate, retract_zlift;
 extern float retract_length, retract_length_swap, retract_feedrate, retract_zlift;
 extern float retract_recover_length, retract_recover_length_swap, retract_recover_feedrate;
 extern float retract_recover_length, retract_recover_length_swap, retract_recover_feedrate;

+ 3 - 4
Firmware/Marlin_main.cpp

@@ -411,7 +411,6 @@ uint8_t active_extruder = 0;
 int fanSpeed=0;
 int fanSpeed=0;
 
 
 #ifdef FWRETRACT
 #ifdef FWRETRACT
-  bool autoretract_enabled=false;
   bool retracted[EXTRUDERS]={false
   bool retracted[EXTRUDERS]={false
     #if EXTRUDERS > 1
     #if EXTRUDERS > 1
     , false
     , false
@@ -3721,7 +3720,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
 			total_filament_used = total_filament_used + ((destination[E_AXIS] - current_position[E_AXIS]) * 100);
 			total_filament_used = total_filament_used + ((destination[E_AXIS] - current_position[E_AXIS]) * 100);
 		}
 		}
           #ifdef FWRETRACT
           #ifdef FWRETRACT
-            if(autoretract_enabled)
+            if(cs.autoretract_enabled)
             if( !(code_seen('X') || code_seen('Y') || code_seen('Z')) && code_seen('E')) {
             if( !(code_seen('X') || code_seen('Y') || code_seen('Z')) && code_seen('E')) {
               float echange=destination[E_AXIS]-current_position[E_AXIS];
               float echange=destination[E_AXIS]-current_position[E_AXIS];
 
 
@@ -6010,7 +6009,7 @@ Sigma_Exit:
         {
         {
           case 0: 
           case 0: 
           {
           {
-            autoretract_enabled=false;
+            cs.autoretract_enabled=false;
             retracted[0]=false;
             retracted[0]=false;
             #if EXTRUDERS > 1
             #if EXTRUDERS > 1
               retracted[1]=false;
               retracted[1]=false;
@@ -6021,7 +6020,7 @@ Sigma_Exit:
           }break;
           }break;
           case 1: 
           case 1: 
           {
           {
-            autoretract_enabled=true;
+            cs.autoretract_enabled=true;
             retracted[0]=false;
             retracted[0]=false;
             #if EXTRUDERS > 1
             #if EXTRUDERS > 1
               retracted[1]=false;
               retracted[1]=false;