This website requires JavaScript.
bf27e79e74
Small BlinkM fix
Erik van der Zalm
2013-10-20 10:06:02 +02:00
87e28c0599
Added ifdefs to blinkm
Erik van der Zalm
2013-10-20 09:55:15 +02:00
24c6b2ab35
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Erik van der Zalm
2013-10-20 09:51:58 +02:00
6a803ba9c5
Merge pull request #590 from timkoster/Marlin_v1
ErikZalm
2013-10-20 00:51:35 -07:00
457d8a0acb
Fixed merge conflicts
Erik van der Zalm
2013-10-20 09:50:27 +02:00
6f85a8c7aa
Bed auto Leveling change: Raise Z before homing
Alex Borro
2013-10-12 17:28:11 -03:00
dd3086d3f2
Show Temperature ADC values
Alex Borro
2013-10-12 10:41:23 -03:00
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.
bkubicek
2013-10-12 13:24:55 +02:00
73c82e7ad8
Clarifying M280 command in Bed Auto Leveling section.
alexborro
2013-10-08 10:15:09 -03:00
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
bkubicek
2013-10-07 09:14:04 +02:00
c38b0855c8
I think that filament change is ready for the masses. I have tested very often with my ultimaker.
bkubicek
2013-10-06 21:20:26 +02:00
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 *
bkubicek
2013-10-06 21:14:51 +02:00
bca353cc12
Fixed duplicate define in fastio.h
Erik van der Zalm
2013-10-03 19:24:53 +02:00
253dfc4bc1
Bed Auto Leveling feature
Alex Borro
2013-09-29 13:20:06 -03:00
1bda6bf862
Merge pull request #609 from phq1910/patch-1
ErikZalm
2013-09-26 11:47:58 -07:00
c80aac1518
Merge pull request #610 from phq1910/patch-2
ErikZalm
2013-09-26 11:47:47 -07:00
314fd13c39
Fix for Viki display
Erik van der Zalm
2013-09-26 20:32:19 +02:00
4f7c6dfe35
Update pins.h
phq1910
2013-09-26 11:40:54 -03:00
57173739a1
Update Configuration.h
phq1910
2013-09-26 11:29:44 -03:00
0dca49a7c0
Added Azteeg X3 board.
Erik van der Zalm
2013-09-24 17:31:16 +02:00
d8c2c810b4
Added info to the delta configuration files in the configuration.h file
Erik van der Zalm
2013-09-23 23:29:46 +02:00
9bc88f8bab
Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file
Erik van der Zalm
2013-09-23 23:25:11 +02:00
3ca1ca6869
Fixed missing ENCODER_PULSES_PER_STEP
Erik van der Zalm
2013-09-23 23:18:35 +02:00
97b0da0c2e
Removed #ifndef BLINKM
Tim Koster
2013-09-22 10:43:27 +03:00
61db046b32
Added #ifdef BLINKM around new code. Also refined BlinkM.h.
Tim Koster
2013-09-20 10:57:42 +03:00
77df2ab0e7
Make Y_DUAL_STEPPER_DRIVERS disabled by default
Richard Miles
2013-09-17 21:49:44 +01:00
ed1ab42186
Added Y_DUAL_STEPPER_DRIVERS
Richard Miles
2013-09-17 19:19:20 +01:00
f4a59e4ce5
Revert "Added Y_DUAL_STEPPER_DRIVERS"
Richard Miles
2013-09-17 19:05:49 +01:00
7ee275b620
Added Y_DUAL_STEPPER_DRIVERS
Richard Miles
2013-09-17 19:02:00 +01:00
6a1e980c6d
Merge pull request #600 from xoan/Encoder_Pulses_Per_Step
ErikZalm
2013-09-14 04:56:45 -07:00
20076a8bd3
Merge pull request #598 from GDV0/Marlin_v1
ErikZalm
2013-09-14 04:54:19 -07:00
3626b5ad8b
Removed Delta from the default config file. Changed EEPROM CHITCHAT behavior. M503 is always enabled.
Erik van der Zalm
2013-09-14 13:50:09 +02:00
bf7007d02f
add ENCODER_PULSES_PER_STEP
Xoan Sampaiño
2013-09-13 04:12:51 +02:00
f17506c504
FIx compilation error when enabling SERVO_ENDSTOPS (#591 )
GDV0
2013-09-11 23:09:37 +02:00
59e36f1d27
Merge pull request #595 from nothinman/Marlin_v1
ErikZalm
2013-09-11 00:39:17 -07:00
acd8619809
Fan fix for Panelolu2+Sanguinololu.
Martin Lukasik
2013-09-10 22:10:58 +01:00
7c35be7fd8
Merge pull request #594 from gr5/Marlin_v1
ErikZalm
2013-09-10 07:56:55 -07:00
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.
George Roberts
2013-09-10 09:56:19 -04:00
88dfeefca3
Define BlinkM default disabled
Tim Koster
2013-09-10 12:32:21 +03:00
5350faf2a2
Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1
Tim Koster
2013-09-10 12:27:26 +03:00
7016cc9511
Added BlinkM support over i2c
Tim Koster
2013-09-10 12:18:29 +03:00
d78db12abd
Merge pull request #589 from wolfmanjm/upgrade
ErikZalm
2013-09-09 07:09:19 -07:00
3b315b3da0
Added BlinkM support over i2c
Tim Koster
2013-09-06 22:25:39 +03:00
f26f26b7bd
Fix the example delta configuration as someone forgot to do it.
Jim Morris
2013-09-05 16:36:55 -07:00
a447e76fdf
Update read me. Added comment about products that have a patent.
Erik van der Zalm
2013-08-30 14:39:19 +02:00
f8d173bd0b
Merge pull request #582 from hercek/upstream
ErikZalm
2013-08-28 01:49:44 -07:00
9aa2229077
add command M666 for adjusting delta printer endstop position
Peter Hercek
2013-08-28 01:15:20 +02:00
aa6c58ad37
Merge pull request #575 from buildrob101/DualXCarriageMerge
ErikZalm
2013-08-07 13:10:54 -07:00
221286c10a
Add .gitignore change to ignore .bak files (produced by WinMerge and other editors)
Robert F-C
2013-08-08 00:16:38 +10:00
9547fb9dfb
Add duplication and auto-park mode for dual x-carriage support.
Robert F-C
2013-08-08 00:10:26 +10:00
62aab66299
Merge pull request #572 from ultimachine/rambo_LCD
ErikZalm
2013-08-05 10:04:47 -07:00
d7b1a8ba33
add rambo arduino addons
Steve Kelly
2013-08-03 12:42:34 -05:00
53614e5144
add pins for rambo lcd
Steve Kelly
2013-08-03 11:45:53 -05:00
b42d24e31e
add additional pins to avr2560 for rambo lcd
Steve Kelly
2013-08-03 11:37:12 -05:00
07f029c2d5
Merge pull request #563 from njprossi/Marlin_v1
ErikZalm
2013-08-03 08:05:26 -07:00
b0c8120fcc
Added feedrate setting in exemple config for manual moves from panel
Nicolas Rossi
2013-08-03 13:09:53 +02:00
a54fe2d73c
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
Nicolas Rossi
2013-08-03 13:05:56 +02:00
7ea63d08df
Merge pull request #565 from iXce/avrdudeconfpath
ErikZalm
2013-08-02 13:16:07 -07:00
4187b637a5
Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops
ErikZalm
2013-08-02 13:15:30 -07:00
07e7de3600
Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions
ErikZalm
2013-08-02 13:13:29 -07:00
c0c4c97db6
Detect OS in Makefile to use the correct avrdude.conf path
Guillaume Seguin
2013-08-01 19:20:27 +02:00
2ca983568d
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
hg42@gmx.net
2013-08-01 15:06:39 +02:00
3700f688f5
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
hg42@gmx.net
2013-08-01 14:56:39 +02:00
a504c88346
Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts.
daid
2013-08-01 14:12:30 +02:00
c6cb93d38c
Merge pull request #556 from ellensp/Marlin_v1
ErikZalm
2013-07-31 13:34:40 -07:00
394ed08f88
Added feedrate setting for manual moves from panel
Nicolas Rossi
2013-07-30 14:33:30 +02:00
9bf1cf1b22
Pre-calculate diagonal rod length squared
Nicolas Rossi
2013-07-30 14:09:21 +02:00
4623e78ce0
Added Honeywell thermistor 135-104LAF-J01
Nicolas Rossi
2013-07-30 14:01:41 +02:00
d7f384f680
Skip SD menu refresh if nothing has changed
Brendan-csel
2013-07-29 21:00:29 +12:00
abc8320a68
Save LCD_CLICKED before it is cleared
Brendan-csel
2013-07-29 20:58:09 +12:00
f4c3135c6d
Add Panelolu2 pins for RAMPS1.3
Guillaume Seguin
2013-07-28 19:19:57 +02:00
aae42c68f9
Update French translation in language.h
Guillaume Seguin
2013-07-28 18:18:41 +02:00
4d435c38a6
Add support of LiquidTWI2-based panels to Makefile
Guillaume Seguin
2013-07-24 12:09:53 +02:00
6c42a3a339
Woops, fix logic
Guillaume Seguin
2013-07-23 23:34:42 +02:00
376d8af2c8
Report temperatures for all extruders
Guillaume Seguin
2013-05-29 18:06:12 +02:00
434b6a05c1
Merge pull request #552 from iXce/Marlin_v1
ErikZalm
2013-07-29 10:39:21 -07:00
bdc2621119
Merge pull request #561 from Brendan-csel/Marlin_v1
ErikZalm
2013-07-29 10:38:17 -07:00
6965bd4e15
Merge pull request #560 from njprossi/Marlin_v1
ErikZalm
2013-07-29 10:37:40 -07:00
a55b33e613
Merge pull request #559 from iXce/panelolupinsramps13
ErikZalm
2013-07-29 10:37:03 -07:00
8b34351537
Merge pull request #558 from iXce/frenchupdate
ErikZalm
2013-07-29 10:36:43 -07:00
735e556724
Merge pull request #555 from iXce/liquidtwi2_makefile
ErikZalm
2013-07-29 10:33:54 -07:00
d80aecda0a
Skip SD menu refresh if nothing has changed
Brendan-csel
2013-07-29 21:00:29 +12:00
be2dea1dc6
Save LCD_CLICKED before it is cleared
Brendan-csel
2013-07-29 20:58:09 +12:00
55c287a69e
Fixed move from panel for delta bot #557
Nicolas Rossi
2013-07-28 22:54:37 +02:00
1902d339b0
Add Panelolu2 pins for RAMPS1.3
Guillaume Seguin
2013-07-28 19:19:57 +02:00
eb23a68e92
Update French translation in language.h
Guillaume Seguin
2013-07-28 18:18:41 +02:00
7ced55b97c
Merge pull request #1 from ErikZalm/Marlin_v1
midopple
2013-07-27 08:06:44 -07:00
e019197b32
renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works for Arduino > 1.0 on linux
ellensp
2013-07-27 00:13:49 +12:00
1561c6df51
Merge pull request #547 from wolfmanjm/delta-configuration
ErikZalm
2013-07-24 03:11:36 -07:00
374bc99fa3
Add support of LiquidTWI2-based panels to Makefile
Guillaume Seguin
2013-07-24 12:09:53 +02:00
ab624eac2a
revert COnfiguratiuon to the same as head
Jim Morris
2013-07-24 02:57:46 -07:00
52f79ffeca
add an example default configuration for delta style bots
Jim Morris
2013-07-24 02:55:52 -07:00
b9d7ccf1cd
Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration
Jim Morris
2013-07-24 02:49:25 -07:00
c323fced9a
Merge pull request #554 from iXce/cxa_atexit
ErikZalm
2013-07-24 02:49:08 -07:00
d4d1540727
Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit
Guillaume Seguin
2013-07-24 11:19:38 +02:00
01ed99143c
Woops, fix logic
Guillaume Seguin
2013-07-23 23:34:42 +02:00
e578f988d3
Merge pull request #553 from iXce/req413
ErikZalm
2013-07-23 14:19:30 -07:00
76841450c8
Only display poweron/poweroff if PS_ON_PIN > -1
Guillaume Seguin
2013-07-23 22:28:30 +02:00
44f327d738
Uniformly reindent language.h
Guillaume Seguin
2013-07-23 22:13:40 +02:00
326d2db025
Update language.h so that all languages compile
Guillaume Seguin
2013-07-23 22:11:54 +02:00