Guillaume Seguin
|
34da3a0a3f
|
Merge github.com:ErikZalm/Marlin into Marlin_v1
Conflicts:
Marlin/language.h
|
11 years ago |
|
ErikZalm
|
a105e10075
|
Merge pull request #550 from buildrob101/MinimalDualXCarriage
Fixed compile error when QUICK_HOME is defined.
|
11 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.
|
11 years ago |
|
ErikZalm
|
c5bf8298d3
|
Merge pull request #549 from buildrob101/MinimalDualXCarriage
Disable DUAL_X_CARRIAGE by default
|
11 years ago |
|
Robert F-C
|
c3568398b5
|
Disable DUAL_X_CARRIAGE by default
|
11 years ago |
|
ErikZalm
|
96a773fa48
|
Merge pull request #548 from buildrob101/MinimalDualXCarriage
Dual x-carriage support
|
11 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.
|
11 years ago |
|
Robert F-C
|
d7390e13d9
|
Support dual x-carriage printers
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
|
11 years ago |
|
ErikZalm
|
5ab872de1f
|
Merge pull request #545 from MStohn/fix-bad-lcd-commit-from-makr3d
fixed bad lcd commit from makr3d
|
11 years ago |
|
Maik Stohn
|
9da94c247a
|
fixed bad lcd commit from makr3d
#elsif does not exist #elif is correct
|
11 years ago |
|
Erik van der Zalm
|
59004023fd
|
Fixed typo
|
11 years ago |
|
Erik van der Zalm
|
461dad6e05
|
Added : M32 - Select file and start SD print (Can be used when printing from SD card)
Untested
|
11 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.
|
11 years ago |
|
ErikZalm
|
8a2a3ef91d
|
Merge pull request #531 from iXce/Marlin_v1_lcd
Only clamp panel movements if software endstops are enabled
|
11 years ago |
|
Erik van der Zalm
|
6397b3339c
|
restored configuration.h defaults
|
11 years ago |
|
Erik van der Zalm
|
cdaaad3df1
|
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
|
11 years ago |
|
Erik van der Zalm
|
e3bdefd873
|
fixed missing #endif
|
11 years ago |
|
Erik van der Zalm
|
a5be0c52c6
|
no message
|
11 years ago |
|
ErikZalm
|
e73611f5fa
|
Merge pull request #535 from GabinoLopez/patch-1
Update language.h
|
11 years ago |
|
Michael Mayer
|
e509cdbeb0
|
added contrast control function for gLCDs
|
11 years ago |
|
Michael Mayer
|
99b7e926e7
|
added MaKr3d Melzi board
|
11 years ago |
|
Gabino Lopez
|
68be33b1fc
|
Update language.h
I update the spanish Messages, now this compile for spanish language.
|
11 years ago |
|
daid
|
acb3271c9a
|
Merge pull request #534 from xifle/Marlin_v1
Fixes compiler warning for feedrate deadzone
|
11 years ago |
|
xifle
|
61fe430d4f
|
Should fix compiler warning for feedrate deadzone
|
11 years ago |
|
daid
|
d77f5ee722
|
Merge pull request #532 from codexmas/ServoEndstops
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
|
11 years ago |
|
Gord Christmas
|
fde17d5720
|
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
|
11 years ago |
|
Guillaume Seguin
|
aa65c20d1f
|
Only clamp panel movements if software endstops are enabled
|
11 years ago |
|
Erik van der Zalm
|
ecf3ab5de4
|
Added thermistor 60 to configuration.h
|
11 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
|
11 years ago |
|
Erik van der Zalm
|
2015989f84
|
Added DISABLE_MIN_ENDSTOPS
|
11 years ago |
|
ErikZalm
|
1c86adc760
|
Merge pull request #526 from ch100/Marlin_v1
Fix Pin Description Typo
|
11 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>
|
11 years ago |
|
ErikZalm
|
171719f18c
|
Merge pull request #525 from lajos/ultralcd_pid
ultralcd.cpp compile errors when !defined(PIDTEMP)
|
11 years ago |
|
lajos
|
b519af4f05
|
fixed another !defined(PIDTEMP) compile in ultralcd.cpp
|
11 years ago |
|
lajos
|
7d03c52511
|
fixed compile error in ultralcd.cpp when PIDTEMP undefined
|
11 years ago |
|
ErikZalm
|
312b4aa7c2
|
Merge pull request #521 from lajos/azteeg_x1
added Azteeg X1 motherboard
|
11 years ago |
|
lajos
|
02dee80fa5
|
added Azteeg X1 motherboard
|
11 years ago |
|
ErikZalm
|
73569d891f
|
Merge pull request #520 from henrikbrixandersen/Makefile-fixes
Makefile fixes
|
11 years ago |
|
Henrik Brix Andersen
|
47dc70e3ec
|
Fix location of avrdude.conf
|
11 years ago |
|
Henrik Brix Andersen
|
1d258903bb
|
Allow command line compilation when using BEEPER.
|
11 years ago |
|
Erik van der Zalm
|
e34c9981ab
|
Delta disabled by default
|
11 years ago |
|
Erik van der Zalm
|
26a441fc7d
|
More 3Drag controller patches.
|
11 years ago |
|
Erik van der Zalm
|
ac975ed8c2
|
Merge branch 'deltabot' into Marlin_v1
|
11 years ago |
|
ErikZalm
|
58d12aad73
|
Merge pull request #511 from wolfmanjm/ezdelta
fix homing for deltas
|
11 years ago |
|
Jim Morris
|
caa848f943
|
fix homing for deltas
|
11 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
|
11 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
|
11 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
|
11 years ago |
|
Erik van der Zalm
|
73f21cd5d6
|
Spanish updated so far.
|
11 years ago |
|
Erik van der Zalm
|
6f4a6e531c
|
Merge branch 'deltabot' into Marlin_v1
|
11 years ago |
