SPINDLE/LASER pins changes

This commit is contained in:
Scott Lahteine 2017-04-07 13:52:21 -05:00 committed by Scott Lahteine
parent 99c4900a98
commit ffe0e2d19a
41 changed files with 1247 additions and 110 deletions

View file

@ -515,8 +515,8 @@
#if PIN_EXISTS(SPINDLE_LASER_ENABLE) #if PIN_EXISTS(SPINDLE_LASER_ENABLE)
REPORT_NAME_DIGITAL(SPINDLE_LASER_ENABLE_PIN, __LINE__ ) REPORT_NAME_DIGITAL(SPINDLE_LASER_ENABLE_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(SPINDLE_SPEED_LASER_POWER) #if PIN_EXISTS(SPINDLE_LASER_PWM)
REPORT_NAME_DIGITAL(SPINDLE_SPEED_LASER_POWER_PIN, __LINE__ ) REPORT_NAME_DIGITAL(SPINDLE_LASER_PWM_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(SR_CLK) #if PIN_EXISTS(SR_CLK)
REPORT_NAME_DIGITAL(SR_CLK_PIN, __LINE__ ) REPORT_NAME_DIGITAL(SR_CLK_PIN, __LINE__ )

View file

@ -43,6 +43,8 @@
#define RAMPS_D9_PIN 8 #define RAMPS_D9_PIN 8
#define MOSFET_D_PIN 12 #define MOSFET_D_PIN 12
#define CASE_LIGHT_PIN -1 // MUST BE HARDWARE PWM but one is not available on expansion header
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
// //
@ -104,3 +106,58 @@
#define BEEPER_PIN 33 #define BEEPER_PIN 33
#endif // ULTRA_LCD && NEWPANEL #endif // ULTRA_LCD && NEWPANEL
/**
* M3/M4/M5 - Spindle/Laser Control
*
* If you want to control the speed of your spindle then you'll have
* have to sacrifce the Extruder and pull some signals off the Z stepper
* driver socket.
*
* The following assumes:
* - the Z stepper driver socket is empty
* - the extruder driver socket has a driver board plugged into it
* - the Z stepper wires are attached the the extruder connector
*
* If you want to keep the extruder AND don't have a LCD display then
* you can still control the power on/off and spindle direction.
*
* Where to get spindle signals
*
* stepper signal socket name socket name
* -------
* SPINDLE_LASER_ENABLE_PIN /ENABLE O| |O VMOT
* MS1 O| |O GND
* MS2 O| |O 2B
* MS3 O| |O 2A
* /RESET O| |O 1A
* /SLEEP O| |O 1B
* SPINDLE_LASER_PWM_PIN STEP O| |O VDD
* SPINDLE_DIR_PIN DIR O| |O GND
* -------
*
* Note: Socket names vary from vendor to vendor
*/
#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are not good with 3DRAG
#undef SPINDLE_LASER_ENABLE_PIN
#undef SPINDLE_DIR_PIN
#if ENABLED(SPINDLE_LASER_ENABLE)
#if !EXTRUDERS
#undef E0_DIR_PIN
#undef E0_ENABLE_PIN
#undef E0_STEP_PIN
#undef Z_DIR_PIN
#undef Z_ENABLE_PIN
#undef Z_STEP_PIN
#define Z_DIR_PIN 28
#define Z_ENABLE_PIN 24
#define Z_STEP_PIN 26
#define SPINDLE_LASER_PWM_PIN 46 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 62 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 48
#elif !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)) // use expansion header if no LCD in use
#define SPINDLE_LASER_ENABLE_PIN 16 // Pin should have a pullup/pulldown!
#define SPINDLE_DIR_PIN 17
#endif
#endif

View file

@ -24,12 +24,20 @@
* AZTEEG_X3 Arduino Mega with RAMPS v1.4 pin assignments * AZTEEG_X3 Arduino Mega with RAMPS v1.4 pin assignments
*/ */
#ifndef __AVR_ATmega2560__
#error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu."
#endif
#if HOTENDS > 2 || E_STEPPERS > 2 #if HOTENDS > 2 || E_STEPPERS > 2
#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" #define BOARD_NAME "Azteeg X3"
#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
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
// //
@ -63,3 +71,30 @@
#define STAT_LED_BLUE_PIN 11 #define STAT_LED_BLUE_PIN 11
#endif #endif
//
// Misc
//
#if ENABLED(OK_TO_CHANGE_CASE_LIGHT) && STAT_LED_RED_PIN == 6
#undef STAT_LED_RED_PIN
#undef CASE_LIGHT_PIN
#define CASE_LIGHT_PIN 6 // open collector FET driver
#endif
//
// 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_ENABLE_PIN
#undef SPINDLE_DIR_PIN
#if ENABLED(SPINDLE_LASER_ENABLE)
#undef SDA // use EXP3 header
#undef SCL
#if SERVO0_PIN == 7
#undef SERVO0_PIN
#def SERVO0_PIN 11
#define SPINDLE_LASER_PWM_PIN 7 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 20 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 21
#endif

View file

@ -30,8 +30,16 @@
#define BOARD_NAME "Azteeg X3 Pro" #define BOARD_NAME "Azteeg X3 Pro"
#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
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
#ifndef __AVR_ATmega2560__
#error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu."
#endif
// //
// Servos // Servos
// //
@ -126,7 +134,37 @@
#if ENABLED(VIKI2) || ENABLED(miniVIKI) #if ENABLED(VIKI2) || ENABLED(miniVIKI)
#undef SD_DETECT_PIN #undef SD_DETECT_PIN
#define SD_DETECT_PIN 49 // For easy adapter board #define SD_DETECT_PIN 49 // For easy adapter board
#undef BEEPER_PIN
#define BEEPER_PIN 12 // 33 isn't physically available to the LCD display
#else #else
#define STAT_LED_RED_PIN 32 #define STAT_LED_RED_PIN 32
#define STAT_LED_BLUE_PIN 35 #define STAT_LED_BLUE_PIN 35
#endif #endif
//
// Misc. Functions
//
#undef DOGLCD_A0 // steal pin 44 for the case light
#define DOGLCD_A0 57
#if ENABLED(OK_TO_CHANGE_CASE_LIGHT)
#undef CASE_LIGHT_PIN
#define CASE_LIGHT_PIN 44 // must have a hardware PWM
#endif
//
// 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_ENABLE_PIN
#undef SPINDLE_DIR_PIN
#if ENABLED(SPINDLE_LASER_ENABLE) // use EXP2 header
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
#undef BTN_EN2
#define BTN_EN2 31 // need 7 for the spindle speed PWM
#endif
#define SPINDLE_LASER_PWM_PIN 7 // must have a hardware PWM
#define SPINDLE_LASER_ENABLE_PIN 20 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 21
#endif

View file

@ -30,6 +30,13 @@
#define BOARD_NAME "2PrintBeta Due" #define BOARD_NAME "2PrintBeta Due"
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENABLE_PIN 66 // Pin should have a pullup/pulldown!
#define SPINDLE_DIR_PIN 67
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
// //

View file

@ -46,6 +46,18 @@
#define ORIG_E2_AUTO_FAN_PIN 6 #define ORIG_E2_AUTO_FAN_PIN 6
#define ORIG_E3_AUTO_FAN_PIN 6 #define ORIG_E3_AUTO_FAN_PIN 6
//
// Misc. Functions
//
#define CASE_LIGHT_PIN 44 // MUST BE HARDWARE PWM
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENABLE_PIN 40 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 42
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
// //

View file

@ -27,6 +27,40 @@
* https://github.com/unrepentantgeek/brainwave-arduino * https://github.com/unrepentantgeek/brainwave-arduino
*/ */
/**
* Rev B 16 JAN 2017
*
* Added pointer to a currently available Arduino IDE extension that will
* allow this board to use the latest Marlin software
*/
/**
* Marlin_AT90USB - https://github.com/Bob-the-Kuhn/Marlin_AT90USB
* This is the only known IDE extension that is compatible with the pin definitions
* in this file, Adrduino 1.6.12 and the latest mainstream Marlin software.
*
* "Marlin_AT90USB" makes PWM0A available rather than the usual PWM1C. These PWMs share
* the same physical pin. Marlin uses TIMER1 to generate interrupts and sets it up such
* that PWM1A, PWM1B & PWM1C can not be used.
*
* Installation:
*
* 1. In the Arduino IDE, under Files -> Preferences paste the following URL
* https://rawgit.com/Bob-the-Kuhn/Marlin_AT90USB/master/package_MARLIN_AT90USB_index.json
* 2. Under Tools -> Board -> Boards manager, scroll to the bottom, click on MARLIN_AT90USB
* and then click on "Install"
* 3. Select "AT90USB646_STANDARD" from the 'Tools -> Boards' menu.
*/
/**
* To burn the bootloader that comes with Marlin_AT90USB:
*
* 1. Connect your programmer to the board.
* 2. In Arduino IDE select "AT90USB646_STANDARD" and then select the programmer.
* 3. In Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
* 4. The programmer is no longer needed. Remove it.
*/
#ifndef __AVR_AT90USB646__ #ifndef __AVR_AT90USB646__
#error "Oops! Make sure you have 'Brainwave' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Brainwave' selected from the 'Tools -> Boards' menu."
#endif #endif

View file

@ -27,14 +27,70 @@
* https://github.com/unrepentantgeek/brainwave-arduino * https://github.com/unrepentantgeek/brainwave-arduino
*/ */
/**
* Rev B 16 JAN 2017
*
* Added pointers to currently available Arduino IDE extensions that will
* allow this board to use the latest Marlin software
*/
/**
* There are three Arduino IDE extensions that are compatible with this board
* and with the mainstream Marlin software. All have been used with Arduino 1.6.12
*
* Teensyduino - http://www.pjrc.com/teensy/teensyduino.html
* Select Teensy++ 2.0 in Arduino IDE from the 'Tools -> Boards' menu
*
* Installation instructions are at the above URL. Don't bother loading the
* libraries - they are not used with the Marlin software.
*
* Printrboard - https://github.com/scwimbush/Printrboard-HID-Arduino-IDE-Support
* This is basically Teensyduino but with a bootloader that can handle image sizes
* larger than 64K.
*
* Installation:
*
* 1. Go to the above URL, click on the "Clone or Download" button and then
* click on "Download ZIP" button.
* 2. Unzip the file, find the "printrboard" directory and then copy it to the
* hardware directory in Arduino. The Arduino hardware directory will probably
* be located in a path similar to this: C:\Program Files (x86)\Arduino\hardware.
* 3. Restart Arduino.
* 4. Select "Printrboard" from the 'Tools -> Boards' menu.
*
* Marlin_AT90USB - https://github.com/Bob-the-Kuhn/Marlin_AT90USB
* Uses the bootloader from Printerboard above.
*
* "Marlin_AT90USB" makes PWM0A available rather than the usual PWM1C. These PWMs share
* the same physical pin. Marlin uses TIMER1 to generate interrupts and sets it up such
* that PWM1A, PWM1B & PWM1C can not be used.
*
* Installation:
*
* 1. In the Arduino IDE, under Files -> Preferences paste the following URL
* https://rawgit.com/Bob-the-Kuhn/Marlin_AT90USB/master/package_MARLIN_AT90USB_index.json
* 2. Under Tools -> Board -> Boards manager, scroll to the bottom, click on MARLIN_AT90USB
* and then click on "Install"
* 3. Select "AT90USB1286_TEENSYPP" from the 'Tools -> Boards' menu.
*/
/**
* To burn the bootloader that comes with Printrboard and Marlin_AT90USB:
*
* 1. Connect your programmer to the board.
* 2. In the Arduino IDE select "Printrboard" or "AT90USB1286_TEENSYPP" and then select the programmer.
* 3. In the Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
* 4. The programmer is no longer needed. Remove it.
*/
#ifndef __AVR_AT90USB1286__ #ifndef __AVR_AT90USB1286__
#error "Oops! Make sure you have 'Brainwave Pro' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Teensy++ 2.0', 'AT90USB1286_TEENSYPP', or 'Printrboard' selected from the 'Tools -> Boards' menu."
#endif #endif
#include "fastio.h" #include "fastio.h"
#if DISABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical. #if DISABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical.
#error "Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config" #error "Uncomment '#define AT90USBxx_TEENSYPP_ASSIGNMENTS' in fastio.h for this config"
#endif #endif
#define BOARD_NAME "Brainwave Pro" #define BOARD_NAME "Brainwave Pro"

View file

@ -54,3 +54,10 @@
#define SD_DETECT_PIN 6 #define SD_DETECT_PIN 6
#endif // NEWPANEL && ULTRA_LCD #endif // NEWPANEL && ULTRA_LCD
//
// M3/M4/M5 - Spindle/Laser Control
//
#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are not valid with this board
#undef SPINDLE_LASER_ENABLE_PIN
#undef SPINDLE_DIR_PIN

View file

@ -24,6 +24,31 @@
* Gen3 Monolithic Electronics pin assignments * Gen3 Monolithic Electronics pin assignments
*/ */
/**
* Rev B 26 DEC 2016
*
* added pointer to a current Arduino IDE extension
*
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the Sanguino board and then select the CPU.
*
*/
#ifndef __AVR_ATmega644P__ #ifndef __AVR_ATmega644P__
#error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
#endif #endif
@ -73,3 +98,4 @@
#define PS_ON_PIN 14 // Alex, does this work on the card? #define PS_ON_PIN 14 // Alex, does this work on the card?
// Alex extras from Gen3+ // Alex extras from Gen3+

View file

@ -24,6 +24,32 @@
* Gen3+ pin assignments * Gen3+ pin assignments
*/ */
/**
* Rev B 26 DEC 2016
*
* added pointer to a current Arduino IDE extension
*
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the SANGUINO board and then select the CPU.
*
*/
#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__)
#error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
#endif #endif
@ -73,4 +99,3 @@
// //
#define SDSS 4 #define SDSS 4
#define PS_ON_PIN 14 #define PS_ON_PIN 14

View file

@ -24,6 +24,33 @@
* Gen6 pin assignments * Gen6 pin assignments
*/ */
/**
* Rev B 26 DEC 2016
*
* 1) added pointer to a current Arduino IDE extension
* 2) added support for M3, M4 & M5 spindle control commands
* 3) added case light pin definition
*
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the Sanguino board and then select the CPU.
*
*/
#ifndef __AVR_ATmega644P__ #ifndef __AVR_ATmega644P__
#ifndef __AVR_ATmega1284P__ #ifndef __AVR_ATmega1284P__
#error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
@ -80,7 +107,15 @@
// //
#define SDSS 17 #define SDSS 17
#define DEBUG_PIN 0 #define DEBUG_PIN 0
#define CASE_LIGHT_PIN 16 // MUST BE HARDWARE PWM
// RS485 pins // RS485 pins
#define TX_ENABLE_PIN 12 #define TX_ENABLE_PIN 12
#define RX_ENABLE_PIN 13 #define RX_ENABLE_PIN 13
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENABLE_PIN 5 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 16 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 6

View file

@ -24,6 +24,32 @@
* Gen6 Deluxe pin assignments * Gen6 Deluxe pin assignments
*/ */
/**
* Rev B 26 DEC 2016
*
* added pointer to a current Arduino IDE extension
*
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the SANGUINO board and then select the CPU.
*
*/
#define BOARD_NAME "Gen6 Deluxe" #define BOARD_NAME "Gen6 Deluxe"
#include "pins_GEN6.h" #include "pins_GEN6.h"

View file

@ -24,8 +24,35 @@
* Gen7 v1.1, v1.2, v1.3 pin assignments * Gen7 v1.1, v1.2, v1.3 pin assignments
*/ */
/**
* Rev B 26 DEC 2016
*
* 1) added pointer to a current Arduino IDE extension
* 2) added support for M3, M4 & M5 spindle control commands
* 3) added case light pin definition
*
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the Sanguino board and then select the CPU.
*
*/
#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__) #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__)
#error "Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
#endif #endif
#ifndef BOARD_NAME #ifndef BOARD_NAME
@ -39,10 +66,13 @@
// //
// Limit Switches // Limit Switches
// //
#define X_STOP_PIN 7 #define X_MIN_PIN 7
#define Y_STOP_PIN 5 #define Y_MIN_PIN 5
#define Z_MIN_PIN 1 #define Z_MIN_PIN 1
#define Z_MAX_PIN 0 #define Z_MAX_PIN 0
#define Y_MAX_PIN 2
#define X_MAX_PIN 6
// //
// Z Probe (when not Z_MIN_PIN) // Z Probe (when not Z_MIN_PIN)
@ -91,6 +121,12 @@
// //
#define PS_ON_PIN 15 #define PS_ON_PIN 15
#if GEN7_VERSION < 13
#define CASE_LIGHT_PIN 16 // MUST BE HARDWARE PWM
#else // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
#define CASE_LIGHT_PIN 15 // MUST BE HARDWARE PWM
#endif
// All these generations of Gen7 supply thermistor power // All these generations of Gen7 supply thermistor power
// via PS_ON, so ignore bad thermistor readings // via PS_ON, so ignore bad thermistor readings
#define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
@ -101,3 +137,13 @@
#define TX_ENABLE_PIN 12 #define TX_ENABLE_PIN 12
#define RX_ENABLE_PIN 13 #define RX_ENABLE_PIN 13
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENABLE_PIN 10 // Pin should have a pullup/pulldown!
#define SPINDLE_DIR_PIN 11
#if GEN7_VERSION < 13
#define SPINDLE_LASER_PWM_PIN 16 // MUST BE HARDWARE PWM
#else // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
#define SPINDLE_LASER_PWM_PIN 15 // MUST BE HARDWARE PWM
#endif

View file

@ -24,6 +24,31 @@
* Gen7 v1.3 pin assignments * Gen7 v1.3 pin assignments
*/ */
/**
* Rev B 26 DEC 2016
*
* added pointer to a current Arduino IDE extension
*
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the Sanguino board and then select the CPU.
*
*/
#define BOARD_NAME "Gen7 v1.3" #define BOARD_NAME "Gen7 v1.3"
#define GEN7_VERSION 13 // v1.3 #define GEN7_VERSION 13 // v1.3

View file

@ -24,8 +24,35 @@
* Gen7 v1.4 pin assignments * Gen7 v1.4 pin assignments
*/ */
/**
* Rev B 26 DEC 2016
*
* 1) added pointer to a current Arduino IDE extension
* 2) added support for M3, M4 & M5 spindle control commands
* 3) added case light pin definition
*
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the Sanguino board and then select the CPU.
*
*/
#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__) #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__)
#error "Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
#endif #endif
#define BOARD_NAME "Gen7 v1.4" #define BOARD_NAME "Gen7 v1.4"
@ -67,17 +94,25 @@
// //
// Heaters // Heaters
// //
#define HEATER_0_PIN 4 #define HEATER_0_PIN 4
#define HEATER_BED_PIN 3 #define HEATER_BED_PIN 3
// //
// Misc. Functions // Misc. Functions
// //
#define PS_ON_PIN 15 #define PS_ON_PIN 15
#define CASE_LIGHT_PIN 15 // MUST BE HARDWARE PWM
// A pin for debugging // A pin for debugging
#define DEBUG_PIN 0 #define DEBUG_PIN 0
// RS485 pins // RS485 pins
#define TX_ENABLE_PIN 12 #define TX_ENABLE_PIN 12
#define RX_ENABLE_PIN 13 #define RX_ENABLE_PIN 13
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENABLE_PIN 20 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 16 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 21

View file

@ -27,8 +27,35 @@
* Please review the pins and adjust them for your needs. * Please review the pins and adjust them for your needs.
*/ */
/**
* Rev B 26 DEC 2016
*
* 1) added pointer to a current Arduino IDE extension
* 2) added support for M3, M4 & M5 spindle control commands
* 3) added case light pin definition
*
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the Sanguino board and then select the CPU.
*
*/
#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__) #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__)
#error "Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
#endif #endif
#define BOARD_NAME "Gen7 Custom" #define BOARD_NAME "Gen7 Custom"
@ -76,6 +103,7 @@
// //
#define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support #define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support
#define PS_ON_PIN 19 #define PS_ON_PIN 19
#define CASE_LIGHT_PIN 15 // MUST BE HARDWARE PWM
// A pin for debugging // A pin for debugging
#define DEBUG_PIN -1 #define DEBUG_PIN -1
@ -101,3 +129,10 @@
// RS485 pins // RS485 pins
//#define TX_ENABLE_PIN 12 //#define TX_ENABLE_PIN 12
//#define RX_ENABLE_PIN 13 //#define RX_ENABLE_PIN 13
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENABLE_PIN 5 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 16 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 6

View file

@ -66,3 +66,8 @@
#undef PS_ON_PIN #undef PS_ON_PIN
#undef KILL_PIN #undef KILL_PIN
#undef SD_DETECT_PIN #undef SD_DETECT_PIN
#if Z_STEP_PIN == 26
#undef Z_STEP_PIN
#define Z_STEP_PIN 32
#endif

View file

@ -127,6 +127,7 @@
// //
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define CASE_LIGHT_PIN 2
// //
// LCD / Controller // LCD / Controller
@ -152,3 +153,10 @@
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#endif // MINIPANEL #endif // MINIPANEL
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 6 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 7 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 8

View file

@ -97,6 +97,7 @@
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define CASE_LIGHT_PIN 2
// //
// LCD / Controller // LCD / Controller
@ -120,3 +121,10 @@
#define SD_DETECT_PIN -1 // RAMPS doesn't use this #define SD_DETECT_PIN -1 // RAMPS doesn't use this
#endif // ULTRA_LCD && NEWPANEL #endif // ULTRA_LCD && NEWPANEL
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 3 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 4 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 11

View file

@ -71,8 +71,8 @@
#define E1_DIR_PIN 39 #define E1_DIR_PIN 39
#define E1_ENABLE_PIN 28 #define E1_ENABLE_PIN 28
#define E2_STEP_PIN 23 #define E2_STEP_PIN 23 // ? schematic says 24
#define E2_DIR_PIN 24 #define E2_DIR_PIN 24 // ? schematic says 23
#define E2_ENABLE_PIN 22 #define E2_ENABLE_PIN 22
// //
@ -112,6 +112,7 @@
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define CASE_LIGHT_PIN 2
// //
// LCD / Controller // LCD / Controller
@ -129,3 +130,10 @@
#define BTN_EN1 61 #define BTN_EN1 61
#define BTN_EN2 59 #define BTN_EN2 59
#define BTN_ENC 43 #define BTN_ENC 43
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 3 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 16 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 11

View file

@ -28,6 +28,8 @@
#error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
#endif #endif
#define MEGATRONICS_31
#if ENABLED(MEGATRONICS_31) #if ENABLED(MEGATRONICS_31)
#define BOARD_NAME "Megatronics v3.1" #define BOARD_NAME "Megatronics v3.1"
#else #else
@ -129,6 +131,7 @@
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define CASE_LIGHT_PIN 45 // try the keypad connector
// //
// LCD / Controller // LCD / Controller
@ -164,3 +167,27 @@
#endif #endif
#endif #endif
//
// M3/M4/M5 - Spindle/Laser Control
//
#if DISABLED(REPRAPWORLD_KEYPAD) // try to use the keypad connector first
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 43 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 42
#elif EXTRUDERS <= 2
// try to hijack the last extruder so that we can get the PWM signal off the Y breakout
// move all the Y signals to the E2 extruder socket - makes dual Y steppers harder
#undef Y_ENABLE_PIN
#undef Y_STEP_PIN
#undef Y_DIR_PIN
#undef E2_STEP_PIN
#undef E2_ENABLE_PIN
#undef E2_DIR_PIN
#define Y_ENABLE_PIN 23
#define Y_STEP_PIN 22
#define Y_DIR_PIN 60
#define SPINDLE_LASER_PWM_PIN 4 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 17 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 5
#endif

View file

@ -41,6 +41,17 @@
* *
*/ */
/**
* Rev B 2 JAN 2017
*
* Added pin definitions for:
* M3, M4 & M5 spindle control commands
* case light
*
* Corrected pin assignment for MOSFET_B_PIN pin. Changed it from 9 to 11. The port
* number (B5) agrees with the schematic but B5 is assigned to logical pin 11.
*/
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
#endif #endif
@ -140,7 +151,7 @@
// With no heated bed, an additional 24V fan is possible. // With no heated bed, an additional 24V fan is possible.
// //
#define MOSFET_A_PIN 6 // H3 #define MOSFET_A_PIN 6 // H3
#define MOSFET_B_PIN 11 // B5 #define MOSFET_B_PIN 11 // B5 - Rev A of this file had this pin assigned to 9
#define MOSFET_C_PIN 45 // L4 #define MOSFET_C_PIN 45 // L4
#define MOSFET_D_PIN 44 // L5 #define MOSFET_D_PIN 44 // L5
@ -193,11 +204,11 @@
#define LED_PIN 13 // B7 #define LED_PIN 13 // B7
#define CUTOFF_RESET_PIN 16 // H1 #define CUTOFF_RESET_PIN 16 // H1
#define CUTOFF_TEST_PIN 17 // H0 #define CUTOFF_TEST_PIN 17 // H0
#define CASE_LIGHT_PIN 44 // L5 MUST BE HARDWARE PWM
// //
// LCD / Controller // LCD / Controller
// //
#ifdef REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER #ifdef REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
#define LCD_PINS_RS 33 // C4, LCD-STROBE #define LCD_PINS_RS 33 // C4, LCD-STROBE
@ -246,7 +257,6 @@
#endif #endif
// //
// SD Card // SD Card
// //
@ -255,7 +265,20 @@
#define MAX_PIN THERMO_SCK_PIN #define MAX_PIN THERMO_SCK_PIN
//check if all pins are defined in mega/pins_arduino.h //
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENABLE_PIN 66 // K4 Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 8 // H5 MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 67 // K5
// Check if all pins are defined in mega/pins_arduino.h
#include <Arduino.h> #include <Arduino.h>
static_assert(NUM_DIGITAL_PINS > MAX_PIN, "add missing pins to [arduino dir]/hardware/arduino/avr/variants/mega/pins_arduino.h based on fastio.h" static_assert(NUM_DIGITAL_PINS > MAX_PIN, "add missing pins to [arduino dir]/hardware/arduino/avr/variants/mega/pins_arduino.h based on fastio.h"
"to digital_pin_to_port_PGM, digital_pin_to_bit_mask_PGM, digital_pin_to_timer_PGM, NUM_DIGITAL_PINS, see below"); "to digital_pin_to_port_PGM, digital_pin_to_bit_mask_PGM, digital_pin_to_timer_PGM, NUM_DIGITAL_PINS, see below");

View file

@ -111,6 +111,7 @@
// //
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define CASE_LIGHT_PIN 9
// //
// LCD / Controller // LCD / Controller
@ -140,3 +141,12 @@
#endif // NEWPANEL #endif // NEWPANEL
#endif // ULTRA_LCD #endif // ULTRA_LCD
//
// M3/M4/M5 - Spindle/Laser Control
//
// use P1 connector for spindle pins
#define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 18 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 19

View file

@ -24,6 +24,13 @@
* Minitronics v1.0/1.1 pin assignments * Minitronics v1.0/1.1 pin assignments
*/ */
/**
* Rev B 2 JAN 2017
*
* Added pin definitions for M3, M4 & M5 spindle control commands
*
*/
#ifndef __AVR_ATmega1281__ #ifndef __AVR_ATmega1281__
#error "Oops! Make sure you have 'Minitronics' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Minitronics' selected from the 'Tools -> Boards' menu."
#endif #endif
@ -123,3 +130,19 @@
#define SD_DETECT_PIN -1 // Minitronics doesn't use this #define SD_DETECT_PIN -1 // Minitronics doesn't use this
#endif #endif
//
// M3/M4/M5 - Spindle/Laser Control
//
#if ENABLED(SPINDLE_LASER_ENABLE) // assumes we're only doing CNC work (no 3D printing)
#undef HEATER_BED_PIN
#undef TEMP_BED_PIN // need to free up some pins but also need to
#undef TEMP_0_PIN // re-assign them (to unused pins) because Marlin
#undef TEMP_1_PIN // requires the presence of certain pins or else it
#define HEATER_BED_PIN 4 // won't compile
#define TEMP_BED_PIN 50
#define TEMP_0_PIN 51
#define SPINDLE_LASER_ENABLE_PIN 52 // using A6 because it already has a pull up on it
#define SPINDLE_LASER_PWM_PIN 3 // WARNING - LED & resistor pull up to +12/+24V stepper voltage
#define SPINDLE_DIR_PIN 53
#endif

View file

@ -22,6 +22,8 @@
/** /**
* MKS BASE 1.0 Arduino Mega2560 with RAMPS v1.4 pin assignments * MKS BASE 1.0 Arduino Mega2560 with RAMPS v1.4 pin assignments
*
* Rev B - Override pin definitions for CASE_LIGHT and M3/M4/M5 spindle control
*/ */
#if HOTENDS > 2 || E_STEPPERS > 2 #if HOTENDS > 2 || E_STEPPERS > 2
@ -36,4 +38,13 @@
// Power outputs EFBF or EFBE // Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7 #define MOSFET_D_PIN 7
#define CASE_LIGHT_PIN 2
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 2 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 15 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 19
#include "pins_RAMPS.h" #include "pins_RAMPS.h"

View file

@ -51,6 +51,31 @@
* REF http://sanguino.cc/hardware * REF http://sanguino.cc/hardware
*/ */
/**
* Rev B 26 DEC 2016
*
* added pointer to a current Arduino IDE extension
*
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the Sanguino board and then select the CPU.
*
*/
#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__)
#error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. (Final OMCA board)" #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. (Final OMCA board)"
#endif #endif

View file

@ -50,8 +50,33 @@
* *
*/ */
/**
* Rev B 26 DEC 2016
*
* added pointer to a current Arduino IDE extension
*
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the Sanguino board and then select the CPU.
*
*/
#ifndef __AVR_ATmega644__ #ifndef __AVR_ATmega644__
#error "Oops! Make sure you have 'SanguinoA' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
#endif #endif
#define BOARD_NAME "Alpha OMCA" #define BOARD_NAME "Alpha OMCA"

View file

@ -137,6 +137,7 @@
#define LED_PIN 13 #define LED_PIN 13
#define FILWIDTH_PIN 3 // Analog Input #define FILWIDTH_PIN 3 // Analog Input
#define PS_ON_PIN 4 #define PS_ON_PIN 4
#define CASE_LIGHT_PIN 46
// //
// LCD / Controller // LCD / Controller
@ -208,3 +209,10 @@
#endif // !NEWPANEL #endif // !NEWPANEL
#endif // ULTRA_LCD #endif // ULTRA_LCD
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 45 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 31 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 32

View file

@ -204,6 +204,16 @@
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#if !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
#define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM
#elif !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) \
&& (ENABLED(PANEL_ONE) || ENABLED(VIKI2) || ENABLED(miniVIKI) || ENABLED(MINIPANEL) || ENABLED(REPRAPWORLD_KEYPAD))) // try to use AUX 2
#define CASE_LIGHT_PIN 44 // MUST BE HARDWARE PWM
#endif
#endif
// //
// LCD / Controller // LCD / Controller
// //
@ -361,3 +371,19 @@
#endif // NEWPANEL #endif // NEWPANEL
#endif // ULTRA_LCD #endif // ULTRA_LCD
//
// M3/M4/M5 - Spindle/Laser Control
//
#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE_PIN)
#if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
#define SPINDLE_LASER_ENABLE_PIN 4 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 6 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 5
#elif !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) \
&& (ENABLED(PANEL_ONE) || ENABLED(VIKI2) || ENABLED(miniVIKI) || ENABLED(MINIPANEL) || ENABLED(REPRAPWORLD_KEYPAD))) // try to use AUX 2
#define SPINDLE_LASER_ENABLE_PIN 40 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 65
#endif
#endif

