Commit 12485790 authored by MagoKimbra's avatar MagoKimbra

Fix statled pin

parent 11320d26
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#define STRING_URL "reprap.org" #define STRING_URL "reprap.org"
#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 #define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1
//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 #define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line 2
// SERIAL_PORT selects which serial port should be used for communication with the host. // SERIAL_PORT selects which serial port should be used for communication with the host.
// This allows the connection of wireless adapters (for instance) to non-default port pins. // This allows the connection of wireless adapters (for instance) to non-default port pins.
...@@ -600,7 +600,7 @@ your extruder heater takes 2 minutes to hit the target on heating. ...@@ -600,7 +600,7 @@ your extruder heater takes 2 minutes to hit the target on heating.
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2,3) #define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2,3)
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel #define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation #define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
#define MEASURED_UPPER_LIMIT 2.00 //upper limit factor used for sensor reading validation in mm #define MEASURED_UPPER_LIMIT 2.00 //upper limit factor used for sensor reading validation in mm
#define MEASURED_LOWER_LIMIT 1.35 //lower limit factor for sensor reading validation in mm #define MEASURED_LOWER_LIMIT 1.35 //lower limit factor for sensor reading validation in mm
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM) #define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
......
...@@ -557,6 +557,14 @@ void setup_photpin() ...@@ -557,6 +557,14 @@ void setup_photpin()
#endif #endif
} }
void setup_statledpin()
{
#ifdef TEMP_STAT_LEDS
pinMode(STAT_LED_BLUE, OUTPUT);
pinMode(STAT_LED_RED, OUTPUT);
#endif
}
void setup_laserbeampin() void setup_laserbeampin()
{ {
#ifdef LASERBEAM #ifdef LASERBEAM
...@@ -671,12 +679,13 @@ void setup() ...@@ -671,12 +679,13 @@ void setup()
fromsd[i] = false; fromsd[i] = false;
} }
tp_init(); // Initialize temperature loop tp_init(); // Initialize temperature loop
plan_init(); // Initialize planner; plan_init(); // Initialize planner;
watchdog_init(); watchdog_init();
st_init(); // Initialize stepper, this enables interrupts! st_init(); // Initialize stepper, this enables interrupts!
setup_photpin(); setup_photpin();
setup_laserbeampin(); // Initialize Laserbeam setup_statledpin(); // Initialize stat led pin
setup_laserbeampin(); // Initialize Laserbeam pin
servo_init(); servo_init();
lcd_init(); lcd_init();
...@@ -6120,10 +6129,10 @@ void prepare_arc_move(char isclockwise) ...@@ -6120,10 +6129,10 @@ void prepare_arc_move(char isclockwise)
max_temp = max(max_temp, degHotend(cur_extruder)); max_temp = max(max_temp, degHotend(cur_extruder));
max_temp = max(max_temp, degTargetHotend(cur_extruder)); max_temp = max(max_temp, degTargetHotend(cur_extruder));
} }
#if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1 #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1
max_temp = max(max_temp, degTargetBed()); max_temp = max(max_temp, degTargetBed());
max_temp = max(max_temp, degBed()); max_temp = max(max_temp, degBed());
#endif #endif
if((max_temp > 55.0) && (red_led == false)) { if((max_temp > 55.0) && (red_led == false)) {
digitalWrite(STAT_LED_RED, 1); digitalWrite(STAT_LED_RED, 1);
digitalWrite(STAT_LED_BLUE, 0); digitalWrite(STAT_LED_BLUE, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment