|
@@ -3021,33 +3021,11 @@ Sigma_Exit:
|
3021
|
3021
|
int t= code_value() ;
|
3022
|
3022
|
switch(t)
|
3023
|
3023
|
{
|
3024
|
|
- case 0:
|
3025
|
|
- {
|
3026
|
|
- autoretract_enabled=false;
|
3027
|
|
- retracted[0]=false;
|
3028
|
|
-#if EXTRUDERS > 1
|
3029
|
|
- retracted[1]=false;
|
3030
|
|
-#endif
|
3031
|
|
-#if EXTRUDERS > 2
|
3032
|
|
- retracted[2]=false;
|
3033
|
|
-#endif
|
3034
|
|
-#if EXTRUDERS > 3
|
3035
|
|
- retracted[3]=false;
|
3036
|
|
-#endif
|
3037
|
|
- }break;
|
3038
|
|
- case 1:
|
|
3024
|
+ case 0:
|
|
3025
|
+ case 1:
|
3039
|
3026
|
{
|
3040
|
|
- autoretract_enabled=true;
|
3041
|
|
- retracted[0]=false;
|
3042
|
|
-#if EXTRUDERS > 1
|
3043
|
|
- retracted[1]=false;
|
3044
|
|
-#endif
|
3045
|
|
-#if EXTRUDERS > 2
|
3046
|
|
- retracted[2]=false;
|
3047
|
|
-#endif
|
3048
|
|
-#if EXTRUDERS > 3
|
3049
|
|
- retracted[3]=false;
|
3050
|
|
-#endif
|
|
3027
|
+ autoretract_enabled = (t == 1);
|
|
3028
|
+ for (int i=EXTRUDERS; i--;) retracted[i] = false;
|
3051
|
3029
|
}break;
|
3052
|
3030
|
default:
|
3053
|
3031
|
SERIAL_ECHO_START;
|
|
@@ -4686,15 +4664,6 @@ float calculate_volumetric_multiplier(float diameter) {
|
4686
|
4664
|
}
|
4687
|
4665
|
|
4688
|
4666
|
void calculate_volumetric_multipliers() {
|
4689
|
|
- volumetric_multiplier[0] = calculate_volumetric_multiplier(filament_size[0]);
|
4690
|
|
-#if EXTRUDERS > 1
|
4691
|
|
- volumetric_multiplier[1] = calculate_volumetric_multiplier(filament_size[1]);
|
4692
|
|
-#if EXTRUDERS > 2
|
4693
|
|
- volumetric_multiplier[2] = calculate_volumetric_multiplier(filament_size[2]);
|
4694
|
|
-#if EXTRUDERS > 3
|
4695
|
|
- volumetric_multiplier[3] = calculate_volumetric_multiplier(filament_size[3]);
|
4696
|
|
-#endif //EXTRUDERS > 3
|
4697
|
|
-#endif //EXTRUDERS > 2
|
4698
|
|
-#endif //EXTRUDERS > 1
|
|
4667
|
+ for (int i=EXTRUDERS; i--;)
|
|
4668
|
+ volumetric_multiplier[i] = calculate_volumetric_multiplier(filament_size[i]);
|
4699
|
4669
|
}
|
4700
|
|
-
|