View file

@ -101,3 +101,11 @@
#define SDPOWER 48 #define SDPOWER 48
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define CASE_LIGHT_PIN 45 // MUST BE HARDWARE PWM
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENABLE_PIN 41 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 45 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 43

View file

@ -82,16 +82,16 @@
// //
// Heaters / Fans // Heaters / Fans
// //
#undef HEATER_BED_PIN #undef HEATER_BED_PIN
#define HEATER_BED_PIN 10 #define HEATER_BED_PIN 10
#undef FAN_PIN #undef FAN_PIN
#define FAN_PIN 8 // Same as RAMPS_13_EEF #define FAN_PIN 8 // Same as RAMPS_13_EEF
// //
// Misc. Functions // Misc. Functions
// //
#undef PS_ON_PIN #undef PS_ON_PIN
#define PS_ON_PIN -1 #define PS_ON_PIN -1
// //
@ -110,24 +110,24 @@
#define BTN_RT 32 #define BTN_RT 32
// 'R' button // 'R' button
#undef BTN_ENC #undef BTN_ENC
#define BTN_ENC 31 #define BTN_ENC 31
// Disable encoder // Disable encoder
#undef BTN_EN1 #undef BTN_EN1
#define BTN_EN1 -1 #define BTN_EN1 -1
#undef BTN_EN2 #undef BTN_EN2
#define BTN_EN2 -1 #define BTN_EN2 -1
#undef SD_DETECT_PIN #undef SD_DETECT_PIN
#define SD_DETECT_PIN 22 #define SD_DETECT_PIN 22
#elif ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) #elif ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#undef SD_DETECT_PIN #undef SD_DETECT_PIN
#define SD_DETECT_PIN 22 #define SD_DETECT_PIN 22
#undef KILL_PIN #undef KILL_PIN
#define KILL_PIN 32 #define KILL_PIN 32
#endif #endif

