210 Commits (7456710a1f87a91e457fe8b9bd37f68e8c629411)

Author SHA1 Message Date
Bo Herrmannsen 280504e2e0 Merge pull request #908 from alromh87/Marlin_v1
Support for Gen3 Monolithic electronics
10 years ago
Neil Darlow b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 10 years ago
Erik van der Zalm 058e446531 Merge pull request #1037 from filipmu/Filament-Sensor
Support for a filament diameter sensor
10 years ago
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
10 years ago
Scott Lahteine f989bd5435 Simple code cleanup. Rename "homeing" to homing. 10 years ago
Javi 40ba644bb4 Added profile for RAMPS with 2 extruders and 1 fan.
modified:   Marlin/Configuration.h
	modified:   Marlin/pins.h
10 years ago
Neil Darlow 1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 10 years ago
Erik van der Zalm 0fbfb1bf82 Merge pull request #991 from bonm014/patch-1
Leapfrog controller board support
10 years ago
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.
11 years ago
Grogyan bcd039aa81 Update pins.h 11 years ago
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
11 years ago
bonm014 f244045245 Update pins.h
Leapfrog board added to the pin list
11 years ago
Neil Darlow 9d11b70436 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
David Forrest 09b84faa00 Configuration.h, pins.h: Add MOTHERBOARD 84 for Teensy++2.0 11 years ago
Neil Darlow e541323741 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
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
11 years ago
Cameron Lai 105bebb466 Fix for pin mapping for SDSS pin and Fan pin, so Arduino library can be used 11 years ago
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 11 years ago
Cameron Lai 2fa514e88a Add port for 5DPrint D8 Driver board 11 years ago
Neil Darlow 6adbdf42e0 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
nothinman 3ffc9651b1 Merge pull request #845 from DerSchultze/Sanguinololu-servo
Added servo pin assignments to Sanguinololu
11 years ago
Neil Darlow 73b380d8d2 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
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) 11 years ago
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.
11 years ago
Ralf Schultz eecda434fb Sanguinololu servo pins set default disabled 11 years ago
Ralf Schultz 06709ad60e Added servo pin assignments to Sanguinololu 11 years ago
Peter c9c83a4560 Updated gen3+ board pins names to current convention 11 years ago
daid d16a770855 Ultimainboard 2.x does not has a PS_ON pin. 11 years ago
Jim Morris 5097c57d3a Added pins for Azteeg X3 Pro under motherboard 68 11 years ago
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
11 years ago
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
11 years ago
daid df194f75e1 Added PT100 support for Ultiboard2 11 years ago
daid 380144c20f Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original. 11 years ago
Michal Dyntar e8786bf110 Added support for Cheaptronic v1 electronic 11 years ago
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
11 years ago
Daniel Benamy cab84e0e5b Add (correct) missing pin definitions for Y2
I tested this and it works.
11 years ago
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).
11 years ago
Erik van der Zalm 8a08cca0f2 Added temperature status less.
Hopefully fixed viky button handling without braking other boards
11 years ago
phq1910 4f7c6dfe35 Update pins.h
Include Pins cpu Sethi 3D
11 years ago
Erik van der Zalm 0dca49a7c0 Added Azteeg X3 board. 11 years ago
Martin Lukasik acd8619809 Fan fix for Panelolu2+Sanguinololu. 11 years ago
Steve Kelly 53614e5144 add pins for rambo lcd 12 years ago
Guillaume Seguin 1902d339b0 Add Panelolu2 pins for RAMPS1.3 12 years ago
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1
Conflicts:
	Marlin/language.h
