Nicolas Rossi
|
55c287a69e
|
Fixed move from panel for delta bot #557
|
2013-07-28 22:54:37 +02:00 |
|
Guillaume Seguin
|
1902d339b0
|
Add Panelolu2 pins for RAMPS1.3
|
2013-07-28 19:19:57 +02:00 |
|
Guillaume Seguin
|
eb23a68e92
|
Update French translation in language.h
|
2013-07-28 18:50:47 +02:00 |
|
midopple
|
7ced55b97c
|
Merge pull request #1 from ErikZalm/Marlin_v1
merge
|
2013-07-27 08:06:44 -07:00 |
|
ellensp
|
e019197b32
|
renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works for Arduino > 1.0 on linux
|
2013-07-27 00:13:49 +12:00 |
|
ErikZalm
|
1561c6df51
|
Merge pull request #547 from wolfmanjm/delta-configuration
Setup Default configuration for Deltas if DELTA is defined
|
2013-07-24 03:11:36 -07:00 |
|
Guillaume Seguin
|
374bc99fa3
|
Add support of LiquidTWI2-based panels to Makefile
Use LIQUID_TWI2=1 as make argument to enable this support
|
2013-07-24 12:09:53 +02:00 |
|
Jim Morris
|
ab624eac2a
|
revert COnfiguratiuon to the same as head
|
2013-07-24 02:57:46 -07:00 |
|
Jim Morris
|
52f79ffeca
|
add an example default configuration for delta style bots
|
2013-07-24 02:55:52 -07:00 |
|
Jim Morris
|
b9d7ccf1cd
|
Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration
Conflicts:
Marlin/Marlin_main.cpp
|
2013-07-24 02:49:25 -07:00 |
|
ErikZalm
|
c323fced9a
|
Merge pull request #554 from iXce/cxa_atexit
Fix Makefile-based build when avr-gcc has been compiled with --enable-cxa_atexit
|
2013-07-24 02:49:08 -07:00 |
|
Guillaume Seguin
|
d4d1540727
|
Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit
|
2013-07-24 11:19:38 +02:00 |
|
Guillaume Seguin
|
01ed99143c
|
Woops, fix logic
|
2013-07-23 23:34:42 +02:00 |
|
ErikZalm
|
e578f988d3
|
Merge pull request #553 from iXce/req413
Update #413 for merging, fix languages.h
|
2013-07-23 14:19:30 -07:00 |
|
Guillaume Seguin
|
76841450c8
|
Only display poweron/poweroff if PS_ON_PIN > -1
|
2013-07-23 22:28:30 +02:00 |
|
Guillaume Seguin
|
44f327d738
|
Uniformly reindent language.h
|
2013-07-23 22:13:40 +02:00 |
|
Guillaume Seguin
|
326d2db025
|
Update language.h so that all languages compile
Some strings still need translation, but at least everything compiles.
|
2013-07-23 22:11:54 +02:00 |
|
Guillaume Seguin
|
2cb716f513
|
Run Marlin/language.h through dos2unix
|
2013-07-23 21:49:37 +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 |
|
Guillaume Seguin
|
18199ff960
|
Merge github.com:ErikZalm/Marlin into Marlin_v1
|
2013-07-23 21:33:52 +02:00 |
|
ErikZalm
|
a105e10075
|
Merge pull request #550 from buildrob101/MinimalDualXCarriage
Fixed compile error when QUICK_HOME is defined.
|
2013-07-22 06:08:44 -07:00 |
|
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.
|
2013-07-22 22:46:14 +10:00 |
|
ErikZalm
|
c5bf8298d3
|
Merge pull request #549 from buildrob101/MinimalDualXCarriage
Disable DUAL_X_CARRIAGE by default
|
2013-07-20 09:43:47 -07:00 |
|
Robert F-C
|
c3568398b5
|
Disable DUAL_X_CARRIAGE by default
|
2013-07-20 23:50:30 +10:00 |
|
ErikZalm
|
96a773fa48
|
Merge pull request #548 from buildrob101/MinimalDualXCarriage
Dual x-carriage support
|
2013-07-20 02:59:32 -07:00 |
|
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.
|
2013-07-20 13:07:50 +10:00 |
|
Jim Morris
|
fb20ceabce
|
enable soft endstops for delta
disable delta by default
|
2013-07-17 16:21:51 -07:00 |
|
Jim Morris
|
d01ee7e7b5
|
fix zjerk being the same for delta as xy jerk
add more delta defaults
on delta make second home even slower
|
2013-07-17 16:14:07 -07:00 |
|
Robert F-C
|
d7390e13d9
|
Support dual x-carriage printers
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
|
2013-07-17 22:44:45 +10:00 |
|
Jim Morris
|
f3aa2a48e7
|
update max pos
|
2013-07-17 01:29:51 -07:00 |
|
Jim Morris
|
460751503e
|
Added default configurations for deltas when DELTA is defined
|
2013-07-17 01:17:27 -07:00 |
|
ErikZalm
|
5ab872de1f
|
Merge pull request #545 from MStohn/fix-bad-lcd-commit-from-makr3d
fixed bad lcd commit from makr3d
|
2013-07-15 08:57:43 -07:00 |
|
Maik Stohn
|
9da94c247a
|
fixed bad lcd commit from makr3d
#elsif does not exist #elif is correct
|
2013-07-15 17:34:21 +02:00 |
|
Erik van der Zalm
|
59004023fd
|
Fixed typo
|
2013-07-15 17:22:56 +02:00 |
|
Erik van der Zalm
|
461dad6e05
|
Added : M32 - Select file and start SD print (Can be used when printing from SD card)
Untested
|
2013-07-14 22:39:59 +02:00 |
|
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.
|
2013-07-14 21:10:24 +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
|
6397b3339c
|
restored configuration.h defaults
|
2013-07-14 15:49:03 +02: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 |
|
ErikZalm
|
e73611f5fa
|
Merge pull request #535 from GabinoLopez/patch-1
Update language.h
|
2013-07-14 02:24:31 -07:00 |
|
Michael Mayer
|
e509cdbeb0
|
added contrast control function for gLCDs
|
2013-07-14 15:28:26 +07:00 |
|
Michael Mayer
|
99b7e926e7
|
added MaKr3d Melzi board
|
2013-07-14 15:17:55 +07:00 |
|
Gabino Lopez
|
68be33b1fc
|
Update language.h
I update the spanish Messages, now this compile for spanish language.
|
2013-07-04 10:23:00 +02:00 |
|
daid
|
acb3271c9a
|
Merge pull request #534 from xifle/Marlin_v1
Fixes compiler warning for feedrate deadzone
|
2013-07-01 23:41:51 -07:00 |
|
xifle
|
61fe430d4f
|
Should fix compiler warning for feedrate deadzone
|
2013-07-01 11:10:02 +02:00 |
|
daid
|
d77f5ee722
|
Merge pull request #532 from codexmas/ServoEndstops
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
|
2013-06-28 08:04:55 -07:00 |
|
Gord Christmas
|
fde17d5720
|
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
|
2013-06-28 08:02:04 -07:00 |
|
Guillaume Seguin
|
aa65c20d1f
|
Only clamp panel movements if software endstops are enabled
|
2013-06-28 14:18:00 +02:00 |
|