View file

@ -100,7 +100,7 @@
#endif #endif
#if TEMP_SENSOR_2 == -1 #if TEMP_SENSOR_2 == -1
#define TEMP_2_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_BED is defined as thermocouple) #define TEMP_2_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple)
#else #else
#define TEMP_2_PIN 13 // Analog Input (default connector for thermistor *T2* on rumba board is used) #define TEMP_2_PIN 13 // Analog Input (default connector for thermistor *T2* on rumba board is used)
#endif #endif
@ -109,7 +109,7 @@
//#define TEMP_X_PIN 12 // Analog Input (default connector for thermistor *T3* on rumba board is used) //#define TEMP_X_PIN 12 // Analog Input (default connector for thermistor *T3* on rumba board is used)
#if TEMP_SENSOR_BED == -1 #if TEMP_SENSOR_BED == -1
#define TEMP_BED_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_2 is defined as thermocouple) #define TEMP_BED_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple)
#else #else
#define TEMP_BED_PIN 11 // Analog Input (default connector for thermistor *THB* on rumba board is used) #define TEMP_BED_PIN 11 // Analog Input (default connector for thermistor *THB* on rumba board is used)
#endif #endif
@ -133,6 +133,7 @@
#define LED_PIN 13 #define LED_PIN 13
#define PS_ON_PIN 45 #define PS_ON_PIN 45
#define KILL_PIN 46 #define KILL_PIN 46
#define CASE_LIGHT_PIN 45
// //
// LCD / Controller // LCD / Controller
@ -148,3 +149,10 @@
#define BTN_EN1 11 #define BTN_EN1 11
#define BTN_EN2 12 #define BTN_EN2 12
#define BTN_ENC 43 #define BTN_ENC 43
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 4 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 14 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 15

