bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #6928 from Bob-the-Kuhn/Fix-case-light-logic-on-Azteeg-X3-boards

Browse Source 
Fix case light logic on Azteeg_X3 boards.
This commit is contained in:
Scott Lahteine 2017-06-01 20:14:15 -05:00 committed by GitHub
commit 147d9d76fc
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/pins_AZTEEG_X3.h
View File

@ -32,11 +32,10 @@
#error "Azteeg X3 supports up to 2 hotends / E-steppers. Comment out this line to continue." #error "Azteeg X3 supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif #endif
#define BOARD_NAME "Azteeg X3" #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
#define CASE_LIGHT_PIN 6 // must define it here or else RAMPS will define it
#if !PIN_EXISTS(CASE_LIGHT) // doesn't already exist so OK to change the definition coming
#define OK_TO_CHANGE_CASE_LIGHT // in from from the include file
#endif #endif
#define BOARD_NAME "Azteeg X3"
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
@ -75,10 +74,8 @@
// //
// Misc // Misc
// //
#if ENABLED(OK_TO_CHANGE_CASE_LIGHT) && STAT_LED_RED_PIN == 6 #if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && PIN_EXISTS(STAT_LED_RED) && STAT_LED_RED_PIN == CASE_LIGHT_PIN
#undef STAT_LED_RED_PIN #undef STAT_LED_RED_PIN
#undef CASE_LIGHT_PIN
#define CASE_LIGHT_PIN 6 // open collector FET driver
#endif #endif
// //
@ -94,6 +91,7 @@
#if SERVO0_PIN == 7 #if SERVO0_PIN == 7
#undef SERVO0_PIN #undef SERVO0_PIN
#def SERVO0_PIN 11 #def SERVO0_PIN 11
#endif
#define SPINDLE_LASER_PWM_PIN 7 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 7 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 20 // Pin should have a pullup! #define SPINDLE_LASER_ENABLE_PIN 20 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 21 #define SPINDLE_DIR_PIN 21

16
Marlin/pins_AZTEEG_X3_PRO.h
View File

@ -28,12 +28,13 @@
#error "Azteeg X3 Pro supports up to 5 hotends / E-steppers. Comment out this line to continue." #error "Azteeg X3 Pro supports up to 5 hotends / E-steppers. Comment out this line to continue."
#endif #endif
#define BOARD_NAME "Azteeg X3 Pro" #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
#define CASE_LIGHT_PIN 44 // must define it here or else RAMPS will define it
#if !PIN_EXISTS(CASE_LIGHT) // doesn't already exist so OK to change the definition coming
#define OK_TO_CHANGE_CASE_LIGHT // in from from the include file
#endif #endif
#define BOARD_NAME "Azteeg X3 Pro"
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
#ifndef __AVR_ATmega2560__ #ifndef __AVR_ATmega2560__
@ -144,19 +145,16 @@
// //
// Misc. Functions // Misc. Functions
// //
#if ENABLED(OK_TO_CHANGE_CASE_LIGHT) #if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && defined(DOGLCD_A0) && DOGLCD_A0 == CASE_LIGHT_PIN
#undef DOGLCD_A0 // steal pin 44 for the case light; if you have a Viki2 and have connected it #undef DOGLCD_A0 // steal pin 44 for the case light; if you have a Viki2 and have connected it
#define DOGLCD_A0 57 // following the Panucatt wiring diagram, you may need to tweak these pin assignments #define DOGLCD_A0 57 // following the Panucatt wiring diagram, you may need to tweak these pin assignments
// as the wiring diagram uses pin 44 for DOGLCD_A0 // as the wiring diagram uses pin 44 for DOGLCD_A0
#undef CASE_LIGHT_PIN
#define CASE_LIGHT_PIN 44 // must have a hardware PWM
#endif #endif
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3 board #undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board
#undef SPINDLE_LASER_ENABLE_PIN #undef SPINDLE_LASER_ENABLE_PIN
#undef SPINDLE_DIR_PIN #undef SPINDLE_DIR_PIN

3
Marlin/pins_RAMPS.h
View File

@ -204,8 +204,7 @@
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#if !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN) #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN)
#undef CASE_LIGHT_PIN
#if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
#define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM #define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM
#elif !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) \ #elif !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) \