|
|
@ -3022,32 +3022,10 @@ Sigma_Exit:
|
|
|
|
switch(t)
|
|
|
|
switch(t)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
case 0:
|
|
|
|
{
|
|
|
|
|
|
|
|
autoretract_enabled=false;
|
|
|
|
|
|
|
|
retracted[0]=false;
|
|
|
|
|
|
|
|
#if EXTRUDERS > 1
|
|
|
|
|
|
|
|
retracted[1]=false;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if EXTRUDERS > 2
|
|
|
|
|
|
|
|
retracted[2]=false;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
|
|
|
retracted[3]=false;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
}break;
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
case 1:
|
|
|
|
{
|
|
|
|
{
|
|
|
|
autoretract_enabled=true;
|
|
|
|
autoretract_enabled = (t == 1);
|
|
|
|
retracted[0]=false;
|
|
|
|
for (int i=EXTRUDERS; i--;) retracted[i] = false;
|
|
|
|
#if EXTRUDERS > 1
|
|
|
|
|
|
|
|
retracted[1]=false;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if EXTRUDERS > 2
|
|
|
|
|
|
|
|
retracted[2]=false;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
|
|
|
retracted[3]=false;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
}break;
|
|
|
|
}break;
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
SERIAL_ECHO_START;
|
|
|
@ -4686,15 +4664,6 @@ float calculate_volumetric_multiplier(float diameter) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void calculate_volumetric_multipliers() {
|
|
|
|
void calculate_volumetric_multipliers() {
|
|
|
|
volumetric_multiplier[0] = calculate_volumetric_multiplier(filament_size[0]);
|
|
|
|
for (int i=EXTRUDERS; i--;)
|
|
|
|
#if EXTRUDERS > 1
|
|
|
|
volumetric_multiplier[i] = calculate_volumetric_multiplier(filament_size[i]);
|
|
|
|
volumetric_multiplier[1] = calculate_volumetric_multiplier(filament_size[1]);
|
|
|
|
|
|
|
|
#if EXTRUDERS > 2
|
|
|
|
|
|
|
|
volumetric_multiplier[2] = calculate_volumetric_multiplier(filament_size[2]);
|
|
|
|
|
|
|
|
#if EXTRUDERS > 3
|
|
|
|
|
|
|
|
volumetric_multiplier[3] = calculate_volumetric_multiplier(filament_size[3]);
|
|
|
|
|
|
|
|
#endif //EXTRUDERS > 3
|
|
|
|
|
|
|
|
#endif //EXTRUDERS > 2
|
|
|
|
|
|
|
|
#endif //EXTRUDERS > 1
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|