From b08639417811109389f71a596dc7a59f5f4ce83b Mon Sep 17 00:00:00 2001 From: Denis Chertykov Date: Sat, 20 Dec 2014 19:33:43 +0300 Subject: [PATCH] Fix syntax errors in #ifdef. --- Marlin/Marlin_main.cpp | 5 +++-- Marlin/temperature.cpp | 6 +++--- Marlin/temperature.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 7efc15ada..7b4808e41 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1616,7 +1616,7 @@ void process_commands() #ifdef SCARA calculate_delta(current_position); plan_set_position(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], current_position[E_AXIS]); -#endif SCARA +#endif // SCARA #ifdef ENDSTOPS_ONLY_FOR_HOMING enable_endstops(false); @@ -3053,11 +3053,12 @@ Sigma_Exit: if (pin_number > -1) { + int target = LOW; + st_synchronize(); pinMode(pin_number, INPUT); - int target; switch(pin_state){ case 1: target = HIGH; diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index 5dc55df6e..a3fedbf98 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -425,7 +425,7 @@ void manage_heater() for(int e = 0; e < EXTRUDERS; e++) { - #ifdef THERMAL_RUNAWAY_PROTECTION_PERIOD && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0 +#if defined (THERMAL_RUNAWAY_PROTECTION_PERIOD) && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0 thermal_runaway_protection(&thermal_runaway_state_machine[e], &thermal_runaway_timer[e], current_temperature[e], target_temperature[e], e, THERMAL_RUNAWAY_PROTECTION_PERIOD, THERMAL_RUNAWAY_PROTECTION_HYSTERESIS); #endif @@ -725,7 +725,7 @@ static void updateTemperaturesFromRawValues() #ifdef TEMP_SENSOR_1_AS_REDUNDANT redundant_temperature = analog2temp(redundant_temperature_raw, 1); #endif - #ifdef FILAMENT_SENSOR && (FILWIDTH_PIN > -1) //check if a sensor is supported + #if defined (FILAMENT_SENSOR) && (FILWIDTH_PIN > -1) //check if a sensor is supported filament_width_meas = analog2widthFil(); #endif //Reset the watchdog after we know we have a temperature measurement. @@ -983,7 +983,7 @@ void setWatch() #endif } -#ifdef THERMAL_RUNAWAY_PROTECTION_PERIOD && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0 +#if defined (THERMAL_RUNAWAY_PROTECTION_PERIOD) && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0 void thermal_runaway_protection(int *state, unsigned long *timer, float temperature, float target_temperature, int heater_id, int period_seconds, int hysteresis_degc) { /* diff --git a/Marlin/temperature.h b/Marlin/temperature.h index ca4efabec..962e048a5 100644 --- a/Marlin/temperature.h +++ b/Marlin/temperature.h @@ -162,7 +162,7 @@ void disable_heater(); void setWatch(); void updatePID(); -#ifdef THERMAL_RUNAWAY_PROTECTION_PERIOD && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0 +#if defined (THERMAL_RUNAWAY_PROTECTION_PERIOD) && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0 void thermal_runaway_protection(int *state, unsigned long *timer, float temperature, float target_temperature, int heater_id, int period_seconds, int hysteresis_degc); static int thermal_runaway_state_machine[3]; // = {0,0,0}; static unsigned long thermal_runaway_timer[3]; // = {0,0,0};