Commit Graph

10144 Commits (9356cf648f86e4f25fcd35fa4e98329470044312)
 

Author SHA1 Message Date
Tim Koster 88dfeefca3 Define BlinkM default disabled
Tim Koster 5350faf2a2 Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1
Tim Koster 7016cc9511 Added BlinkM support over i2c
ErikZalm d78db12abd Merge pull request from wolfmanjm/upgrade
Fix the example delta configuration by adding DELTA_DIAGONAL_ROD_2
Tim Koster 3b315b3da0 Added BlinkM support over i2c
Jim Morris f26f26b7bd Fix the example delta configuration as someone forgot to do it.
Erik van der Zalm a447e76fdf Update read me. Added comment about products that have a patent.
ErikZalm f8d173bd0b Merge pull request from hercek/upstream
add command M666 for adjusting delta printer endstop position
Peter Hercek 9aa2229077 add command M666 for adjusting delta printer endstop position
ErikZalm aa6c58ad37 Merge pull request from buildrob101/DualXCarriageMerge
Add duplication and auto-park mode for dual x-carriage support.
Robert F-C 221286c10a Add .gitignore change to ignore .bak files (produced by WinMerge and other editors)
Robert F-C 9547fb9dfb Add duplication and auto-park mode for dual x-carriage support.
ErikZalm 62aab66299 Merge pull request from ultimachine/rambo_LCD
RAMBo LCD Support, Additional Pins, and Arduino add ons
Steve Kelly d7b1a8ba33 add rambo arduino addons
Steve Kelly 53614e5144 add pins for rambo lcd
Steve Kelly b42d24e31e add additional pins to avr2560 for rambo lcd
ErikZalm 07f029c2d5 Merge pull request from njprossi/Marlin_v1
Improvment for delta, Honeywell thermistor table and move from panel
Nicolas Rossi b0c8120fcc Added feedrate setting in exemple config for manual moves from panel
Nicolas Rossi a54fe2d73c Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
Conflicts:
	Marlin/Marlin_main.cpp
ErikZalm 7ea63d08df Merge pull request from iXce/avrdudeconfpath
Detect OS in Makefile to use the correct avrdude.conf path
ErikZalm 4187b637a5 Merge pull request from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
ErikZalm 07e7de3600 Merge pull request from hg42/convert-PROTOCOL-macros-from-statements-to-expressions
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
Guillaume Seguin c0c4c97db6 Detect OS in Makefile to use the correct avrdude.conf path
hg42@gmx.net 2ca983568d separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
hg42@gmx.net 3700f688f5 convert PROTOCOL macros from statements to (multiple, comma separated) expressions
daid a504c88346 Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts.
ErikZalm c6cb93d38c Merge pull request from ellensp/Marlin_v1
renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works...
Nicolas Rossi 394ed08f88 Added feedrate setting for manual moves from panel
Nicolas Rossi 9bf1cf1b22 Pre-calculate diagonal rod length squared
Nicolas Rossi 4623e78ce0 Added Honeywell thermistor 135-104LAF-J01
Brendan-csel d7f384f680 Skip SD menu refresh if nothing has changed
Brendan-csel abc8320a68 Save LCD_CLICKED before it is cleared
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
Guillaume Seguin f4c3135c6d Add Panelolu2 pins for RAMPS1.3
Guillaume Seguin aae42c68f9 Update French translation in language.h
Guillaume Seguin 4d435c38a6 Add support of LiquidTWI2-based panels to Makefile
Use LIQUID_TWI2=1 as make argument to enable this support
Guillaume Seguin 6c42a3a339 Woops, fix logic
Guillaume Seguin 376d8af2c8 Report temperatures for all extruders
ErikZalm 434b6a05c1 Merge pull request from iXce/Marlin_v1
Report temperatures for all extruders in reply to M105
ErikZalm bdc2621119 Merge pull request from Brendan-csel/Marlin_v1
Fix for Viki LCD issues printing from SD card
ErikZalm 6965bd4e15 Merge pull request from njprossi/Marlin_v1
Fixed move from panel for delta bot 
ErikZalm a55b33e613 Merge pull request from iXce/panelolupinsramps13
Add Panelolu2 pins for RAMPS1.3
ErikZalm 8b34351537 Merge pull request from iXce/frenchupdate
Update French translation in language.h
ErikZalm 735e556724 Merge pull request from iXce/liquidtwi2_makefile
Add support of LiquidTWI2-based panels to Makefile
Brendan-csel d80aecda0a Skip SD menu refresh if nothing has changed
Brendan-csel be2dea1dc6 Save LCD_CLICKED before it is cleared
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
Nicolas Rossi 55c287a69e Fixed move from panel for delta bot
Guillaume Seguin 1902d339b0 Add Panelolu2 pins for RAMPS1.3
Guillaume Seguin eb23a68e92 Update French translation in language.h
midopple 7ced55b97c Merge pull request from ErikZalm/Marlin_v1
merge
ellensp e019197b32 renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works for Arduino > 1.0 on linux