1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-12-04 18:07:38 +00:00
Commit Graph

305 Commits

Author SHA1 Message Date
Scott Lahteine
95275eb9b3 Predefine auto fan pins in some pins files 2016-10-26 18:38:32 -05:00
Scott Lahteine
b6aa894893 Rename auto fan pins and add auto fan flags 2016-10-26 17:51:26 -05:00
Scott Lahteine
ad64723354 Move MAX_EXTRUDERS to pins.h 2016-10-22 10:07:51 -05:00
Scott Lahteine
47bd142b29 Should marlinAnalogInputToDigitalPin use analogInputToDigitalPin? 2016-10-05 06:13:30 -05:00
Scott Lahteine
49d77720d5 More support for 4th extruder or heater 2016-10-05 04:40:22 -05:00
Scott Lahteine
c2f13be750 Mightyboard Revision E 2016-09-25 05:28:04 -05:00
Scott Lahteine
e05af606a8 Clean up probe config options 2016-09-19 00:26:16 -05:00
Scott Lahteine
98437bd488 Allow override of CONTROLLERFAN_PIN with RAMPS EFF 2016-08-06 17:19:12 -07:00
AnHardt
98e96feee9 Repair SPI-pins
SCK_PIN can't be defined as DIO[number] they mus be defined as pure number.
So rebuilding the structure of fastio.h in pins.h.
2016-08-06 17:19:11 -07:00
Scott Lahteine
49f75b7891 pins_RAMPS_14.h => pins_RAMPS.h 2016-07-30 04:17:21 -07:00
Scott Lahteine
d3b713cebc Set flags for RAMPS "type" in pins.h 2016-07-30 04:17:21 -07:00
AnHardt
e4942d2163 Switch SD2cadrLib to fastio
Replace all fastDigitalRead/Write() with READ/WRITE()

Define SCK_PIN, MISO_PIN, MOSI_PIN in pins.h if not already defined in the pins_*.h files.

Remove these conditional pin definitions from the pin-files. They are now always defined.

Define separate sets of SPI-pins for AT90USB with and without Teensy support in fastio.h.
Likely this was the main reason for all that confusion about the AT90USB-SPI pins.
2016-07-27 12:40:44 +02:00
Scott Lahteine
4f2ff46ab9 Move HAS_DIGIPOTSS to conditionals 2016-07-25 00:10:46 -07:00
Scott Lahteine
05da02f0a2 Implement MIXING_EXTRUDER and SWITCHING_EXTRUDER 2016-07-17 10:53:10 -07:00
Indrek Ardel
ecb23c1b65 Add Cartesio CN Controls V11 board 2016-07-15 12:55:47 +03:00
Scott Lahteine
4b4a582c4f X_DUAL_STEPPER_DRIVERS implementation 2016-07-11 10:22:19 -07:00
Anthony Birkett
a0b00d29e3 Add a ported example configuration for the Velleman K8400 (Vertex) printer.
Supports both dual and single head printers (with the correct config).
Includes community sourced feed rate fix.

Rename / move files.

Remove redundant definitions.
2016-07-03 22:09:08 +01:00
Scott Lahteine
593c8bf286 Support for Rigidbot V2 2016-06-27 12:35:20 -07:00
Scott Lahteine
4d2cb70152 Cartesio UI Support 2016-06-15 21:46:54 -07:00
Scott Lahteine
cd441ce652 SINGLENOZZLE: EXTRUDERS versus HOTENDS 2016-06-03 17:38:03 -07:00
Scott Lahteine
07c9a11c3c Automatically set X2 stepper pins 2016-05-18 19:09:09 -07:00
Scott Lahteine
1b90682617 Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins
Remove need to define unused pins as -1 in pins files
2016-05-14 15:49:22 -07:00
esenapaj
888443ca1e Enclose all #error strings with apostrophes 2016-05-13 21:10:23 +09:00
Scott Lahteine
5ca6334fd2 Cleanup pins files, fixup analogtodigitalpin, etc. 2016-05-08 12:38:00 -07:00
Scott Lahteine
5b7a6c217a Include more fans in sensitive pins list 2016-05-01 13:49:32 -07:00
Scott Lahteine
e5771346a4 Drop DISABLE_M(IN|AX)_ENDSTOPS, replace with individual endstop flags 2016-04-02 16:39:23 -07:00
João Brázio
55a248d6b4 Fixes #3313 : Wrong board def in pins.h 2016-04-02 09:28:58 +01:00
Scott Lahteine
1da9d10173 Support for MKS v1.3/1.4 and Sainsmart RAMPS 1.4 variants 2016-04-01 16:54:35 -07:00
Scott Lahteine
0da744b7b0 Further cleanup of comments, partial Doxygen-style
Following up on #3231
2016-03-25 00:45:56 -07:00
jbrazio
5e5d250832 Added gplv3 header to all Marlin files 2016-03-24 18:01:20 +00:00
Scott Lahteine
c5857f96c8 Merge pull request #3182 from thinkyhead/rcbugfix_printrboard_revf
Add support for Printrboard RevF
2016-03-24 00:12:06 -07:00
AnHardt
1b336971ae Fix lost undef Y_MAX_PIN in pins.h 2016-03-23 12:48:06 +01:00
Stephanie
6843b78f99 Add support for Printrboard RevF
The PrintrBoard Rev F utilizes a mcp4728 DAC to set motor current. Printrbot's implementation utilizes 2 new M-codes to set and write the DAC settings to the DAC EEPROM: `M909` (Read DAC) and `M910` (Write DAC). `M907` is re-used to set value, `M908` for direct control.

