Peter Hercek
9aa2229077
add command M666 for adjusting delta printer endstop position
11 years ago
Robert F-C
9547fb9dfb
Add duplication and auto-park mode for dual x-carriage support.
12 years ago
Steve Kelly
53614e5144
add pins for rambo lcd
12 years ago
Steve Kelly
b42d24e31e
add additional pins to avr2560 for rambo lcd
12 years ago
Nicolas Rossi
b0c8120fcc
Added feedrate setting in exemple config for manual moves from panel
12 years ago
Nicolas Rossi
a54fe2d73c
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
...
Conflicts:
Marlin/Marlin_main.cpp
12 years ago
ErikZalm
7ea63d08df
Merge pull request #565 from iXce/avrdudeconfpath
...
Detect OS in Makefile to use the correct avrdude.conf path
12 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)
12 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
12 years ago
Guillaume Seguin
c0c4c97db6
Detect OS in Makefile to use the correct avrdude.conf path
12 years ago
hg42@gmx.net
2ca983568d
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
12 years ago
hg42@gmx.net
3700f688f5
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
12 years ago
daid
a504c88346
Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts.
12 years ago
Nicolas Rossi
394ed08f88
Added feedrate setting for manual moves from panel
12 years ago
Nicolas Rossi
9bf1cf1b22
Pre-calculate diagonal rod length squared
12 years ago
Nicolas Rossi
4623e78ce0
Added Honeywell thermistor 135-104LAF-J01
12 years ago
Brendan-csel
d7f384f680
Skip SD menu refresh if nothing has changed
12 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.
12 years ago
Guillaume Seguin
f4c3135c6d
Add Panelolu2 pins for RAMPS1.3
12 years ago
Guillaume Seguin
aae42c68f9
Update French translation in language.h
12 years ago
Guillaume Seguin
4d435c38a6
Add support of LiquidTWI2-based panels to Makefile
...
Use LIQUID_TWI2=1 as make argument to enable this support
12 years ago
Guillaume Seguin
6c42a3a339
Woops, fix logic
12 years ago
Guillaume Seguin
376d8af2c8
Report temperatures for all extruders
12 years ago
ErikZalm
434b6a05c1
Merge pull request #552 from iXce/Marlin_v1
...
Report temperatures for all extruders in reply to M105
12 years ago
ErikZalm
bdc2621119
Merge pull request #561 from Brendan-csel/Marlin_v1
...
Fix for Viki LCD issues printing from SD card
12 years ago
ErikZalm
6965bd4e15
Merge pull request #560 from njprossi/Marlin_v1
...
Fixed move from panel for delta bot #557
12 years ago
ErikZalm
a55b33e613
Merge pull request #559 from iXce/panelolupinsramps13
...
Add Panelolu2 pins for RAMPS1.3
12 years ago
ErikZalm
8b34351537
Merge pull request #558 from iXce/frenchupdate
...
Update French translation in language.h
12 years ago
ErikZalm
735e556724
Merge pull request #555 from iXce/liquidtwi2_makefile
...
Add support of LiquidTWI2-based panels to Makefile
12 years ago
Brendan-csel
d80aecda0a
Skip SD menu refresh if nothing has changed
12 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.
12 years ago
Nicolas Rossi
55c287a69e
Fixed move from panel for delta bot #557
12 years ago
Guillaume Seguin
1902d339b0
Add Panelolu2 pins for RAMPS1.3
12 years ago
Guillaume Seguin
eb23a68e92
Update French translation in language.h
12 years ago
ErikZalm
1561c6df51
Merge pull request #547 from wolfmanjm/delta-configuration
...
Setup Default configuration for Deltas if DELTA is defined
12 years ago
Guillaume Seguin
374bc99fa3
Add support of LiquidTWI2-based panels to Makefile
...
Use LIQUID_TWI2=1 as make argument to enable this support
12 years ago
Jim Morris
ab624eac2a
revert COnfiguratiuon to the same as head
12 years ago
Jim Morris
52f79ffeca
add an example default configuration for delta style bots
12 years ago
Jim Morris
b9d7ccf1cd
Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
12 years ago
Guillaume Seguin
d4d1540727
Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit
12 years ago
Guillaume Seguin
01ed99143c
Woops, fix logic
12 years ago
Guillaume Seguin
76841450c8
Only display poweron/poweroff if PS_ON_PIN > -1
12 years ago
Guillaume Seguin
44f327d738
Uniformly reindent language.h
12 years ago
Guillaume Seguin
326d2db025
Update language.h so that all languages compile
...
Some strings still need translation, but at least everything compiles.
12 years ago
Guillaume Seguin
2cb716f513
Run Marlin/language.h through dos2unix
12 years ago
Guillaume Seguin
34da3a0a3f
Merge github.com:ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/language.h
12 years ago
Guillaume Seguin
18199ff960
Merge github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
Robert F-C
fb5334f428
Fixed compile error when QUICK_HOME is defined.
...
As well a couple of minor changes to handling of extruder offset for
dual x-carriage mode.
12 years ago
Robert F-C
c3568398b5
Disable DUAL_X_CARRIAGE by default
12 years ago
Robert F-C
39cd3dbdbe
Remove dual x-carriage functionality that could/should be implemented in slicer
...
Also added a couple of missed merge lines in homeaxis() from previous
commit.
12 years ago
Jim Morris
fb20ceabce
enable soft endstops for delta
...
disable delta by default
12 years ago
Jim Morris
d01ee7e7b5
fix zjerk being the same for delta as xy jerk
...
add more delta defaults
on delta make second home even slower
12 years ago
Robert F-C
d7390e13d9
Support dual x-carriage printers
...
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
12 years ago
Jim Morris
f3aa2a48e7
update max pos
12 years ago
Jim Morris
460751503e
Added default configurations for deltas when DELTA is defined
12 years ago
Maik Stohn
9da94c247a
fixed bad lcd commit from makr3d
...
#elsif does not exist #elif is correct
12 years ago
Erik van der Zalm
59004023fd
Fixed typo
12 years ago
Erik van der Zalm
461dad6e05
Added : M32 - Select file and start SD print (Can be used when printing from SD card)
...
Untested
12 years ago
Erik van der Zalm
c4a2077951
M109 and M190 now wait when cooling down if R is used instead of S.
...
M109 S180 waits only when heating.
M109 R180 also waits when cooling.
12 years ago
ErikZalm
8a2a3ef91d
Merge pull request #531 from iXce/Marlin_v1_lcd
...
Only clamp panel movements if software endstops are enabled
12 years ago
Erik van der Zalm
6397b3339c
restored configuration.h defaults
12 years ago
Erik van der Zalm
cdaaad3df1
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
12 years ago
Erik van der Zalm
e3bdefd873
fixed missing #endif
12 years ago
Erik van der Zalm
a5be0c52c6
no message
12 years ago
Michael Mayer
e509cdbeb0
added contrast control function for gLCDs
12 years ago
Michael Mayer
99b7e926e7
added MaKr3d Melzi board
12 years ago
Gabino Lopez
68be33b1fc
Update language.h
...
I update the spanish Messages, now this compile for spanish language.
12 years ago
daid
acb3271c9a
Merge pull request #534 from xifle/Marlin_v1
...
Fixes compiler warning for feedrate deadzone
12 years ago
xifle
61fe430d4f
Should fix compiler warning for feedrate deadzone
12 years ago
Gord Christmas
fde17d5720
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
12 years ago
Guillaume Seguin
aa65c20d1f
Only clamp panel movements if software endstops are enabled
12 years ago
Erik van der Zalm
ecf3ab5de4
Added thermistor 60 to configuration.h
12 years ago
Nicolas Rossi
2daa85918e
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/language.h
Marlin/pins.h
Marlin/ultralcd.cpp
12 years ago
Erik van der Zalm
2015989f84
Added DISABLE_MIN_ENDSTOPS
12 years ago
Christian Inci
648d45cfb2
Fix Pin Description Typo
...
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
12 years ago
ErikZalm
171719f18c
Merge pull request #525 from lajos/ultralcd_pid
...
ultralcd.cpp compile errors when !defined(PIDTEMP)
12 years ago
lajos
b519af4f05
fixed another !defined(PIDTEMP) compile in ultralcd.cpp
12 years ago
lajos
7d03c52511
fixed compile error in ultralcd.cpp when PIDTEMP undefined
12 years ago
lajos
02dee80fa5
added Azteeg X1 motherboard
12 years ago
Henrik Brix Andersen
47dc70e3ec
Fix location of avrdude.conf
12 years ago
Henrik Brix Andersen
1d258903bb
Allow command line compilation when using BEEPER.
12 years ago
Erik van der Zalm
e34c9981ab
Delta disabled by default
12 years ago
Erik van der Zalm
26a441fc7d
More 3Drag controller patches.
12 years ago
Erik van der Zalm
ac975ed8c2
Merge branch 'deltabot' into Marlin_v1
12 years ago
Jim Morris
caa848f943
fix homing for deltas
12 years ago
Erik van der Zalm
7ad12be763
Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
README.md
12 years ago
Erik van der Zalm
408169aef4
Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/language.h
Marlin/pins.h
12 years ago
Erik van der Zalm
bd96d22bfb
Merge branch 'Marlin_v1' into thinkyhead
...
Conflicts:
Marlin/Configuration.h
Marlin/Configuration_adv.h
Marlin/Marlin.h
Marlin/Marlin_main.cpp
Marlin/Servo.cpp
Marlin/language.h
Marlin/pins.h
Marlin/planner.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
README.md
12 years ago
Erik van der Zalm
73f21cd5d6
Spanish updated so far.
12 years ago
Erik van der Zalm
6f4a6e531c
Merge branch 'deltabot' into Marlin_v1
12 years ago
Erik van der Zalm
01edf22a10
Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue.
12 years ago
Erik van der Zalm
ff6fa09ecf
Moved corexy implementation from stepper to planner
...
(Thanks iquizzle)
12 years ago
Erik van der Zalm
c8dcc7c208
Allow increasing the software PWM frequency.
12 years ago
Erik van der Zalm
8b0d82e9db
Removed "awaiting translation" for french
12 years ago
Erik van der Zalm
1e05d192ab
Make the beep tone less offensive
12 years ago
Erik van der Zalm
373f3ecab3
Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/pins.h
12 years ago
kiyoshigawa
f295712008
Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h
12 years ago
kiyoshigawa
69b02031ca
Fixed small error in lcd define statements.
12 years ago
kiyoshigawa
6a81291c57
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
...
This should fix issues with pull request 467, I hope.
Conflicts:
Marlin/Configuration.h
Marlin/Marlin.pde
Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
BorisLandoni
c1cb5977ee
Update Configuration.h
12 years ago