1266 Commits (99f0e44864a248e3487a4e3d9aad5a5f07f3d447)
 

Author SHA1 Message Date
ErikZalm c80aac1518 Merge pull request #610 from phq1910/patch-2
Update pins.h
11 years ago
Erik van der Zalm 314fd13c39 Fix for Viki display 11 years ago
phq1910 4f7c6dfe35 Update pins.h
Include Pins cpu Sethi 3D
11 years ago
phq1910 57173739a1 Update Configuration.h
Include CPU Sethi 3D
11 years ago
Erik van der Zalm 0dca49a7c0 Added Azteeg X3 board. 11 years ago
Erik van der Zalm d8c2c810b4 Added info to the delta configuration files in the configuration.h file 11 years ago
Erik van der Zalm 9bc88f8bab Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file 11 years ago
Erik van der Zalm 3ca1ca6869 Fixed missing ENCODER_PULSES_PER_STEP 11 years ago
Tim Koster 97b0da0c2e Removed #ifndef BLINKM 11 years ago
Tim Koster 61db046b32 Added #ifdef BLINKM around new code. Also refined BlinkM.h. 11 years ago
Richard Miles 77df2ab0e7 Make Y_DUAL_STEPPER_DRIVERS disabled by default 11 years ago
Richard Miles ed1ab42186 Added Y_DUAL_STEPPER_DRIVERS
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped in either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
11 years ago
Richard Miles f4a59e4ce5 Revert "Added Y_DUAL_STEPPER_DRIVERS"
This reverts commit 7ee275b620.
11 years ago
Richard Miles 7ee275b620 Added Y_DUAL_STEPPER_DRIVERS
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
11 years ago
ErikZalm 6a1e980c6d Merge pull request #600 from xoan/Encoder_Pulses_Per_Step
add ENCODER_PULSES_PER_STEP
11 years ago
ErikZalm 20076a8bd3 Merge pull request #598 from GDV0/Marlin_v1
FIx compilation error when enabling SERVO_ENDSTOPS (#591)
11 years ago
Erik van der Zalm 3626b5ad8b Removed Delta from the default config file.
Changed EEPROM CHITCHAT behavior. M503 is always enabled.
11 years ago
Xoan Sampaiño bf7007d02f add ENCODER_PULSES_PER_STEP 11 years ago
GDV0 f17506c504 FIx compilation error when enabling SERVO_ENDSTOPS (#591) 11 years ago
ErikZalm 59e36f1d27 Merge pull request #595 from nothinman/Marlin_v1
Fan fix for Panelolu2+Sanguinololu.
11 years ago
Martin Lukasik acd8619809 Fan fix for Panelolu2+Sanguinololu. 11 years ago
ErikZalm 7c35be7fd8 Merge pull request #594 from gr5/Marlin_v1
Fixed bug that makes ulticontroller knob backwards introduced Feb 28 201...
11 years ago
George Roberts 595580556c Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert.
Bug introduced in version 6beb42cdf6.
Robert did a good job of simplifying but messed up this chunk of code.

Looking at working version: 839bef6d5d
it seems there is no case where encrot3 should be defined as 2
because if ULTICONTROLLER is defined then NEWPANEL is also defined.
11 years ago
Tim Koster 88dfeefca3 Define BlinkM default disabled 11 years ago
Tim Koster 5350faf2a2 Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1 11 years ago
Tim Koster 7016cc9511 Added BlinkM support over i2c 11 years ago
ErikZalm d78db12abd Merge pull request #589 from wolfmanjm/upgrade
Fix the example delta configuration by adding DELTA_DIAGONAL_ROD_2
11 years ago
Tim Koster 3b315b3da0 Added BlinkM support over i2c 11 years ago
Jim Morris f26f26b7bd Fix the example delta configuration as someone forgot to do it. 11 years ago
Erik van der Zalm a447e76fdf Update read me. Added comment about products that have a patent. 11 years ago
ErikZalm f8d173bd0b Merge pull request #582 from hercek/upstream
add command M666 for adjusting delta printer endstop position
11 years ago
Peter Hercek 9aa2229077 add command M666 for adjusting delta printer endstop position 11 years ago
ErikZalm aa6c58ad37 Merge pull request #575 from buildrob101/DualXCarriageMerge
Add duplication and auto-park mode for dual x-carriage support.
11 years ago
Robert F-C 221286c10a Add .gitignore change to ignore .bak files (produced by WinMerge and other editors) 11 years ago
Robert F-C 9547fb9dfb Add duplication and auto-park mode for dual x-carriage support. 11 years ago
ErikZalm 62aab66299 Merge pull request #572 from ultimachine/rambo_LCD
RAMBo LCD Support, Additional Pins, and Arduino add ons
11 years ago
Steve Kelly d7b1a8ba33 add rambo arduino addons 11 years ago
Steve Kelly 53614e5144 add pins for rambo lcd 11 years ago
Steve Kelly b42d24e31e add additional pins to avr2560 for rambo lcd 11 years ago
ErikZalm 07f029c2d5 Merge pull request #563 from njprossi/Marlin_v1
Improvment for delta, Honeywell thermistor table and move from panel
11 years ago
Nicolas Rossi b0c8120fcc Added feedrate setting in exemple config for manual moves from panel 11 years ago
Nicolas Rossi a54fe2d73c Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
Conflicts:
	Marlin/Marlin_main.cpp
11 years ago
ErikZalm 7ea63d08df Merge pull request #565 from iXce/avrdudeconfpath
Detect OS in Makefile to use the correct avrdude.conf path
11 years ago
ErikZalm 4187b637a5 Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
11 years ago
ErikZalm 07e7de3600 Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
11 years ago
Guillaume Seguin c0c4c97db6 Detect OS in Makefile to use the correct avrdude.conf path 11 years ago
hg42@gmx.net 2ca983568d separate INVERTING for MIN and MAX endstops (6 #defines instead of 3) 11 years ago
hg42@gmx.net 3700f688f5 convert PROTOCOL macros from statements to (multiple, comma separated) expressions 11 years ago
daid a504c88346 Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts. 11 years ago
ErikZalm c6cb93d38c Merge pull request #556 from ellensp/Marlin_v1
renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works...
11 years ago