Javi
40ba644bb4
Added profile for RAMPS with 2 extruders and 1 fan.
...
modified: Marlin/Configuration.h
modified: Marlin/pins.h
2014-09-06 02:53:36 +02:00
Neil Darlow
1632e5e38a
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2014-09-04 12:21:35 +01:00
Erik van der Zalm
0fbfb1bf82
Merge pull request #991 from bonm014/patch-1
...
Leapfrog controller board support
2014-08-28 16:27:52 +02:00
Filip Mulier
85649a4549
Real-time filament diameter measurement and control
...
This feature allows the printer to read the filament diameter
automatically and adjust the printer in real time. Added code to read
an analog voltage that represents a filament diameter measurement. This
measurement is delayed in a ring buffer to compensate for sensors that
are a distance away from the extruder. The measurement is used to
adjust the volumetric_multiplier for the extruder. Some additional g
codes (M404, M405, M406, M407) are used to set parameters and turn
on/off the control. g code M221 is updated. Pins for RAMPS1.4, RAMBO,
and Printrboard are identified for analog input. The configuration file
is updated with relevant user parameters.
2014-08-06 19:30:57 -05:00
Grogyan
bcd039aa81
Update pins.h
2014-07-05 17:55:03 +12:00
bonm014
32a6451ad8
Add leapfrog and dual Y/Z
...
I have added the pin set for the leapfrog and the support of dual Y and Z
2014-07-03 21:15:03 +02:00
bonm014
f244045245
Update pins.h
...
Leapfrog board added to the pin list
2014-07-03 21:01:41 +02:00
Neil Darlow
9d11b70436
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2014-06-07 20:48:25 +01:00
David Forrest
09b84faa00
Configuration.h, pins.h: Add MOTHERBOARD 84 for Teensy++2.0
2014-05-29 17:19:16 -04:00
Neil Darlow
e541323741
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
2014-05-09 15:02:50 +01:00
Alejandro Romero
1c9a70cee9
Support for Gen3 Monolithic electronics
...
Techzone Monotronics support, ignoring the tip manager and using fan connector as on Sprinter FW
TODO: Add support for tipmanager
2014-05-06 19:24:20 -05:00
Cameron Lai
105bebb466
Fix for pin mapping for SDSS pin and Fan pin, so Arduino library can be used
2014-04-25 12:57:47 +08:00
Cameron Lai
97ead2eccb
Fix for microstepping pin mapping, not using Teensy pin mapping, but Arduino's default pin mapping so Arduino library can be used
2014-04-25 12:57:11 +08:00
Cameron Lai
2fa514e88a
Add port for 5DPrint D8 Driver board
2014-04-24 12:55:00 +08:00
Neil Darlow
6adbdf42e0
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2014-04-21 15:10:57 +01:00
nothinman
3ffc9651b1
Merge pull request #845 from DerSchultze/Sanguinololu-servo
...
Added servo pin assignments to Sanguinololu
2014-04-13 00:37:28 +01:00
Neil Darlow
73b380d8d2
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2014-04-06 19:15:29 +01:00
nothinman
dfb98101e4
Change CONTROLLERFAN_PIN for board 35 to -1, as it would conflict with board's 33 extruder pin, causing burnout (it's the same board, just different number of fans/extruders, therefore should be pin-compatible)
2014-04-03 18:05:48 +01:00
Neil Darlow
89f78b0b80
Allow use of either SD Card slot when LCD Panel is configured.
...
Preference is for Controller SD slot before LCD Panel slot when both are occupied.
2014-03-27 17:02:17 +00:00
Ralf Schultz
eecda434fb
Sanguinololu servo pins set default disabled
2014-03-18 08:25:20 +01:00
Ralf Schultz
06709ad60e
Added servo pin assignments to Sanguinololu
2014-03-17 15:45:13 +01:00
Peter
c9c83a4560
Updated gen3+ board pins names to current convention
2014-02-16 00:47:06 +13:00
daid
d16a770855
Ultimainboard 2.x does not has a PS_ON pin.
2014-02-13 10:57:03 +01:00
Jim Morris
5097c57d3a
Added pins for Azteeg X3 Pro under motherboard 68
2014-02-05 14:25:42 -08:00
Jim Morris
b819fc53ca
Add Azteeg X3 Pro as motherboard 68
...
Add digipot i2c control for MCP4451
Allow M907 to set i2c digipot currents in amps
Fix Makefile to allow Azteeg motherboards
Fix Makefile to allow Wire libraries only
Add beeper pin for Azteeg X3 Pro
2014-02-05 01:47:12 -08:00
Ronald
8d162e5bd7
Improved support for panelolu2 encoder and buzzer
...
I added #define for LCD_FEEDBACK_FREQUENCY_HZ and
LCD_FEEDBACK_FREQUENCY_DURATION_MS which is used to alter the default
buzzer sound.
When selecting Panelolu2 in configuration.h:
- it automatically sets the correct ENCODER_PULSES_PER_STEP and
ENCODER_STEPS_PER_MENU_ITEM.
- if LCD_USE_I2C_BUZZER is defined it will also set the default
LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS
When selecting the sanguinololu 1284p the following is true:
- its now enables LARGE_FLASH
- It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is
defined
2014-02-03 07:45:03 +00:00
daid
df194f75e1
Added PT100 support for Ultiboard2
2014-01-06 11:20:03 +01:00
daid
380144c20f
Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original.
2014-01-06 11:05:02 +01:00
Michal Dyntar
e8786bf110
Added support for Cheaptronic v1 electronic
2013-12-07 13:29:47 +01:00
ErikZalm
59b96e323e
Merge pull request #640 from fmalpartida/SAV-MkI
...
Added support for BT on AT90USB devices, corrected LCD bug, added new board and LCD
2013-11-10 07:26:08 -08:00
Daniel Benamy
cab84e0e5b
Add (correct) missing pin definitions for Y2
...
I tested this and it works.
2013-10-30 22:44:20 -04:00
fmalpartida
b5a964fcc5
Initial SAV MkI (RepRap CloneWars board) integration.
...
Included support for BT dongle on AT90USB boards.
Added LCD Shift Register LCD control
Included support for RepRap Clone Wars project board (SAV MKI).
2013-10-30 11:45:32 +01:00
Erik van der Zalm
8a08cca0f2
Added temperature status less.
...
Hopefully fixed viky button handling without braking other boards
2013-10-20 12:12:35 +02:00
phq1910
4f7c6dfe35
Update pins.h
...
Include Pins cpu Sethi 3D
2013-09-26 11:40:54 -03:00
Erik van der Zalm
0dca49a7c0
Added Azteeg X3 board.
2013-09-24 17:31:16 +02:00
Martin Lukasik
acd8619809
Fan fix for Panelolu2+Sanguinololu.
2013-09-10 22:10:58 +01:00
Steve Kelly
53614e5144
add pins for rambo lcd
2013-08-03 11:45:53 -05:00
Guillaume Seguin
1902d339b0
Add Panelolu2 pins for RAMPS1.3
2013-07-28 19:19:57 +02:00
Guillaume Seguin
34da3a0a3f
Merge github.com:ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/language.h
2013-07-23 21:46:41 +02:00
Michael Mayer
99b7e926e7
added MaKr3d Melzi board
2013-07-14 15:17:55 +07:00
Nicolas Rossi
2daa85918e
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/language.h
Marlin/pins.h
Marlin/ultralcd.cpp
2013-06-20 23:59:56 +02:00
Erik van der Zalm
2015989f84
Added DISABLE_MIN_ENDSTOPS
2013-06-18 19:20:26 +02:00
lajos
02dee80fa5
added Azteeg X1 motherboard
2013-06-15 16:58:17 -04:00
Erik van der Zalm
26a441fc7d
More 3Drag controller patches.
2013-06-10 18:26:15 +02:00
Erik van der Zalm
408169aef4
Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/language.h
Marlin/pins.h
2013-06-09 22:57:40 +02:00
Erik van der Zalm
bd96d22bfb
Merge branch 'Marlin_v1' into thinkyhead
...
Conflicts:
Marlin/Configuration.h
Marlin/Configuration_adv.h
Marlin/Marlin.h
Marlin/Marlin_main.cpp
Marlin/Servo.cpp
Marlin/language.h
Marlin/pins.h
Marlin/planner.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
README.md
2013-06-09 22:26:47 +02:00
kiyoshigawa
6a81291c57
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
...
This should fix issues with pull request 467, I hope.
Conflicts:
Marlin/Configuration.h
Marlin/Marlin.pde
Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-06-08 08:48:18 -06:00
BorisLandoni
4c7d1436e9
Update pins.h
2013-06-07 18:37:44 +03:00
Scott Lahteine
5dabc95409
Apply all changes from latest Marlin_V1
...
Diffed and merged, preserving my updates
2013-06-06 15:49:25 -07:00
Gord Christmas
a733537ddd
Missed some variable declarations
...
Integrated fixes from henrikbrixandersen pull request #504
2013-06-06 09:18:03 -07:00
Erik van der Zalm
79374f0b93
Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1
2013-06-05 17:44:48 +02:00
Erik van der Zalm
5090c56651
More redundant temp sensor changes. (After testing and debugging by reifsnderb)
2013-05-29 19:29:30 +02:00
Gatulibu
b78fa6bb70
Added support for Megatronics v2.0 and Minitronics v1.0
...
merged from code downloaded from reprapworld.com
2013-05-28 14:03:31 +02:00
Erik van der Zalm
7231a20dba
Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42.
2013-05-24 21:05:11 +02:00
Bas Spaans
424101110c
Add Panelolu2 support for Melzi
2013-05-19 12:09:34 +02:00
Robert F-C
dfa549f268
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
2013-05-18 21:59:39 +10:00
ErikZalm
64360164ad
Merge pull request #482 from codexmas/Marlin_v1
...
servosupport
2013-05-16 10:19:00 -07:00
Gord Christmas
dc59f07d24
First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple.
2013-05-16 07:03:01 -07:00
MaikStohn
9cc15876be
Add support for RUMBA thermocouple add on
2013-05-16 01:16:08 +02:00
Erik van der Zalm
bd2cd4903e
Added #ifdef BARICUDA around the BariCUDA changes
2013-05-14 23:56:32 +02:00
Jordan Miller
fbd899a37d
Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.
2013-05-14 23:34:45 +02:00
gregor
2739c26c4f
changes:
...
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
2013-05-10 22:20:02 +02:00
gregor
6fb9573157
added support for the reprapworld keypad
2013-05-10 21:57:17 +02:00
kiyoshigawa
b27a59f41e
Added support for Elefu RA Board and Elefu Control Panel
2013-05-06 08:44:38 -06:00
Scott Lahteine
a200521eab
Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
...
Also cosmetic comment changes and spelling corrections in printed
messages
2013-05-02 09:22:58 -07:00
Robert F-C
788d62bcc4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-04-29 21:13:46 +10:00
daid
4b2ece159b
Merge pull request #453 from brackendawson/Marlin_v1
...
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
2013-04-16 10:12:25 -07:00
Bracken Dawson
d5ee2a5a62
Make Gen7 1.4 heater pins match silkscreen
2013-04-16 17:37:38 +01:00
ErikZalm
86867928ac
Merge pull request #434 from DDRBoxman/Marlin_v1
...
Add support for M300: Play beep sound
2013-03-30 08:49:54 -07:00
Colin Edwards
0d075378d5
Add LARGE_FLASH define and enable it for some of the beefier boards
...
The LARGE_FLASH flag allows superfluous features to be excluded
on boards with less memory
2013-03-25 10:42:27 -05:00
blddk
91bea43332
Added rumba pinout
2013-03-22 18:29:47 +01:00
Nicolas Rossi
aba67e2449
No bed config for RAMPS
...
The motherboard 35 is a config without bed with this pins setting :
D8 Extruder
D9 Fan
D10 Controller Fan
2013-03-05 15:51:24 +01:00
Dirk Eichel
140e095c6e
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
2013-03-01 17:47:32 +01:00
Robert F-C
1292d735ba
Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)
...
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
2013-02-28 02:04:51 +11:00
Bas Spaans
12c41423ad
Fixed typo in comment
2013-01-30 22:54:04 +01:00
Bas Spaans
0995eaa492
Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries
2013-01-30 22:25:01 +01:00
daid303
408b349a84
Fixed #368 . Commented out the wrong pin definition, but explained why it is there.
2013-01-21 15:46:17 +01:00
Yuri Valentini
86358dd6cd
Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu
2013-01-10 12:23:20 +01:00
daid303
bbe7d3d0fe
Fixed #312
2013-01-08 17:09:57 +01:00
daid
30254e3388
Merge pull request #350 from jcrocholl/Marlin_v1
...
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
2012-12-17 02:16:31 -08:00
Johann Rocholl
8caf5d252d
Remove bogus blank line.
2012-12-16 12:50:20 -08:00
Johann Rocholl
b39f5d614a
For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
2012-12-16 12:09:53 -08:00
oni303
ab09fa4bbf
fixed pwm generation at pin D12 and D13 when one of them is used as FAN_PIN on Sanguino, added soft pwm entry for FAN_PIN in temperature.cpp
2012-12-16 01:36:57 +01:00
daid303
5ff5cee8ce
Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition)
2012-12-11 14:53:53 +01:00
Johann Rocholl
ca409e5531
Fix X/Y/Z_MIN_PIN for Printrboard.
2012-12-11 01:59:48 -08:00
Johann Rocholl
33247733e0
Teensylu and Printrboard use different analog pins for thermistors.
2012-12-09 02:19:13 -08:00
Johann Rocholl
6cba11f087
Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well.
2012-12-09 01:32:09 -08:00
Johann Rocholl
4d351b4846
Improved formatting and comments for consistency.
2012-12-08 20:15:53 -08:00
Johann Rocholl
a30007caa4
If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins.
2012-12-08 19:46:42 -08:00
Johann Rocholl
b1c38d4c82
Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater.
2012-12-08 11:34:18 -08:00
Johann Rocholl
42e21bb06e
Add support for Printrboard (from https://github.com/lincomatic/Marlin ) and Brainwave (from https://github.com/metrix/Sprinter ).
2012-12-08 10:49:01 -08:00
brupje
57429cb9fe
Fix for keypad
2012-11-29 21:42:19 +01:00
Erik vd Zalm
f934d0ef5b
Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
2012-11-21 20:36:30 +01:00
daid303
ffc69537aa
Update on some comments, make the MOTHERBOARD list complete again.
2012-11-09 09:10:51 +01:00
Jonathan Bastien-Filiatrault
0f73afb0b0
Avoid defining overriding definitions for the RepRapDiscount Smart
...
Controller. Remove common definitions. Harmonize declaration order.
2012-11-07 16:04:28 -05:00
Jonathan Bastien-Filiatrault
36b452c7ac
Remove abbrs.
2012-11-07 15:42:18 -05:00
Jonathan Bastien-Filiatrault
3cbaad9288
RepRapDiscount Smart Controller pin definitions.
2012-11-06 20:32:13 -05:00
Bracken Dawson
f5631a89e8
Add dummy Emergancy Pin to Gen7 1.4
...
Change required after pulling from ErikZalm.
2012-10-26 22:28:37 +01:00
Bracken Dawson
a4f9e1ebf2
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
2012-10-26 22:20:35 +01:00
Bracken Dawson
2873d67b17
Put bogus temp override back in Gen7 up to 1.3
...
Took out the ifdef when I split 1.4 out and forgot to permanently
define it for <=1.3.
2012-10-26 22:17:26 +01:00
