chiark
/
gitweb
/
~ianmdlvl
/
marlin.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Add M401 - Wait for user on LCD button press
[marlin.git]
/
Marlin
/
ultralcd.h
2012-05-19
Daid
Add M401 - Wait for user on LCD button press
blob
|
commitdiff
|
raw
2012-05-19
Daid
Merge branch 'Marlin_v1' of https://github.com/ErikZalm...
blob
|
commitdiff
|
raw
|
diff to current
2012-05-16
ErikZalm
Merge pull request #159 from MaikStohn/Marlin_v1
blob
|
commitdiff
|
raw
|
diff to current
2012-05-11
MaikStohn
Merge branch 'Marlin_v1' of https://github.com/ErikZalm...
blob
|
commitdiff
|
raw
|
diff to current
2012-05-11
MaikStohn
changed encoder pos from int to long to fix problems...
blob
|
commitdiff
|
raw
|
diff to current
2012-05-03
MaikStohn
added missing declaration of buttons_init()
blob
|
commitdiff
|
raw
|
diff to current
2012-05-03
MaikStohn
Moved LCD initialization out of constructor
blob
|
commitdiff
|
raw
|
diff to current
2012-03-04
Erik van der Zalm
merging with SCUBA82
blob
|
commitdiff
|
raw
|
diff to current
2012-03-03
ErikZalm
Merge pull request #96 from haxar/Marlin_v1
blob
|
commitdiff
|
raw
|
diff to current
2012-03-03
Erik van der Zalm
Merge remote-tracking branch 'justblair/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2012-03-03
ErikZalm
Merge pull request #88 from daid/Marlin_v1
blob
|
commitdiff
|
raw
|
diff to current
2012-02-29
Daid
Fixed general 16x2 LCD build without SD support.
blob
|
commitdiff
|
raw
|
diff to current
2012-02-29
Christian Thalhammer
Merge remote-tracking branch 'upstream/Marlin_v1' into...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-26
ErikZalm
Merge pull request #76 from iXce/Marlin_v1
blob
|
commitdiff
|
raw
|
diff to current
2012-02-26
Erik van der Zalm
Merge remote-tracking branch 'daid/Marlin_v1' into...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Erik van der Zalm
Changed display format for some numbers.
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Erik van der Zalm
Small fixes after merge
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Erik van der Zalm
merged SBUBA82 and Justblair
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Erik van der Zalm
Merge remote-tracking branch 'SCUBA82/Marlin_v1' into...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-18
Blair Thompson
Added a workaround. Ramps SD card does not have sdcard...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-13
Christian Thalhammer
Merge remote-tracking branch 'upstream/Marlin_v1' into...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-07
Christian Thalhammer
lcd menue "move_axis" added
blob
|
commitdiff
|
raw
|
diff to current
2012-02-06
Christian Thalhammer
-disabled CARDDETECT if PIN is set to -1
blob
|
commitdiff
|
raw
|
diff to current
2012-02-06
Christian Thalhammer
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-12-22
Bernhard
one step closer to a functional makefile..
blob
|
commitdiff
|
raw
|
diff to current
2011-12-22
Bernhard
header file simplification
blob
|
commitdiff
|
raw
|
diff to current
2011-12-04
Erik van der Zalm
Merge branch 'Marlin_v1', remote-tracking branch 'origi...
blob
|
commitdiff
|
raw
|
diff to current
2011-12-04
Bernhard
solved some compiler warnings that are now visible...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-28
Bernhard
Merge branch 'Marlin_v1' of https://github.com/ErikZalm...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-28
Bernhard
Merge branch 'smallopt' into Marlin_v1
blob
|
commitdiff
|
raw
|
diff to current
2011-11-27
Bernhard
force inline
blob
|
commitdiff
|
raw
|
diff to current
2011-11-20
Bernhard Kubicek
Merge branch 'Marlin_v1' of https://github.com/ErikZalm...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-20
Bernhard Kubicek
less lcd flickering
blob
|
commitdiff
|
raw
|
diff to current
2011-11-20
Bernhard Kubicek
make tuneing sub-menu.
blob
|
commitdiff
|
raw
|
diff to current
2011-11-20
Erik van der Zalm
Merge branch 'Marlin_v1', remote-tracking branch 'origi...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-20
Bernhard Kubicek
Merge branch 'Marlin_v1' of https://github.com/ErikZalm...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-20
Bernhard Kubicek
made ultralcd compatible with folders.
blob
|
commitdiff
|
raw
|
diff to current
2011-11-20
Bernhard Kubicek
code cleanup in ultralcd.
blob
|
commitdiff
|
raw
|
diff to current
2011-11-18
Erik van der Zalm
Merge remote-tracking branch 'origin/Marlin_v1' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-15
Bernhard Kubicek
Merge branch 'Marlin_v1' of https://github.com/ErikZalm...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-15
Bernhard Kubicek
and changed ultipanel to have the mm/sec and not mm/min
blob
|
commitdiff
|
raw
|
diff to current
2011-11-15
Bernhard Kubicek
watchdog,percent done,
blob
|
commitdiff
|
raw
|
diff to current
2011-11-14
Erik van der Zalm
Buffer size > 16
blob
|
commitdiff
|
raw
|
diff to current
2011-11-13
Erik van der Zalm
Merge remote-tracking branch 'origin/Marlin_v1' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-09
Bernhard Kubicek
project progmem finished: total change with ultipanel...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-06
Bernhard Kubicek
Merge branch 'Marlin_v1' of https://github.com/ErikZalm...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-06
Bernhard Kubicek
first compile with the cardreader class
blob
|
commitdiff
|
raw
|
diff to current
2011-11-06
Bernhard Kubicek
reformating and some minor bugs/things found on the...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-05
Erik van der Zalm
Merge remote-tracking branch 'origin/Marlin_v1' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-05
Bernhard Kubicek
changed end of line to windows, which seems to be the...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-05
Bernhard Kubicek
merge from the branch bkubicek/Marlin/zalmmerge
blob
|
commitdiff
|
raw
|
diff to current
2011-11-04
Erik van der Zalm
Merged Marlin, Marlin non gen6 and Ultimaker changes
blob
|
commitdiff
|
raw
|
diff to current