View file

@ -24,6 +24,33 @@
* Sanguinololu board pin assignments * Sanguinololu board pin assignments
*/ */
/**
* Rev B 26 DEC 2016
*
* 1) added pointer to a current Arduino IDE extension
* 2) added support for M3, M4 & M5 spindle control commands
* 3) added case light pin definition
*
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the Sanguino board and then select the CPU.
*
*/
#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__)
#error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
#endif #endif
@ -96,19 +123,26 @@
// //
// Misc. Functions // Misc. Functions
// //
/** /**
* On some broken versions of the Sanguino libraries the pin definitions are wrong, * In some versions of the Sanguino libraries the pin
* which then needs SDSS as pin 24. But you should upgrade your Sanguino libraries! See #368. * definitions are wrong, with SDSS = 24 and LED_PIN = 28 (Melzi).
* If you encounter issues with these pins, upgrade your
* Sanguino libraries! See #368.
*/ */
//#define SDSS 24 //#define SDSS 24
#define SDSS 31 #define SDSS 31
#if IS_MELZI #if IS_MELZI
#define LED_PIN 27 // On some broken versions of the Sanguino libraries the pin definitions are wrong, so LED_PIN needs to be 28. But you should upgrade your Sanguino libraries! See #368. #define LED_PIN 27
#elif MB(STB_11) #elif MB(STB_11)
#define LCD_BACKLIGHT_PIN 17 // LCD backlight LED #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
#endif #endif
#if DISABLED(SPINDLE_LASER_ENABLE) && ENABLED(SANGUINOLOLU_V_1_2) && !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)) // try to use IO Header
#define CASE_LIGHT_PIN 4 // MUST BE HARDWARE PWM - see if IO Header is available
#endif
// //
// LCD / Controller // LCD / Controller
// //
@ -181,14 +215,62 @@
#else #else
#define BTN_ENC 30 #define BTN_ENC 30
#endif #endif
#elif ENABLED(OLED_PANEL_TINYBOY2) #else // !Panelolu2
#define BTN_ENC 28
#define LCD_SDSS -1
#else // !Panelolu2, !TinyBoy2
#define BTN_ENC 16 #define BTN_ENC 16
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi #define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
#endif // !Panelolu2, !TinyBoy2 #endif // !Panelolu2
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
#endif // ULTRA_LCD && NEWPANEL #endif // ULTRA_LCD && NEWPANEL
//
// M3/M4/M5 - Spindle/Laser Control
//
#if ENABLED(SPINDLE_LASER_ENABLE)
#if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)) // try to use IO Header
#define SPINDLE_LASER_ENABLE_PIN 10 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 4 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 11
#elif !MB(MELZI) // use X stepper motor socket
/**
* To control the spindle speed and have an LCD you must sacrifice
* the Extruder and pull some signals off the X stepper driver socket.
*
* The following assumes:
* - The X stepper driver socket is empty
* - The extruder driver socket has a driver board plugged into it
* - The X stepper wires are attached the the extruder connector
*/
/**
* Where to get the spindle signals
*
* spindle signal socket name socket name
* -------
* /ENABLE O| |O VMOT
* MS1 O| |O GND
* MS2 O| |O 2B
* MS3 O| |O 2A
* /RESET O| |O 1A
* /SLEEP O| |O 1B
* SPINDLE_LASER_PWM_PIN STEP O| |O VDD
* SPINDLE_LASER_ENABLE_PIN DIR O| |O GND
* -------
*
* Note: Socket names vary from vendor to vendor.
*/
#undef X_DIR_PIN
#undef X_ENABLE_PIN
#undef X_STEP_PIN
#define X_DIR_PIN 0
#define X_ENABLE_PIN 14
#define X_STEP_PIN 1
#define SPINDLE_LASER_PWM_PIN 15 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 21 // Pin should have a pullup!
#define SPINDLE_DIR_PIN -1 // No pin available on the socket for the direction pin
#endif
#endif // SPINDLE_LASER_ENABLE