The Pins file for the RevF board is included.
2016-03-19 16:43:37 -07:00
Scott Lahteine
eafbc5e0cc Add AJ4P pins and fix RAMBO pins 2016-03-06 05:52:01 -08:00
Scott Lahteine
50e3482e0a Handle RAMPS 1.3 as the special case 2016-03-06 05:52:00 -08:00
Scott Lahteine
6a21180bd4 Implemented BQ ZUM Mega 3D board layout as an override to RAMPS 1.3 2016-03-06 05:51:57 -08:00
jbrazio
b82d91eca6 Added configuration example for the BQ Hephestos 2 3D printer.
Added support for BQ ZUM Mega 3D board and stock Hephestos 2 thermistor.
2016-03-06 05:51:56 -08:00
Scott Lahteine
68457ee903 For Dual Y/Z use the next available extruder pins 2016-02-09 21:59:09 -08:00
AnHardt
8da2e98985 Split RAMPS 1.3 an 1.4 (PR#2741)
because of hardware differences on the SERVO0_PIN
2015-11-13 07:13:48 -06:00
Scott Lahteine
0c7f7ebcfb Styling adjustments (PR#2668 & PR#2670)
Keep "astyled" reformatting
2015-10-03 22:02:45 -05:00
Scott Lahteine
a4c78ae786 Add E1 pins to SENSITIVE_PINS for Dual Y or Dual Z 2015-09-07 09:41:06 -05:00
Scott Lahteine
34e0a8d848 Move Y2 and Z2 pins defines to pins.h 2015-09-07 09:41:06 -05:00
AnHardt
e2d69f66b2 Make Z_PROBE a Z_MIN_PROBE (PR#65)
Currently we use the probe exclusively as a device to find the build platform(bed).
For the currently supported setups this means, we use it as a additional min-endstop.
A triggered when not deployed probe disturbs the homing process for max-endstops.

Rename ENDSTOPPULLUP_ZPROBE to ENDSTOPPULLUP_ZMIN_PROBE
Rename Z_PROBE_ENDSTOP_INVERTING to Z_MIN_PROBE_ENDSTOP_INVERTING
Rename Z_PROBE_ENDSTOP to Z_MIN_PROBE_ENDSTOP
Rename DISABLE_Z_PROBE_ENDSTOP to DISABLE_Z_MIN_PROBE_ENDSTOP
Rename Z_PROBE_REPEATABILITY_TEST to Z_MIN_PROBE_REPEATABILITY_TEST
Rename Z_PROBE_ENDSTOP to Z_MIN_PROBE_ENDSTOP
Adjust comments accordingly
Remove Z_MAX  check for the probe in update_endstops().

Using an delta related idea of @clefranc from #61,
extended to the general change for all setups.

Tested with Prusa i3, max-z-endstop and permanently triggered z-probe.
Worked for @clefranc's delta.
2015-08-11 14:41:36 -05:00
Scott Lahteine
c0d7ea3e7e Overridable Options - Part 4 (PR#2556)
Apply `ENABLED` / `DISABLED` / `HAS_SERVOS` macros to pins files.
2015-07-31 00:44:53 -05:00
AndySze
eef595aa64 add makerlab mega controller pin configs 2015-07-23 22:51:40 -05:00
Scott Lahteine
f068e46661 RigidBoard include for pins.h 2015-07-09 11:36:46 -05:00
AnHardt
c461975140 Rename and repair MELZI_1284 (PR#2301)
to MELZI_MAKR3D.

Fix for #2288
As the normal MELZI also can have a 1284.
2015-06-22 22:30:07 -04:00
Scott Lahteine
318318b02f Add pins_RAMPS_13_EFB.h to reduce redundancy 2015-06-15 20:17:09 -05:00
Scott Lahteine
346c8b339b Remove a test from pins_RAMPS_13.h
- Add 3 new lines to `pins.h` to remove 2 redundant tests in
`pins_RAMPS_13.h`
2015-06-15 20:15:38 -05:00
AnHardt
b93cddfcc9 Add lost MKS_BASE to pins.h (PR#2297) 2015-06-15 10:23:46 -05:00
atfield90
c4a2e5ac23 Renamed Pins_megatronics_1 to Pins_minitronics 2015-06-06 18:59:04 -05:00
tonokip
10733a2bb0 added minirambo pin definitions. V2 2015-06-06 18:37:58 -05:00
Scott Lahteine
9d1961ebe3 Witbox and Hephestos are just RAMPS_13_EFB 2015-05-20 21:33:23 -07:00
AnHardt
4d4fa3607b Remove Duemilanove
No way to fit Marlin into 32K.
2015-05-19 02:46:37 +02:00
Scott Lahteine
5146694452 Merge pull request #1884 from shaggythesheep/feature_new_board_ramps_cnc_controller
Feature: Add RAMPS CNC Controller Board
2015-05-12 04:31:49 -07:00
Scott Lahteine
f73f4ce555 Make some z probe and servo code tweaks 2015-05-09 19:11:19 -07:00
Chris Petersen
ffaf1b4f22 Add pin configuration for Brainwave Pro
Copied from jcrocholl's contributions to the OpenBeamUSA Marlin fork
2015-04-13 23:46:57 -07:00
Richard Miles
4c3736ed43 Feature: Add RAMPS CNC Controller Board
Created a new board to make using RAMPS as a CNC machine controller
easier. It maps pin 8 to the spindle and pin 9 to the controller fan.
2015-04-09 16:32:56 +01:00
Scott Lahteine
2d099a2c70 Fix missing backslash in macro 2015-04-04 03:35:16 -07:00
Scott Lahteine
c065da52ec Spacing and spelling 2015-04-03 22:54:48 -07:00
Chris Roadfeldt
2966ae2022 Fix Z_PROBE_PING not declared, allows code to compile if Z_PROBE_ENDSTOP
is not used.
2015-04-01 13:32:25 -05:00
croadfeldt
06f767d608 Merge remote-tracking branch 'upstream/development' into development 2015-03-30 02:10:49 -05:00
Chris Roadfeldt
8b81f20c61 Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to
be.
Added Sanity Check for it.
Added hook so it's enabled.
2015-03-28 05:55:42 -05:00
Chris Roadfeldt
9f3ff14008 Enabled separate Z Probe and Z Axis endstop use at same time.
Typo fixes in comments in existing code.
2015-03-28 04:31:51 -05:00
Scott Lahteine
ba871e46bf Fix compiler warnings
- Patched up for most included configurations
2015-03-27 20:29:05 -07:00
Scott Lahteine
19d418cd6a Fix up the code to eliminate warnings 2015-03-27 00:32:58 -07:00
alexborro
0ce3576685 New Feature: Z_DUAL_ENDSTOPS
Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z
steppers - Let's call them Z stepper and Z2 stepper.
That way the machine is capable to align the bed during home, since both
Z steppers are homed.
There is also an implementation of M666 (software endstops adjustment)
to this feature.
After Z homing, this adjustment is applied to just one of the steppers
in order to align the bed.
One just need to home the Z axis and measure the distance difference
between both Z axis and apply the math: Z adjust = Z - Z2.
If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it
is.. think about it) and the Z adjust would be positive.
Play a little bit with small adjustments (0.5mm) and check the
behaviour.
The M119 (endstops report) will start reporting the Z2 Endstop as well.
2015-03-24 14:06:44 -03:00
Scott Lahteine
b6d381f863 Divide up Conditionals to get LCD items early 2015-03-20 02:50:28 -07:00
Scott Lahteine
5efc798642 Merge pull request #1546 from apollo-ng/pr-felix
Added support for Felix 2.0/3.0 printers
2015-03-15 07:52:22 -07:00
Scott Lahteine
c37f7d15c9 - Rename WRITE_E_STEP for consistency
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
2015-03-14 04:28:22 -07:00
chrono
2e172f38bd Added support for Felix 2.0/3.0 printers 2015-03-01 09:16:55 +00:00
Scott Lahteine
7891eacf21 Merge branch 'Development' into fixup_ramps_boards
- Also apply cleanup for #1514
2015-02-19 17:26:22 -08:00
Scott Lahteine
07639053fb Add support for BQ Prusa i3 "Hephestos" 2015-01-31 21:38:30 -08:00
Victor Andueza
13118cde33 Add bq Witbox 3D printer 2015-01-28 16:52:36 +01:00
Scott Lahteine
2ce4a102ee Add support for Megatronics 3 a la #1426 2015-01-27 15:54:46 -08:00
Scott Lahteine
ae4b348d77 Make sure _Ex_PINS is defined
Also fix analogInputToDigitalPin so it uses proper C hex notation
2015-01-27 15:36:47 -08:00
Scott Lahteine
80be6f3f91 tweak tweak 2015-01-27 15:36:47 -08:00
Scott Lahteine
ebe78cb36f tweak 2015-01-27 15:36:47 -08:00
Scott Lahteine
8045e4d60d Add support for 4th extruder
#1405 includes some changes to pins.h for a 4th extruder. This commit
applies those changes. It also deals with a possible problem with
SENSITIVE_PINS.
2015-01-27 15:33:21 -08:00
Scott Lahteine
b6ecbd8cc4 cleanup 2015-01-27 15:32:34 -08:00
Scott Lahteine
574a5ab72a Split up pins to make it more manageable
Hopefully this is helpful to organization and future expansion….
2015-01-27 15:32:34 -08:00
Scott Lahteine
865ca0ef04 Merge pull request #1405 from MagoKimbra/4th-extruders
All the additions look proper. I can't think of any other extruder-count-related items that you might have missed. So, with some optimism, I will merge this for testing.
2015-01-25 19:30:51 -08:00
Scott Lahteine
a7b02975b7 No TEMP1 or TEMP2 pins for TEENSYLU || PRINTRBOARD
Pins 2 and 3 are probably general-use pins, since the filament sensor
uses pin 2.
2015-01-24 05:10:48 -08:00
Scott Lahteine
6723388f7f Proposed fix to #1379. Printrboard I2C LCD support 2015-01-24 05:01:02 -08:00
MagoKimbra
986e723eeb Add 4th extruder 2015-01-24 13:37:58 +01:00
Scott Lahteine
f16bdd2ff2 Borrow from Ultimaker to fix MAX6675 SPI conflict
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
2015-01-24 03:49:15 -08:00
Scott Lahteine
25f79c5010 Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200
Add: Board for Vellemann K8200 (derived from 3Drag)
2015-01-23 06:08:38 -08:00
CONSULitAS
3b50a5e2e6 Add: Board for Vellemann K8200 (derived from 3Drag)
## Add: Board for Vellemann K8200 (derived from 3Drag)

* Boards.h: updated comment for board 3Drag - K8200 removed
* Boards.h: added `BOARD_K8200` with ID 78

* language.h.: machine name and firmware URL for new board

* pins.h: added `K8200` to any `#if` with `3Drag` and corresponding
comments
2015-01-20 20:46:20 +01:00
roglio
ccdbeda526 Fixing a build error for melzi and gfx display
When a melzi board and a full gfx are both selected, the build fails
blaming for some missing defines.

This is a fix for the issue: now my configuration works.
2015-01-19 10:43:26 +01:00
PxT
67b597ad46 Update printrboard pin assignments
Backported from Printrbot branch, allows the fan to work correctly.
2015-01-15 19:48:40 -08:00
Todd Swindoll
506353892e Rambo Pin documentation and servo support
Updated pins reference and servo support.

cross referenced between Rambo 1.1, 1.2, and 1.3
2015-01-07 11:02:05 -06:00
Grogyan
6b82415c81 Update pins.h
Somehow the pin definitions for the MAX6675 Slave Select/Chip Select got changed back to the hardware SPI SS/CS.  
Pin 49 cannot be used as that is used by the SD card socket to detect if an SD card is present.
Pin 53 is the Hardware SPI SS, which is dedicated, nicely, to the SD card SS and therefore cannot be used as the MAX6675 SS
Pin 66 is in Aux2 port adjacent to the Hardware SPI interface port on RAMPS 1.4, and is currently not used for anything.
2014-12-31 13:04:16 +13:00
Bernhard Kubicek
10ad9f1062 Addes servo0 pin ultimaker 2014-12-29 17:27:14 +01:00
fmalpartida
ec33df0554 Merge branch 'SAV-MkI_merge' into Development
Tested for SAV MKI and SAV 3D LCD on lewihe.
2014-12-28 19:54:06 +01:00
Scott Lahteine
f83d0f2a68 Defines for electronics boards
Added boards.h which contains defines for all the board numbers, plus
some shorthand macros for less typing.
2014-12-18 13:59:31 -08:00
Bo Herrmannsen
280504e2e0 Merge pull request #908 from alromh87/Marlin_v1
Support for Gen3 Monolithic electronics
2014-12-17 22:28:07 +01:00
Neil Darlow
b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-10-21 12:06:56 +01:00
Erik van der Zalm
058e446531 Merge pull request #1037 from filipmu/Filament-Sensor
Support for a filament diameter sensor
2014-10-11 22:56:01 +02:00
Erik van der Zalm
aaaf8fe8dd Merge pull request #1068 from darkjavi/Marlin_v1
Added profile for RAMPS with 2 extruders and 1 fan, no heated bed
2014-10-06 13:41:38 +02:00
Scott Lahteine
f989bd5435 Simple code cleanup. Rename "homeing" to homing. 2014-10-05 13:20:53 -07:00