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
Nicolas Rossi
394ed08f88
Added feedrate setting for manual moves from panel
11 years ago
Nicolas Rossi
9bf1cf1b22
Pre-calculate diagonal rod length squared
11 years ago
Nicolas Rossi
4623e78ce0
Added Honeywell thermistor 135-104LAF-J01
11 years ago
Brendan-csel
d7f384f680
Skip SD menu refresh if nothing has changed
11 years ago
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.
11 years ago
Guillaume Seguin
f4c3135c6d
Add Panelolu2 pins for RAMPS1.3
11 years ago
Guillaume Seguin
aae42c68f9
Update French translation in language.h
11 years ago
Guillaume Seguin
4d435c38a6
Add support of LiquidTWI2-based panels to Makefile
...
Use LIQUID_TWI2=1 as make argument to enable this support
11 years ago
Guillaume Seguin
6c42a3a339
Woops, fix logic
11 years ago
Guillaume Seguin
376d8af2c8
Report temperatures for all extruders
11 years ago
ErikZalm
434b6a05c1
Merge pull request #552 from iXce/Marlin_v1
...
Report temperatures for all extruders in reply to M105
11 years ago
ErikZalm
bdc2621119
Merge pull request #561 from Brendan-csel/Marlin_v1
...
Fix for Viki LCD issues printing from SD card
11 years ago
ErikZalm
6965bd4e15
Merge pull request #560 from njprossi/Marlin_v1
...
Fixed move from panel for delta bot #557
11 years ago
ErikZalm
a55b33e613
Merge pull request #559 from iXce/panelolupinsramps13
...
Add Panelolu2 pins for RAMPS1.3
11 years ago
ErikZalm
8b34351537
Merge pull request #558 from iXce/frenchupdate
...
Update French translation in language.h
11 years ago
ErikZalm
735e556724
Merge pull request #555 from iXce/liquidtwi2_makefile
...
Add support of LiquidTWI2-based panels to Makefile
11 years ago
Brendan-csel
d80aecda0a
Skip SD menu refresh if nothing has changed
11 years ago
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.
11 years ago
Nicolas Rossi
55c287a69e
Fixed move from panel for delta bot #557
11 years ago