View file

@ -115,7 +115,6 @@
#define EXT_AUX_A4 4 // Analog #define EXT_AUX_A4 4 // Analog
#define EXT_AUX_A4_IO 44 // Digital IO, 42 (teensy), 44 (marlin) #define EXT_AUX_A4_IO 44 // Digital IO, 42 (teensy), 44 (marlin)
// //
// LCD / Controller // LCD / Controller
// //
@ -134,10 +133,23 @@
#endif // SAV_3DLCD #endif // SAV_3DLCD
#if ENABLED(SAV_3DLCD) || ENABLED(SAV_3DGLCD) #if ENABLED(SAV_3DLCD) || ENABLED(SAV_3DGLCD)
#define BTN_EN1 EXT_AUX_A1_IO #define BTN_EN1 EXT_AUX_A1_IO
#define BTN_EN2 EXT_AUX_A0_IO #define BTN_EN2 EXT_AUX_A0_IO
#define BTN_ENC EXT_AUX_PWM_D24 #define BTN_ENC EXT_AUX_PWM_D24
#define KILL_PIN EXT_AUX_A2_IO #define KILL_PIN EXT_AUX_A2_IO
#define HOME_PIN EXT_AUX_A4_IO #define HOME_PIN EXT_AUX_A4_IO
#endif // SAV_3DLCD || SAV_3DGLCD
#else // Try to use the expansion header for spindle control
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 24 // 12 AT90USB… pin #
#define SPINDLE_LASER_ENABLE_PIN 39 // Pin should have a pullup! 41 AT90USB… pin #
#define SPINDLE_DIR_PIN 40 // 42 AT90USB… pin #
#define CASE_LIGHT_PIN 0 // 24 AT90USB… pin #
#endif