12 years ago
Michael Mayer 99b7e926e7 added MaKr3d Melzi board 12 years ago
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
12 years ago
Erik van der Zalm 2015989f84 Added DISABLE_MIN_ENDSTOPS 12 years ago
lajos 02dee80fa5 added Azteeg X1 motherboard 12 years ago
Erik van der Zalm 26a441fc7d More 3Drag controller patches. 12 years ago
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
12 years ago
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
12 years ago
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
12 years ago
BorisLandoni 4c7d1436e9 Update pins.h 12 years ago
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
12 years ago
Gord Christmas a733537ddd Missed some variable declarations
Integrated fixes from henrikbrixandersen pull request #504
12 years ago
Erik van der Zalm 79374f0b93 Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1 12 years ago
Erik van der Zalm 5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb) 12 years ago
Gatulibu b78fa6bb70 Added support for Megatronics v2.0 and Minitronics v1.0
merged from code downloaded from reprapworld.com
12 years ago
Erik van der Zalm 7231a20dba Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42. 12 years ago
Bas Spaans 424101110c Add Panelolu2 support for Melzi 12 years ago
Robert F-C dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
ErikZalm 64360164ad Merge pull request #482 from codexmas/Marlin_v1
servosupport
12 years ago
Gord Christmas dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. 12 years ago
MaikStohn 9cc15876be Add support for RUMBA thermocouple add on 12 years ago
Erik van der Zalm bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes 12 years ago
Jordan Miller fbd899a37d Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129. 12 years ago
gregor 2739c26c4f changes:
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
12 years ago
gregor 6fb9573157 added support for the reprapworld keypad 12 years ago
kiyoshigawa b27a59f41e Added support for Elefu RA Board and Elefu Control Panel 12 years ago
Scott Lahteine a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
Also cosmetic comment changes and spelling corrections in printed
messages
12 years ago
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
12 years ago
daid 4b2ece159b Merge pull request #453 from brackendawson/Marlin_v1
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
12 years ago
Bracken Dawson d5ee2a5a62 Make Gen7 1.4 heater pins match silkscreen 12 years ago
ErikZalm 86867928ac Merge pull request #434 from DDRBoxman/Marlin_v1
Add support for M300: Play beep sound
12 years ago
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
12 years ago
blddk 91bea43332 Added rumba pinout 12 years ago
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
12 years ago
Dirk Eichel 140e095c6e Add pins for Motherboard variant 64
These definition contain also the definition for the graphics LCD.
12 years ago
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.
12 years ago
Bas Spaans 12c41423ad Fixed typo in comment 12 years ago
Bas Spaans 0995eaa492 Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries 12 years ago
daid303 408b349a84 Fixed #368. Commented out the wrong pin definition, but explained why it is there. 12 years ago
Yuri Valentini 86358dd6cd Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu 12 years ago
daid303 bbe7d3d0fe Fixed #312 12 years ago
daid 30254e3388 Merge pull request #350 from jcrocholl/Marlin_v1
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
12 years ago
Johann Rocholl 8caf5d252d Remove bogus blank line. 12 years ago
Johann Rocholl b39f5d614a For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR. 12 years ago
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 12 years ago
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) 12 years ago
Johann Rocholl ca409e5531 Fix X/Y/Z_MIN_PIN for Printrboard. 12 years ago
Johann Rocholl 33247733e0 Teensylu and Printrboard use different analog pins for thermistors. 12 years ago
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. 12 years ago
Johann Rocholl 4d351b4846 Improved formatting and comments for consistency. 12 years ago
Johann Rocholl a30007caa4 If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins. 12 years ago
Johann Rocholl b1c38d4c82 Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater. 12 years ago
Johann Rocholl 42e21bb06e Add support for Printrboard (from https://github.com/lincomatic/Marlin) and Brainwave (from https://github.com/metrix/Sprinter). 12 years ago
brupje 57429cb9fe Fix for keypad 12 years ago
Erik vd Zalm f934d0ef5b Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
12 years ago
daid303 ffc69537aa Update on some comments, make the MOTHERBOARD list complete again. 12 years ago
Jonathan Bastien-Filiatrault 0f73afb0b0 Avoid defining overriding definitions for the RepRapDiscount Smart
Controller. Remove common definitions. Harmonize declaration order.
12 years ago