Browse Source

Merge pull request #5133 from thinkyhead/rc_M355_case_light

M355 Case light
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
commit
66744a6076
  1. 1
      Marlin/Conditionals_post.h
  2. 4
      Marlin/Configuration_adv.h
  3. 61
      Marlin/Marlin_main.cpp
  4. 4
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  5. 4
      Marlin/example_configurations/Felix/Configuration_adv.h
  6. 4
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  7. 4
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  8. 4
      Marlin/example_configurations/K8200/Configuration_adv.h
  9. 4
      Marlin/example_configurations/K8400/Configuration_adv.h
  10. 4
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  11. 4
      Marlin/example_configurations/SCARA/Configuration_adv.h
  12. 4
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  13. 4
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  14. 4
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  15. 4
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  16. 4
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  17. 4
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  18. 4
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  19. 4
      Marlin/example_configurations/makibox/Configuration_adv.h
  20. 4
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h

1
Marlin/Conditionals_post.h

@ -509,6 +509,7 @@
#define HAS_E4_STEP (PIN_EXISTS(E4_STEP))
#define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
#define HAS_BUZZER (PIN_EXISTS(BEEPER) || ENABLED(LCD_USE_I2C_BUZZER))
#define HAS_CASE_LIGHT (PIN_EXISTS(CASE_LIGHT))
#define HAS_MOTOR_CURRENT_PWM (PIN_EXISTS(MOTOR_CURRENT_PWM_XY) || PIN_EXISTS(MOTOR_CURRENT_PWM_Z) || PIN_EXISTS(MOTOR_CURRENT_PWM_E))

4
Marlin/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

61
Marlin/Marlin_main.cpp

@ -861,12 +861,18 @@ void setup_homepin(void) {
#endif
}
void setup_photpin() {
#if HAS_PHOTOGRAPH
OUT_WRITE(PHOTOGRAPH_PIN, LOW);
#if HAS_CASE_LIGHT
void setup_case_light() {
#if ENABLED(CASE_LIGHT_DEFAULT_ON)
OUT_WRITE(CASE_LIGHT_PIN, HIGH);
#else
OUT_WRITE(CASE_LIGHT_PIN, LOW);
#endif
}
#endif
void setup_powerhold() {
#if HAS_SUICIDE
OUT_WRITE(SUICIDE_PIN, HIGH);
@ -7087,6 +7093,38 @@ inline void gcode_M907() {
#endif // HAS_MICROSTEPS
#if HAS_CASE_LIGHT
/**
* M355: Turn case lights on/off
*
* S<int> change state on/off or sets PWM
*
*/
inline void gcode_M355() {
if (code_seen('S')) {
SERIAL_ECHO_START;
SERIAL_ECHOPGM("Case lights ");
byte light_pwm = code_value_byte();
switch (light_pwm) {
case 0: // Disable lights
SERIAL_ECHOPGM("off");
break;
case 1: // Enable lights
light_pwm = 255;
SERIAL_ECHOPGM("on");
break;
default: // Enable lights PWM
SERIAL_ECHOPAIR("set to: ", (int)map(light_pwm, 0, 255, 0, 100));
SERIAL_CHAR('%');
break;
}
analogWrite(CASE_LIGHT_PIN, light_pwm);
SERIAL_EOL;
}
}
#endif // HAS_CASE_LIGHT
#if ENABLED(MIXING_EXTRUDER)
/**
@ -8195,6 +8233,14 @@ void process_next_command() {
#endif // HAS_MICROSTEPS
#if HAS_CASE_LIGHT
case 355: // M355 Turn case lights on/off
gcode_M355();
break;
#endif // HAS_CASE_LIGHT
case 999: // M999: Restart after being Stopped
gcode_M999();
break;
@ -9693,9 +9739,16 @@ void setup() {
#endif
stepper.init(); // Initialize stepper, this enables interrupts!
setup_photpin();
servo_init();
#if HAS_PHOTOGRAPH
OUT_WRITE(PHOTOGRAPH_PIN, LOW);
#endif
#if HAS_CASE_LIGHT
setup_case_light();
#endif
#if HAS_BED_PROBE
endstops.enable_z_probe(false);
#endif

4
Marlin/example_configurations/Cartesio/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 35
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/Felix/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/Hephestos/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/Hephestos_2/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/K8200/Configuration_adv.h

@ -230,6 +230,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/K8400/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/RigidBot/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/SCARA/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/TAZ4/Configuration_adv.h

@ -232,6 +232,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/WITBOX/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/delta/generic/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h

@ -229,6 +229,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/makibox/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

4
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h

@ -224,6 +224,10 @@
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
// Define a pin to turn case light on/off
//#define CASE_LIGHT_PIN 4
//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on
//===========================================================================
//============================ Mechanical Settings ==========================
//===========================================================================

Loading…
Cancel
Save