View file

@ -24,6 +24,31 @@
* Sethi 3D_1 pin assignments - www.sethi3d.com.br * Sethi 3D_1 pin assignments - www.sethi3d.com.br
*/ */
/**
* Rev B 26 DEC 2016
*
* added pointer to a current Arduino IDE extension
* this assumes that this board uses the Sanguino pin map
*/
/**
* A useable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the Sanguino board and then select the CPU.
*
*/
#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__) #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__)
#error "Oops! Make sure you have 'Sethi 3D' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Sethi 3D' selected from the 'Tools -> Boards' menu."
#endif #endif

View file

@ -124,6 +124,7 @@
#define SDSS 20 // 8 #define SDSS 20 // 8
#define LED_PIN 6 #define LED_PIN 6
#define PS_ON_PIN 27 #define PS_ON_PIN 27
#define CASE_LIGHT_PIN 1 // MUST BE HARDWARE PWM
// //
// LCD / Controller // LCD / Controller
@ -139,3 +140,10 @@
#define BTN_EN2 39 #define BTN_EN2 39
#define BTN_ENC 40 #define BTN_ENC 40
#endif #endif
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENABLE_PIN 5 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 0 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 7

View file

@ -12,27 +12,82 @@
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
/** /**
* Teensylu 0.7 pin assignments (AT90USB1286) * rev B 30 DEC 2016
* Requires the Teensyduino software with Teensy++ 2.0 selected in Arduino IDE! *
* http://www.pjrc.com/teensy/teensyduino.html * The original version of this file did NOT result in a useful program because:
* See http://reprap.org/wiki/Printrboard for more info * 1. The pin numbers assumed that the "#define AT90USBxx_TEENSYPP_ASSIGNMENTS" line
* in FASTIO.h was commented out. There wasn't an Arduino IDE 1.6.x extension/package
* that supported this pin map so the latest Marlin wouldn't compile.
* 2. The silkscreen for the four end stops don't agree with the schematic. Activating
* the X endstop would tell the software that the Y endstop just went active.
* 3. The thermistor inputs also had heater names assigned to them. The result was
* thermistor inputs that were set to digital outputs.
*
* Rev B corrects the above problems by:
* 1. The "Marlin_AT90USB" extension/package was developed. This extension enables the
* latest Marlin software to compile using Arduino IDE 1.6.x and 1.80.
* 2. The endstop pin numbers in this file were changed to match the silkscreen. This
* makes it a little confusing when trying to correlate the schematic with the pin
* numbers used in this file.
* 3. The offending heater names were deleted.
*
* To create a useable image for Teensylu do the following:
* a) Install the Marlin_AT90USB extension with either of the following methods:
* Automatic - paste this URL into preferences and then use Boards manager
* https://rawgit.com/Bob-the-Kuhn/Marlin_AT90USB/master/package_MARLIN_AT90USB_index.json
* Manual:
* 1. Copy the following URL into Go to "https://github.com/Bob-the-Kuhn/Marlin_AT90USB",
* click on the "Clone or Download" button and then click on "Download ZIP" button.
* 2. Unzip the file, find the "Marlin_AT90USB" directory and then copy it to the
* hardware directory in Arduino. The Arduino hardware directory will probably be
* located in a path similar to this: C:\Program Files (x86)\Arduino\hardware
* b) Connect the USBtinyISP to the board.
* c) In the Arduino IDE select the "AT90USB1286_STANDARD" board in the of the "Marlin_AT90USB"
* section and select the "USBtinyISP" programmer.
* d) In the Arduino IDE click on "burn bootloader". Don't worry about the "verify
* failed at 1F000" error message.
* e) The USBtinyISP programmer is no longer needed. Remove it.
* f) In FASTIO.h comment out the "#define AT90USBxx_TEENSYPP_ASSIGNMENTS" line.
* g) To upload a sketch do the following:
* 1. remove the jumper
* 2. press reset
* 3. click on the "upload" button in the Arduino IDE
* 4. wait until the upload finishes (less than a minute)
* 5. put the jumper back on
* 6. press the reset button
*
*
* NOTE - the "Marlin_AT90USB" pin maps make PWM0A available rather than the usual PWM1C.
* These PWMs share the same physical pin. Marlin uses TIMER1 to generate
* interrupts and sets it up such that PWM1A, PWM1B & PWM1C can not be used.
*/ */
#ifndef __AVR_AT90USB1286__ /**
#error "Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu." * SILKSCREEN ERROR
*
* The silkscreen for the endstops do NOT match the schematic. The silkscreen SHOULD
* read (from left to right) X-STOP, Y-STOP, Z-STOP & E-STOP. The silkscreen actually
* reads E-STOP, X-STOP, Y-STOP & Z-STOP.
*
* The pin assignments in this file match the silkscreen.
*/
#if !defined(__AVR_AT90USB1286__) && !defined(__AVR_AT90USB1286P__)
#error "Oops! Make sure you have 'AT90USB1286_STANDARD' selected from the 'Tools -> Boards' menu."
#endif #endif
#if ENABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin traditional. #if ENABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS)
#error "These Teensylu assignments depend on traditional Marlin assignments, not AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h" #error "please disable (comment out) the AT90USBxx_TEENSYPP_ASSIGNMENTS flag in FASTIO.h "
#endif #endif
#define BOARD_NAME "Teensylu" #define BOARD_NAME "Teensylu"
@ -40,74 +95,84 @@
#define USBCON 1286 // Disable MarlinSerial etc. #define USBCON 1286 // Disable MarlinSerial etc.
#define LARGE_FLASH true #define LARGE_FLASH true
// //
// Limit Switches // Limit Switche definitions that match the SCHEMATIC
// //
#define X_STOP_PIN 13 //#define X_STOP_PIN 13
#define Y_STOP_PIN 14 //#define Y_STOP_PIN 14
#define Z_STOP_PIN 15 //#define Z_STOP_PIN 15
//#define E_STOP_PIN 36
//
// Limit Switch definitions that match the SILKSCREEN
//
#define X_STOP_PIN 14
#define Y_STOP_PIN 15
#define Z_STOP_PIN 36
//#define E_STOP_PIN 13
// //
// Steppers // Steppers
// //
#define X_STEP_PIN 0 #define X_STEP_PIN 0
#define X_DIR_PIN 1 #define X_DIR_PIN 1
#define X_ENABLE_PIN 39 #define X_ENABLE_PIN 39
#define Y_STEP_PIN 2 #define Y_STEP_PIN 2
#define Y_DIR_PIN 3 #define Y_DIR_PIN 3
#define Y_ENABLE_PIN 38 #define Y_ENABLE_PIN 38
#define Z_STEP_PIN 4 #define Z_STEP_PIN 4
#define Z_DIR_PIN 5 #define Z_DIR_PIN 5
#define Z_ENABLE_PIN 23 #define Z_ENABLE_PIN 23
#define E0_STEP_PIN 6
#define E0_DIR_PIN 7
#define E0_ENABLE_PIN 19
#define E0_STEP_PIN 6
#define E0_DIR_PIN 7
#define E0_ENABLE_PIN 19
//
// Temperature Sensors // Temperature Sensors
//
#define TEMP_0_PIN 7 // Analog Input (Extruder) #define TEMP_0_PIN 7 // Analog Input (Extruder)
#define TEMP_BED_PIN 6 // Analog Input (Bed) #define TEMP_BED_PIN 6 // Analog Input (Bed)
// //
// Heaters / Fans // Heaters / Fans
// //
#define HEATER_0_PIN 21 // Extruder #define HEATER_0_PIN 21 // Extruder
#define HEATER_1_PIN 46 #define HEATER_BED_PIN 20
#define HEATER_2_PIN 47
#define HEATER_BED_PIN 20
// If soft or fast PWM is off then use Teensyduino pin numbering, Marlin #define FAN_PIN 22
// fastio pin numbering otherwise
#if ENABLED(FAN_SOFT_PWM) || ENABLED(FAST_PWM_FAN)
#define FAN_PIN 22
#else
#define FAN_PIN 16
#endif
// //
// Misc. Functions // Misc. Functions
// //
#define SDSS 8 #define SDSS 8
#define CASE_LIGHT_PIN 24
// //
// LCD / Controller // LCD / Controller
// //
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
#define BEEPER_PIN -1 #define BEEPER_PIN -1
#if ENABLED(LCD_I2C_PANELOLU2) #if ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 27 // RX1 - fastio.h pin mapping 27 #define BTN_EN1 27
#define BTN_EN2 26 // TX1 - fastio.h pin mapping 26 #define BTN_EN2 26
#define BTN_ENC 43 // A3 - fastio.h pin mapping 43 #define BTN_ENC 43
#define SDSS 40 // use SD card on Panelolu2 (Teensyduino pin mapping) #define SDSS 40 // use SD card on Panelolu2
#endif // LCD_I2C_PANELOLU2 #endif // LCD_I2C_PANELOLU2
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
#endif // ULTRA_LCD && NEWPANEL #endif // ULTRA_LCD && NEWPANEL
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 12 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 41 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 42

View file

@ -24,6 +24,14 @@
* Ultiboard v2.0 pin assignments * Ultiboard v2.0 pin assignments
*/ */
/**
* Rev B 2 JAN 2017
*
* Added pin definitions for:
* M3, M4 & M5 spindle control commands
* case light
*/
#ifndef __AVR_ATmega2560__ #ifndef __AVR_ATmega2560__
#error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu."
#endif #endif
@ -110,3 +118,16 @@
#define BTN_EN1 40 #define BTN_EN1 40
#define BTN_EN2 41 #define BTN_EN2 41
#define BTN_ENC 19 #define BTN_ENC 19
//
// M3/M4/M5 - Spindle/Laser Control
//
#if ENABLED(SPINDLE_LASER_ENABLE) // use the LED_PIN for spindle speed control or case light
#undef LED_PIN
#define SPINDLE_DIR_PIN 16
#define SPINDLE_LASER_ENABLE_PIN 17 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 8 // MUST BE HARDWARE PWM
#else
#undef LED_PIN
#define CASE_LIGHT_PIN 8
#endif

View file

@ -24,6 +24,14 @@
* Ultimaker pin assignments * Ultimaker pin assignments
*/ */
/**
* Rev B 2 JAN 2017
*
* Added pin definitions for:
* M3, M4 & M5 spindle control commands
* case light
*/
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
#endif #endif
@ -102,6 +110,7 @@
#define LED_PIN 13 #define LED_PIN 13
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define SUICIDE_PIN 54 // PIN that has to be turned on right after start, to keep power flowing. #define SUICIDE_PIN 54 // PIN that has to be turned on right after start, to keep power flowing.
#define CASE_LIGHT_PIN 8
// //
// LCD / Controller // LCD / Controller
@ -146,3 +155,10 @@
#endif // !NEWPANEL #endif // !NEWPANEL
#endif // ULTRA_LCD #endif // ULTRA_LCD
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 10 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 11 // use the EXP3 PWM header

View file

@ -24,6 +24,42 @@
* Ultimaker pin assignments (Old electronics) * Ultimaker pin assignments (Old electronics)
*/ */
/**
* Rev B 3 JAN 2017
*
* Details on pin definitions for M3, M4 & M5 spindle control commands and for
* the CASE_LIGHT_PIN are at the end of this file.
*
* This started out as an attempt to add pin definitions for M3, M4 & M5 spindle
* control commands but quickly turned into a head scratcher as the sources for
* the revisions provided inconsistent information.
*
* As best I can determine:
* 1.5.3 boards should use the pins_ULTIMAKER.h file which means the BOARD_NAME
* define in this file should say 1.5.3 rather than 1.5.4
* This file is meant for 1.1 - 1.3 boards.
* The endstops for the 1.0 boards use different definitions than on the 1.1 - 1.3
* boards.
*
* I've added sections that have the 1.0 and 1.5.3 + endstop definitions so you can
* easily switch if needed. I've also copied over the 1.5.3 + LCD definitions.
*
* To be 100% sure of the board you have:
* 1. In Configuration_adv.h enable "PINS_DEBUGGING"
* 2. Compile & uploade
* 3. Enter the command "M43 W1 I1". This command will report that pin nmumber and
* name of any pin that changes state.
* 4. Using a 1k (approximately) resistor pull the endstops and some of the LCD pins
* to ground and see what is reported.
* 5. If the reported pin doesn't match the file then try a different board revision
* and repeat steps 2 - 5
*/
#define board_rev_1_1_TO_1_3
//#define board_rev_1_0
//#define board_rev_1_5
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
#endif #endif
@ -37,18 +73,38 @@
// //
// Limit Switches // Limit Switches
// //
#define X_MIN_PIN 15 #if ENABLED(board_rev_1_1_TO_1_3)
#define X_MAX_PIN 14 #define X_MIN_PIN 15 // SW1
#define Y_MIN_PIN 17 #define X_MAX_PIN 14 // SW2
#define Y_MAX_PIN 16 #define Y_MIN_PIN 17 // SW3
#define Z_MIN_PIN 19 #define Y_MAX_PIN 16 // SW4
#define Z_MAX_PIN 18 #define Z_MIN_PIN 19 // SW5
#define Z_MAX_PIN 18 // SW6
#endif
#if ENABLED(board_rev_1_0)
#define X_MIN_PIN 13 // SW1
#define X_MAX_PIN 12 // SW2
#define Y_MIN_PIN 11 // SW3
#define Y_MAX_PIN 10 // SW4
#define Z_MIN_PIN 9 // SW5
#define Z_MAX_PIN 8 // SW6
#endif
#if ENABLED(board_rev_1_5)
#define X_MIN_PIN 22
#define X_MAX_PIN 24
#define Y_MIN_PIN 26
#define Y_MAX_PIN 28
#define Z_MIN_PIN 30
#define Z_MAX_PIN 32
#endif
// //
// Z Probe (when not Z_MIN_PIN) // Z Probe (when not Z_MIN_PIN)
// //
#ifndef Z_MIN_PROBE_PIN #ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 18 #define Z_MIN_PROBE_PIN Z_MAX_PIN
#endif #endif
// //
@ -70,9 +126,9 @@
#define E0_DIR_PIN 45 #define E0_DIR_PIN 45
#define E0_ENABLE_PIN 41 #define E0_ENABLE_PIN 41
#define E1_STEP_PIN -1 #define E1_STEP_PIN -1 // 49
#define E1_DIR_PIN -1 #define E1_DIR_PIN -1 // 47
#define E1_ENABLE_PIN -1 #define E1_ENABLE_PIN -1 // 48
// //
// Temperature Sensors // Temperature Sensors
@ -84,14 +140,144 @@
// Heaters / Fans // Heaters / Fans
// //
#define HEATER_0_PIN 2 #define HEATER_0_PIN 2
#define HEATER_1_PIN 1 //#define HEATER_1_PIN 3 // used for case light Rev A said "1"
#define HEATER_BED_PIN 4
// //
// LCD / Controller // LCD / Controller
// //
#define LCD_PINS_RS 24 #if ENABLED(board_rev_1_0) || ENABLED(board_rev_1_1_TO_1_3)
#define LCD_PINS_ENABLE 22 #define LCD_PINS_RS 24
#define LCD_PINS_D4 36 #define LCD_PINS_ENABLE 22
#define LCD_PINS_D5 34 #define LCD_PINS_D4 36
#define LCD_PINS_D6 32 #define LCD_PINS_D5 34
#define LCD_PINS_D7 30 #define LCD_PINS_D6 32
#define LCD_PINS_D7 30
#elif ENABLED(board_rev_1_5) && ENABLED(ULTRA_LCD)
#define BEEPER_PIN 18
#if ENABLED(NEWPANEL)
#define LCD_PINS_RS 20
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 16
#define LCD_PINS_D5 21
#define LCD_PINS_D6 5
#define LCD_PINS_D7 6
// buttons are directly attached
#define BTN_EN1 40
#define BTN_EN2 42
#define BTN_ENC 19
#define SD_DETECT_PIN 38
#else // !NEWPANEL - Old style panel with shift register
// buttons are attached to a shift register
#define SHIFT_CLK 38
#define SHIFT_LD 42
#define SHIFT_OUT 40
#define SHIFT_EN 17
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 5
#define LCD_PINS_D4 6
#define LCD_PINS_D5 21
#define LCD_PINS_D6 20
#define LCD_PINS_D7 19
#define SD_DETECT_PIN -1
#endif // !NEWPANEL
#endif // ULTRA_LCD
//
// case light - see spindle section for more info on available hardware PWMs
//
#if !PIN_EXISTS(CASE_LIGHT) && ENABLED(board_rev_1_5)
#define CASE_LIGHT_PIN 7 // use PWM - MUST BE HARDWARE PWM
#endif
//
// M3/M4/M5 - Spindle/Laser Control
//
#if ENABLED(SPINDLE_LASER_ENABLE)
#if ENABLED(board_rev_1_0) // use the last three SW positions
#undef Z_MIN_PROBE_PIN
#undef X_MIN_PIN // SW1
#undef X_MAX_PIN // SW2
#undef Y_MIN_PIN // SW3
#undef Y_MAX_PIN // SW4
#undef Z_MIN_PIN // SW5
#undef Z_MAX_PIN // SW6
#define X_STOP_PIN 13 // SW1 (didn't change) - also has a useable hardware PWM
#define Y_STOP_PIN 12 // SW2
#define Z_STOP_PIN 11 // SW3
#define SPINDLE_DIR_PIN 10 // SW4
#define SPINDLE_LASER_PWM_PIN 9 // SW5 MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 8 // SW6 Pin should have a pullup!
#elif ENABLED(board_rev_1_5) // use the same pins - but now they are on a different connector
#define SPINDLE_DIR_PIN 10 // EXP3-6 (silkscreen says 10)
#define SPINDLE_LASER_PWM_PIN 9 // EXP3-7 (silkscreen says 9) MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 8 // EXP3-8 (silkscreen says 8) Pin should have a pullup!
#elif ENABLED(board_rev_1_1_TO_1_3)
/**
* Only four hardware PWMs physically connected to anything on these boards:
*
* HEATER_0_PIN 2 silkscreen varies - usually "PWM 1" or "HEATER1"
* HEATER_1_PIN 3 silkscreen varies - usually "PWM 2" or "HEATER2"
* HEATER_BED_PIN 4 silkscreen varies - usually "PWM 3" or "HEATED BED"
* E0_DIR_PIN 45
*
* If one of the heaters is used then special precautions will usually be needed.
* They have an LED and resistor pullup to +24V which could damage 3.3V-5V ICs.
*/
#if EXTRUDERS == 1 // Move E0 stepper module to the spare and get signals from E0
#undef E0_STEP_PIN
#undef E0_DIR_PIN
#undef E0_ENABLE_PIN
#define E0_STEP_PIN 49
#define E0_DIR_PIN 47
#define E0_ENABLE_PIN 48
#define SPINDLE_DIR_PIN 43
#define SPINDLE_LASER_PWM_PIN 45 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 41 // Pin should have a pullup!
#elif TEMP_SENSOR_BED == 0 // Can't use E0 so see if HEATER_BED_PIN is available
#undef HEATER_BED_PIN
#define SPINDLE_DIR_PIN 38 // Probably pin 4 on 10 pin connector closest to the E0 socket
#define SPINDLE_LASER_PWM_PIN 4 // MUST BE HARDWARE PWM - Special precautions usually needed.
#define SPINDLE_LASER_ENABLE_PIN 40 // Pin should have a pullup! (Probably pin 6 on the 10-pin
// connector closest to the E0 socket)
#endif
#endif
#endif
/**
* Where to get the spindle signals on the E0 socket
*
* spindle signal socket name socket name
* -------
* SPINDLE_LASER_ENABLE_PIN /ENABLE *| |O VMOT
* MS1 O| |O GND
* MS2 O| |O 2B
* MS3 O| |O 2A
* /RESET O| |O 1A
* /SLEEP O| |O 1B
* SPINDLE_DIR_PIN STEP O| |O VDD
* SPINDLE_LASER_PWM_PIN DIR O| |O GND
* -------
* * - pin closest to MS1, MS2 & MS3 jumpers on the board
*
* Note: Socket names vary from vendor to vendor.
*/