CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8408 from thinkyhead/bf2_fix_printrboard_pins

Browse Source 
[2.0] Support for Extrudrboard in Printrboard Rev.F
This commit is contained in:
Scott Lahteine 2017-11-13 16:07:58 -06:00 committed by GitHub
commit 705801880b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 79 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/Marlin.cpp
View File

@ -661,7 +661,7 @@ void setup() {
Max7219_init();
#endif
#ifdef DISABLE_JTAG
#if ENABLED(DISABLE_JTAG)
// Disable JTAG on AT90USB chips to free up pins for IO
MCUCR = 0x80;
MCUCR = 0x80;

2
Marlin/src/pins/pins_5DPRINT.h
View File

@ -74,8 +74,6 @@
#define DEFAULT_MACHINE_NAME "Makibox"
#define BOARD_NAME "5DPrint D8"
#define LARGE_FLASH true
//
// Servos
//

2
Marlin/src/pins/pins_ANET_10.h
View File

@ -96,8 +96,6 @@
#define BOARD_NAME "Anet"
#endif
#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_AZSMZ_MINI.h
View File

@ -32,8 +32,6 @@
#define BOARD_NAME "AZSMZ MINI"
#endif
#define LARGE_FLASH true
//
// Servos
//

2
Marlin/src/pins/pins_AZTEEG_X5_GT.h
View File

@ -34,8 +34,6 @@
#define DEFAULT_WEBSITE_URL "https://www.panucatt.com/azteeg_X5_GT_reprap_3d_printer_controller_p/ax5gt.htm"
#endif
#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_BRAINWAVE_PRO.h
View File

@ -80,8 +80,6 @@
#define BOARD_NAME "Brainwave Pro"
#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_CHEAPTRONIC.h
View File

@ -29,8 +29,6 @@
#endif
#define BOARD_NAME "Cheaptronic v1.0"
#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_CHEAPTRONICv2.h
View File

@ -31,8 +31,6 @@
#endif
#define BOARD_NAME "Cheaptronic v2.0"
#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_CNCONTROLS_11.h
View File

@ -8,8 +8,6 @@
#define BOARD_NAME "CN Controls V11"
//#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_CNCONTROLS_12.h
View File

@ -8,8 +8,6 @@
#define BOARD_NAME "CN Controls V12"
//#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_GT2560_REV_A.h
View File

@ -32,8 +32,6 @@
#define BOARD_NAME "GT2560 Rev.A"
#define DEFAULT_MACHINE_NAME "Prusa i3 Pro B"
#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_MEGATRONICS.h
View File

@ -29,8 +29,6 @@
#endif
#define BOARD_NAME "Megatronics"
#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_MEGATRONICS_2.h
View File

@ -29,8 +29,6 @@
#endif
#define BOARD_NAME "Megatronics v2.0"
#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_MEGATRONICS_3.h
View File

@ -36,8 +36,6 @@
#define BOARD_NAME "Megatronics v3.0"
#endif
#define LARGE_FLASH true
//
// Servos
//

2
Marlin/src/pins/pins_MIGHTYBOARD_REVE.h
View File

@ -59,8 +59,6 @@
#define DEFAULT_MACHINE_NAME "MB Replicator"
#define BOARD_NAME "Mightyboard"
#define LARGE_FLASH true
//
// Servos
//

1
Marlin/src/pins/pins_MINIRAMBO.h
View File

@ -29,7 +29,6 @@
#endif
#define BOARD_NAME "Mini Rambo"
#define LARGE_FLASH true
//
// Limit Switches

2
Marlin/src/pins/pins_MINITRONICS.h
View File

@ -40,8 +40,6 @@
#endif
#define BOARD_NAME "Minitronics v1.0 / v1.1"
#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_MKS_SBASE.h
View File

@ -34,8 +34,6 @@
#define DEFAULT_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SBASE"
#endif
#define LARGE_FLASH true
// unused
/*
#define PIN_P0_27 P0_27

4
Marlin/src/pins/pins_PRINTRBOARD.h
View File

@ -67,10 +67,8 @@
#define BOARD_NAME "Printrboard"
#define LARGE_FLASH true
// Disable JTAG pins so they can be used for the Extrudrboard
#define DISABLE_JTAG true
#define DISABLE_JTAG
//
// Limit Switches

83
Marlin/src/pins/pins_PRINTRBOARD_REVF.h
View File

@ -30,8 +30,8 @@
* There are two Arduino IDE extensions that are compatible with this board
* and with the mainstream Marlin software.
*
* Teensyduino - http://www.pjrc.com/teensy/teensyduino.html
* Installation instructions are at the above URL.
* Teensyduino - https://www.pjrc.com/teensy/teensyduino.html
* Installation - https://www.pjrc.com/teensy/td_download.html
*
* Select Teensy++ 2.0 in Arduino IDE from the 'Tools -> Boards' menu
*
@ -66,8 +66,33 @@
#error "Oops! Make sure you have 'Teensy++ 2.0' or 'Printrboard' selected from the 'Tools -> Boards' menu."
#endif
#ifndef USBCON
#error "USBCON should be defined by the platform for this board."
#endif
#define BOARD_NAME "Printrboard Rev F"
#define LARGE_FLASH true
// Disable JTAG pins so EXP1 pins work correctly
// (Its pins are used for the Extrudrboard and filament sensor, for example).
#define DISABLE_JTAG
/**
* Note that REV F6 of the Printrboard stole the A HOTEND pin and
* reassigned it to a second fan for the extruder heater. It's
* recommended that you swap the A and B outputs on the Extrudrboard
* so EXTRUDERS=2 will still work on F6, using B for E1/HEATER_1/TEMP_1.
* See https://printrbot.zendesk.com/hc/en-us/articles/115003072346
*
* If you have REV F6 you probably also want to set E0_AUTO_FAN_PIN
* to PRINTRBOARD_F6_HEATER_FAN_PIN
*
* Define NO_EXTRUDRBOARD if you don't have an EXTRUDRBOARD and wish to
* reassign different functions to EXP1.
*
* Define NO_EXTRUDRBOARD_OUTPUT_SWAP if you have a REV F5 or lower and
* want to use EXTRUDRBOARD A for E1 and EXTRUDRBOARD B for E2.
*/
//#define NO_EXTRUDRBOARD
//#define NO_EXTRUDRBOARD_OUTPUT_SWAP
//
// Limit Switches
@ -95,6 +120,26 @@
#define E0_DIR_PIN 35 // A7
#define E0_ENABLE_PIN 13 // C3
#if DISABLED(NO_EXTRUDRBOARD)
#if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
#define E1_STEP_PIN 25 // B5
#define E1_DIR_PIN 37 // E5
#define E1_ENABLE_PIN 42 // F4
#define E2_STEP_PIN 2 // D2
#define E2_DIR_PIN 3 // D3
#define E2_ENABLE_PIN 43 // F5
#else
#define E1_STEP_PIN 2 // D2
#define E1_DIR_PIN 3 // D3
#define E1_ENABLE_PIN 43 // F5
#define E2_STEP_PIN 25 // B5
#define E2_DIR_PIN 37 // E5
#define E2_ENABLE_PIN 42 // F4
#endif
#endif // NO_EXTRUDRBOARD
// Enable control of stepper motor currents with the I2C based MCP4728 DAC used on Printrboard REVF
#define DAC_STEPPER_CURRENT
@ -119,14 +164,32 @@
#define TEMP_0_PIN 1 // Analog Input (Extruder)
#define TEMP_BED_PIN 0 // Analog Input (Bed)
#if DISABLED(NO_EXTRUDRBOARD)
#if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
#define TEMP_1_PIN 2 // Analog Input (Extrudrboard A THERM)
#define TEMP_2_PIN 3 // Analog Input (Extrudrboard B THERM)
#else
#define TEMP_1_PIN 3 // Analog Input (Extrudrboard B THERM)
#define TEMP_2_PIN 2 // Analog Input (Extrudrboard A THERM)
#endif
#endif
//
// Heaters / Fans
//
#define HEATER_0_PIN 15 // C5 PWM3B - Extruder
#define HEATER_1_PIN 44 // F6
#define HEATER_2_PIN 45 // F7
#define HEATER_BED_PIN 14 // C4 PWM3C
#if DISABLED(NO_EXTRUDRBOARD)
#if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
#define HEATER_1_PIN 44 // F6 - Extrudrboard A HOTEND
#define HEATER_2_PIN 45 // F7 - Extrudrboard B HOTEND
#else
#define HEATER_1_PIN 45 // F7 - Extrudrboard B HOTEND
#define HEATER_2_PIN 44 // F6 - Extrudrboard A HOTEND
#endif
#endif
#define FAN_PIN 16 // C6 PWM3A
//
@ -201,6 +264,14 @@
#ifndef SDSS
#define SDSS 20 // 10 B0
#endif
/**
* This is EXP1-2, which is also the TEMP_A_PIN for the Extrudrboard.
* If using w/ Extrudrboard, cut off pin 2 on the Extrudrboard male
* connector to ensure this is disconnected from the A THERM pullups.
* You probably want to set EXTRUDERS=2 and swap the Extrudrboard outputs,
* which will let you use Channel B on the Extrudrboard as E1.
*/
#ifndef FILWIDTH_PIN
#define FILWIDTH_PIN 2 // Analog Input
#define FILWIDTH_PIN 2 // Analog Input
#endif

2
Marlin/src/pins/pins_RAMBO.h
View File

@ -46,8 +46,6 @@
#define BOARD_NAME "Rambo"
#define LARGE_FLASH true
//
// Servos
//

2
Marlin/src/pins/pins_RAMPS.h
View File

@ -58,8 +58,6 @@
#define BOARD_NAME "RAMPS 1.4"
#endif
#define LARGE_FLASH true
//
// Servos
//

2
Marlin/src/pins/pins_RAMPS_RE_ARM.h
View File

@ -44,8 +44,6 @@
#define BOARD_NAME "Re-ARM RAMPS 1.4"
#endif
#define LARGE_FLASH true
//
// Servos
//

4
Marlin/src/pins/pins_SANGUINOLOLU_11.h
View File

@ -59,10 +59,6 @@
#define BOARD_NAME "Sanguinololu <1.2"
#endif
#ifdef __AVR_ATmega1284P__
#define LARGE_FLASH true
#endif
//
// Limit Switches
//

2
Marlin/src/pins/pins_SAV_MKI.h
View File

@ -69,8 +69,6 @@
#define DEFAULT_SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
#define BOARD_NAME "SAV MkI"
#define LARGE_FLASH true
//
// Servos
//

2
Marlin/src/pins/pins_SCOOVO_X9H.h
View File

@ -30,8 +30,6 @@
#define BOARD_NAME "Scoovo X9H"
#define LARGE_FLASH true
//
// Servos
//

2
Marlin/src/pins/pins_SILVER_GATE.h
View File

@ -28,8 +28,6 @@
#define BOARD_NAME "Silver Gate"
#endif
#define LARGE_FLASH true
#define X_STEP_PIN 43
#define X_DIR_PIN 44
#define X_ENABLE_PIN 42

2
Marlin/src/pins/pins_STM32F1R.h
View File

@ -31,8 +31,6 @@
#define DEFAULT_MACHINE_NAME "STM32F103RET6"
#define BOARD_NAME "Marlin for STM32"
#define LARGE_FLASH true
// Ignore temp readings during develpment.
#define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE

2
Marlin/src/pins/pins_TEENSY2.h
View File

@ -112,8 +112,6 @@
#define BOARD_NAME "Teensy++2.0"
#define LARGE_FLASH true
//
// Limit Switches
//

2
Marlin/src/pins/pins_TEENSY35_36.h
View File

@ -38,8 +38,6 @@
#define AT90USB 1286 // Disable MarlinSerial etc.
#define USBCON //1286 // Disable MarlinSerial etc.
#define LARGE_FLASH true
/*
teemuatlut plan for Teensy3.5 and Teensy3.6:

3
Marlin/src/pins/pins_TEENSYLU.h
View File

@ -79,9 +79,6 @@
#define BOARD_NAME "Teensylu"
#define LARGE_FLASH true
//
// Limit Switch definitions that match the SCHEMATIC
//

2
Marlin/src/pins/pins_ULTIMAKER.h
View File

@ -40,8 +40,6 @@
#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
#define BOARD_NAME "Ultimaker"
#define LARGE_FLASH true
//
// Servos
//

2
Marlin/src/pins/pins_ULTIMAKER_OLD.h
View File

@ -68,8 +68,6 @@
#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
#define BOARD_NAME "Ultimaker <1.5.4"
#define LARGE_FLASH true
//
// Limit Switches
//