Erik van der Zalm
0f2e0525df
Merge pull request #1096 from thinkyhead/set-home
...
Proposed feature: Set Home Offsets
2014-10-06 13:36:11 +02:00
Matthew Schick
fb34265d75
Make hotend optional when compiling with lcd support
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
2014-10-06 00:19:07 -04:00
Scott Lahteine
2f6c57eadc
Proposed feature: Set Home Offsets
...
Add an item to the LCD menu that applies the current axis position to
the “add_homeing” offset.
2014-10-05 13:35:45 -07:00
Erik van der Zalm
018b68a5c4
Merge pull request #976 from cocktailyogi/SCARA_by_Yogi
...
Implemented SCARA-Maths
2014-08-28 16:32:52 +02:00
Erik van der Zalm
dde61d8886
Merge pull request #977 from OskarLinde/Marlin_v1
...
Fix lcd itostr3() to handle negative numbers
2014-08-28 16:31:53 +02:00
cocktailyogi
2f4a20257c
imported last Marlin changes
2014-07-20 13:49:26 +02:00
daid
aacff0d361
Merge pull request #948 from Dim3nsioneer/Marlin_v1
...
Implementation of FW extruder change retract
2014-07-18 16:10:15 +02:00
Pablo Clemente
2242a84218
Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965
2014-07-01 16:45:03 +02:00
Pablo Clemente
d86c3cf43c
Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too.
2014-06-30 15:12:13 +02:00
Oskar Linde
269a068032
Fix lcd itostr3() to handle negative numbers
2014-06-24 14:31:15 +02:00
cocktailyogi
512f2a3136
restore Branch from Backup
...
sorry for that
2014-06-23 17:09:57 +02:00
Pablo Clemente
cd3220d055
Inverted state logic for forced_heating_stop variable
2014-06-13 08:39:58 +02:00
Pablo Clemente
86b4b805d2
Fixed stop print LCD function on M104
2014-06-12 18:43:16 +02:00
Dim3nsioneer
3c927901a4
Implementation of FW extruder change retract
...
FW retraction is extended onto swap retraction invoked by 'G10 S1'.
Bookkeeping of the retract state of all extruders allows for having one
extruder fw standard retracted while another extruder is swap retracted.
An LCD menu item for the swap retract and recover length was added.
2014-06-02 17:02:10 +02:00
daid
2acd3792fc
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2014-05-01 12:03:47 +02:00
daid
8b4c4aa5c3
Add feature to check&retry CRC read errors on SD.
2014-05-01 12:03:41 +02:00
Dim3nsioneer
944ced87c5
Extended Preheat options
...
Preheat LCD menus base on code by D-Base
2014-03-17 18:37:46 +01:00
Dim3nsioneer
3906f27c46
Individual extruder flow rate
...
Extension of M221, Tune menu
2014-03-15 18:09:46 +01:00
Matthew Schick
6cd85e6008
Add support for disabling encoder control for feedrate multiplier
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
2014-03-12 18:13:50 -04:00
Cylindric
5d50819791
Various typo fixes - only in comments, no code changes.
2014-02-17 13:04:44 +00:00
nothinman
d4ba23bc28
Merge pull request #770 from josefpavlik/Marlin_v1
...
Marlin v1
2014-02-17 11:27:05 +00:00
Josef Pavlik
477b6fa1df
move engaged from lcd console refreshes power off timeout
2014-02-14 12:37:21 +01:00
daid
c31bb2b7ad
Only show the ZProbe offset when auto-bed-leveling is enabled.
2014-02-13 11:48:55 +01:00
Mark Hanford
bdd0211aeb
Move strings in ultralcd.cpp into language.h.
2014-02-11 13:54:43 +00:00
ErikZalm
84df13f7d1
Merge pull request #721 from drf5n/lcdOnly
...
Enable basic ULTRA_LCD screen w/o encoders and menus.
2014-01-31 07:07:12 -08:00
David Forrest
61a7256d42
Enable basic ULTRA_LCD screen w/o encoders and menus.
2014-01-17 17:00:47 -05:00
Alex Borro
05932e4458
Add Z Probe Offset to EEPROM and Ultra LCD
2014-01-16 18:13:46 -02:00
-
e5d3044801
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
2013-12-08 21:34:56 +01:00
Erik van der Zalm
a94e588765
Changed slow buttons behavior.
2013-11-17 17:41:30 +01:00
fmalpartida
5b3f60ea2e
Corrected LCD only error
...
If only an LCD is defined and no menu or keyboard defined, there is a
compilation error.
Added conditional compilation.
2013-10-30 21:52:46 +01:00
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).
2013-10-30 11:45:32 +01:00
Erik van der Zalm
667d278f54
Revert "Fix for Viki display"
...
This reverts commit 314fd13c39
2013-10-20 10:16:46 +02:00
bkubicek
7fad13a1e2
Reverse SD card file name order.
...
This is _not_ automatically the cronological, since deleting a file will free
the filesystem descriptor for it, which then will be used by the next file copied on it.
Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu.
this should satisfy https://github.com/ErikZalm/Marlin/pull/373
as a reminder, auto0.g will be executed every time after a boot with sd card present and file present.
thereafter, if there is a file auto1.g this will be done. Thats IMHO the best place to put settings, and prepare heating.
I also execute again after each (now again via the prepare menu) before starting a new print/ after a failed one.
It for me 100% replaces any start.gcode form the slicers.
2013-10-12 13:24:55 +02:00
bkubicek
b832f5b9f6
added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try.
...
also, removed some trouble for compilation with corexy.
I think that babystepping is only possible in z for a delta tower.
not sure if it would be usefull to step individual motors on a delta, i don't own one
2013-10-07 09:14:04 +02:00
bkubicek
d147a057ac
Add the socalled "Babystepping" feature.
...
It is a realtime control over the head position via the LCD menu system that works _while_ printing.
Using it, one can e.g. tune the z-position in realtime, while printing the first layer.
Also, lost steps can be manually added/removed, but thats not the prime feature.
Stuff is placed into the Tune->Babystep *
It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then.
Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name.
say goodby to fuddling around with the z-axis.
2013-10-06 21:14:51 +02:00
Erik van der Zalm
314fd13c39
Fix for Viki display
2013-09-26 20:32:19 +02:00
Erik van der Zalm
9bc88f8bab
Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file
2013-09-23 23:25:11 +02:00
Erik van der Zalm
3ca1ca6869
Fixed missing ENCODER_PULSES_PER_STEP
2013-09-23 23:18:35 +02:00
Xoan Sampaiño
bf7007d02f
add ENCODER_PULSES_PER_STEP
2013-09-13 04:12:51 +02:00
Nicolas Rossi
394ed08f88
Added feedrate setting for manual moves from panel
2013-07-30 14:33:30 +02:00
Brendan-csel
d7f384f680
Skip SD menu refresh if nothing has changed
2013-07-30 14:02:15 +02:00
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.
2013-07-30 14:02:13 +02:00
Nicolas Rossi
55c287a69e
Fixed move from panel for delta bot #557
2013-07-28 22:54:37 +02:00
Guillaume Seguin
76841450c8
Only display poweron/poweroff if PS_ON_PIN > -1
2013-07-23 22:28:30 +02:00
Guillaume Seguin
34da3a0a3f
Merge github.com:ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/language.h
2013-07-23 21:46:41 +02:00
ErikZalm
8a2a3ef91d
Merge pull request #531 from iXce/Marlin_v1_lcd
...
Only clamp panel movements if software endstops are enabled
2013-07-14 06:50:23 -07:00
Erik van der Zalm
cdaaad3df1
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
2013-07-14 15:45:49 +02:00
Erik van der Zalm
e3bdefd873
fixed missing #endif
2013-07-14 15:42:53 +02:00
Erik van der Zalm
a5be0c52c6
no message
2013-07-14 15:35:54 +02:00
Michael Mayer
e509cdbeb0
added contrast control function for gLCDs
2013-07-14 15:28:26 +07:00
