Missed these macros disable_e1/2
This commit is contained in:
parent
25522d3d68
commit
c7f0ee13be
|
|
@ -4938,8 +4938,6 @@ void process_commands()
|
||||||
disable_y();
|
disable_y();
|
||||||
disable_z();
|
disable_z();
|
||||||
disable_e0();
|
disable_e0();
|
||||||
disable_e1();
|
|
||||||
disable_e2();
|
|
||||||
setTargetBed(0); //set bed target temperature back to 0
|
setTargetBed(0); //set bed target temperature back to 0
|
||||||
lcd_show_fullscreen_message_and_wait_P(_T(MSG_PINDA_CALIBRATION_DONE));
|
lcd_show_fullscreen_message_and_wait_P(_T(MSG_PINDA_CALIBRATION_DONE));
|
||||||
eeprom_update_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE, 1);
|
eeprom_update_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE, 1);
|
||||||
|
|
@ -6209,8 +6207,6 @@ Sigma_Exit:
|
||||||
disable_heater();
|
disable_heater();
|
||||||
st_synchronize();
|
st_synchronize();
|
||||||
disable_e0();
|
disable_e0();
|
||||||
disable_e1();
|
|
||||||
disable_e2();
|
|
||||||
finishAndDisableSteppers();
|
finishAndDisableSteppers();
|
||||||
fanSpeed = 0;
|
fanSpeed = 0;
|
||||||
_delay(1000); // Wait a little before to switch off
|
_delay(1000); // Wait a little before to switch off
|
||||||
|
|
@ -6281,9 +6277,9 @@ Sigma_Exit:
|
||||||
if (code_seen('X')) disable_x();
|
if (code_seen('X')) disable_x();
|
||||||
if (code_seen('Y')) disable_y();
|
if (code_seen('Y')) disable_y();
|
||||||
if (code_seen('Z')) disable_z();
|
if (code_seen('Z')) disable_z();
|
||||||
#if ((E0_ENABLE_PIN != X_ENABLE_PIN) && (E1_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS
|
#if (E0_ENABLE_PIN != X_ENABLE_PIN) // Only enable on boards that have seperate ENABLE_PINS
|
||||||
if (code_seen('E')) disable_e0();
|
if (code_seen('E')) disable_e0();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -9269,15 +9265,6 @@ void controllerFan()
|
||||||
lastMotorCheck = _millis();
|
lastMotorCheck = _millis();
|
||||||
|
|
||||||
if(!READ(X_ENABLE_PIN) || !READ(Y_ENABLE_PIN) || !READ(Z_ENABLE_PIN) || (soft_pwm_bed > 0)
|
if(!READ(X_ENABLE_PIN) || !READ(Y_ENABLE_PIN) || !READ(Z_ENABLE_PIN) || (soft_pwm_bed > 0)
|
||||||
#if EXTRUDERS > 2
|
|
||||||
|| !READ(E2_ENABLE_PIN)
|
|
||||||
#endif
|
|
||||||
#if EXTRUDER > 1
|
|
||||||
#if defined(X2_ENABLE_PIN) && X2_ENABLE_PIN > -1
|
|
||||||
|| !READ(X2_ENABLE_PIN)
|
|
||||||
#endif
|
|
||||||
|| !READ(E1_ENABLE_PIN)
|
|
||||||
#endif
|
|
||||||
|| !READ(E0_ENABLE_PIN)) //If any of the drivers are enabled...
|
|| !READ(E0_ENABLE_PIN)) //If any of the drivers are enabled...
|
||||||
{
|
{
|
||||||
lastMotor = _millis(); //... set time to NOW so the fan will turn on
|
lastMotor = _millis(); //... set time to NOW so the fan will turn on
|
||||||
|
|
@ -9310,9 +9297,6 @@ void controllerFan()
|
||||||
*/
|
*/
|
||||||
static void handleSafetyTimer()
|
static void handleSafetyTimer()
|
||||||
{
|
{
|
||||||
#if (EXTRUDERS > 1)
|
|
||||||
#error Implemented only for one extruder.
|
|
||||||
#endif //(EXTRUDERS > 1)
|
|
||||||
if (printer_active() || (!degTargetBed() && !degTargetHotend(0)) || (!safetytimer_inactive_time))
|
if (printer_active() || (!degTargetBed() && !degTargetHotend(0)) || (!safetytimer_inactive_time))
|
||||||
{
|
{
|
||||||
safetyTimer.stop();
|
safetyTimer.stop();
|
||||||
|
|
|
||||||
|
|
@ -1102,12 +1102,6 @@ void st_init()
|
||||||
#if defined(E0_DIR_PIN) && E0_DIR_PIN > -1
|
#if defined(E0_DIR_PIN) && E0_DIR_PIN > -1
|
||||||
SET_OUTPUT(E0_DIR_PIN);
|
SET_OUTPUT(E0_DIR_PIN);
|
||||||
#endif
|
#endif
|
||||||
#if defined(E1_DIR_PIN) && (E1_DIR_PIN > -1)
|
|
||||||
SET_OUTPUT(E1_DIR_PIN);
|
|
||||||
#endif
|
|
||||||
#if defined(E2_DIR_PIN) && (E2_DIR_PIN > -1)
|
|
||||||
SET_OUTPUT(E2_DIR_PIN);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//Initialize Enable Pins - steppers default to disabled.
|
//Initialize Enable Pins - steppers default to disabled.
|
||||||
|
|
||||||
|
|
@ -1141,14 +1135,6 @@ void st_init()
|
||||||
SET_OUTPUT(E0_ENABLE_PIN);
|
SET_OUTPUT(E0_ENABLE_PIN);
|
||||||
if(!E_ENABLE_ON) WRITE(E0_ENABLE_PIN,HIGH);
|
if(!E_ENABLE_ON) WRITE(E0_ENABLE_PIN,HIGH);
|
||||||
#endif
|
#endif
|
||||||
#if defined(E1_ENABLE_PIN) && (E1_ENABLE_PIN > -1)
|
|
||||||
SET_OUTPUT(E1_ENABLE_PIN);
|
|
||||||
if(!E_ENABLE_ON) WRITE(E1_ENABLE_PIN,HIGH);
|
|
||||||
#endif
|
|
||||||
#if defined(E2_ENABLE_PIN) && (E2_ENABLE_PIN > -1)
|
|
||||||
SET_OUTPUT(E2_ENABLE_PIN);
|
|
||||||
if(!E_ENABLE_ON) WRITE(E2_ENABLE_PIN,HIGH);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//endstops and pullups
|
//endstops and pullups
|
||||||
#if defined(X_MIN_PIN) && X_MIN_PIN > -1
|
#if defined(X_MIN_PIN) && X_MIN_PIN > -1
|
||||||
|
|
@ -1246,16 +1232,6 @@ void st_init()
|
||||||
WRITE(E0_STEP_PIN,INVERT_E_STEP_PIN);
|
WRITE(E0_STEP_PIN,INVERT_E_STEP_PIN);
|
||||||
disable_e0();
|
disable_e0();
|
||||||
#endif
|
#endif
|
||||||
#if defined(E1_STEP_PIN) && (E1_STEP_PIN > -1)
|
|
||||||
SET_OUTPUT(E1_STEP_PIN);
|
|
||||||
WRITE(E1_STEP_PIN,INVERT_E_STEP_PIN);
|
|
||||||
disable_e1();
|
|
||||||
#endif
|
|
||||||
#if defined(E2_STEP_PIN) && (E2_STEP_PIN > -1)
|
|
||||||
SET_OUTPUT(E2_STEP_PIN);
|
|
||||||
WRITE(E2_STEP_PIN,INVERT_E_STEP_PIN);
|
|
||||||
disable_e2();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// waveform generation = 0100 = CTC
|
// waveform generation = 0100 = CTC
|
||||||
TCCR1B &= ~(1<<WGM13);
|
TCCR1B &= ~(1<<WGM13);
|
||||||
|
|
|
||||||
|
|
@ -729,12 +729,6 @@ void soft_pwm_init()
|
||||||
#if defined(HEATER_0_PIN) && (HEATER_0_PIN > -1)
|
#if defined(HEATER_0_PIN) && (HEATER_0_PIN > -1)
|
||||||
SET_OUTPUT(HEATER_0_PIN);
|
SET_OUTPUT(HEATER_0_PIN);
|
||||||
#endif
|
#endif
|
||||||
#if defined(HEATER_1_PIN) && (HEATER_1_PIN > -1)
|
|
||||||
SET_OUTPUT(HEATER_1_PIN);
|
|
||||||
#endif
|
|
||||||
#if defined(HEATER_2_PIN) && (HEATER_2_PIN > -1)
|
|
||||||
SET_OUTPUT(HEATER_2_PIN);
|
|
||||||
#endif
|
|
||||||
#if defined(HEATER_BED_PIN) && (HEATER_BED_PIN > -1)
|
#if defined(HEATER_BED_PIN) && (HEATER_BED_PIN > -1)
|
||||||
SET_OUTPUT(HEATER_BED_PIN);
|
SET_OUTPUT(HEATER_BED_PIN);
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -2027,12 +2021,6 @@ void disable_heater()
|
||||||
#if defined(HEATER_0_PIN) && HEATER_0_PIN > -1 && EXTRUDERS > 0
|
#if defined(HEATER_0_PIN) && HEATER_0_PIN > -1 && EXTRUDERS > 0
|
||||||
WRITE(HEATER_0_PIN,LOW);
|
WRITE(HEATER_0_PIN,LOW);
|
||||||
#endif
|
#endif
|
||||||
#if defined(HEATER_1_PIN) && HEATER_1_PIN > -1 && EXTRUDERS > 1
|
|
||||||
WRITE(HEATER_1_PIN,LOW);
|
|
||||||
#endif
|
|
||||||
#if defined(HEATER_2_PIN) && HEATER_2_PIN > -1 && EXTRUDERS > 2
|
|
||||||
WRITE(HEATER_2_PIN,LOW);
|
|
||||||
#endif
|
|
||||||
#if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1
|
#if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1
|
||||||
// TODO: this doesn't take immediate effect!
|
// TODO: this doesn't take immediate effect!
|
||||||
timer02_set_pwm0(0);
|
timer02_set_pwm0(0);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue