Commit Graph

1137 Commits (2fb2a0a1196577201e5365a82e8103d014e5b2e8)
 

Author SHA1 Message Date
Guillaume Seguin 01ed99143c Woops, fix logic
ErikZalm e578f988d3 Merge pull request from iXce/req413
Update  for merging, fix languages.h
Guillaume Seguin 76841450c8 Only display poweron/poweroff if PS_ON_PIN > -1
Guillaume Seguin 44f327d738 Uniformly reindent language.h
Guillaume Seguin 326d2db025 Update language.h so that all languages compile
Some strings still need translation, but at least everything compiles.
Guillaume Seguin 2cb716f513 Run Marlin/language.h through dos2unix
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1
Conflicts:
	Marlin/language.h
Guillaume Seguin 18199ff960 Merge github.com:ErikZalm/Marlin into Marlin_v1
ErikZalm a105e10075 Merge pull request from buildrob101/MinimalDualXCarriage
Fixed compile error when QUICK_HOME is defined.
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.
ErikZalm c5bf8298d3 Merge pull request from buildrob101/MinimalDualXCarriage
Disable DUAL_X_CARRIAGE by default
Robert F-C c3568398b5 Disable DUAL_X_CARRIAGE by default
ErikZalm 96a773fa48 Merge pull request from buildrob101/MinimalDualXCarriage
Dual x-carriage support
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.
Jim Morris fb20ceabce enable soft endstops for delta
disable delta by default
Jim Morris d01ee7e7b5 fix zjerk being the same for delta as xy jerk
add more delta defaults
on delta make second home even slower
Robert F-C d7390e13d9 Support dual x-carriage printers
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
Jim Morris f3aa2a48e7 update max pos
Jim Morris 460751503e Added default configurations for deltas when DELTA is defined
ErikZalm 5ab872de1f Merge pull request from MStohn/fix-bad-lcd-commit-from-makr3d
fixed bad lcd commit from makr3d
Maik Stohn 9da94c247a fixed bad lcd commit from makr3d
#elsif does not exist #elif is correct
Erik van der Zalm 59004023fd Fixed typo
Erik van der Zalm 461dad6e05 Added : M32 - Select file and start SD print (Can be used when printing from SD card)
Untested
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.
ErikZalm 8a2a3ef91d Merge pull request from iXce/Marlin_v1_lcd
Only clamp panel movements if software endstops are enabled
Erik van der Zalm 6397b3339c restored configuration.h defaults
Erik van der Zalm cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
Erik van der Zalm e3bdefd873 fixed missing #endif
Erik van der Zalm a5be0c52c6 no message
ErikZalm e73611f5fa Merge pull request from GabinoLopez/patch-1
Update language.h
Michael Mayer e509cdbeb0 added contrast control function for gLCDs
Michael Mayer 99b7e926e7 added MaKr3d Melzi board
Gabino Lopez 68be33b1fc Update language.h
I update the spanish Messages, now this compile for spanish language.
daid acb3271c9a Merge pull request from xifle/Marlin_v1
Fixes compiler warning for feedrate deadzone
xifle 61fe430d4f Should fix compiler warning for feedrate deadzone
daid d77f5ee722 Merge pull request from codexmas/ServoEndstops
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
Gord Christmas fde17d5720 Fix for ugly code compilation errors in SERVO_ENDSTOP checks
Guillaume Seguin aa65c20d1f Only clamp panel movements if software endstops are enabled
Erik van der Zalm ecf3ab5de4 Added thermistor 60 to configuration.h
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
Erik van der Zalm 2015989f84 Added DISABLE_MIN_ENDSTOPS
ErikZalm 1c86adc760 Merge pull request from ch100/Marlin_v1
Fix Pin Description Typo
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>
ErikZalm 171719f18c Merge pull request from lajos/ultralcd_pid
ultralcd.cpp compile errors when !defined(PIDTEMP)
lajos b519af4f05 fixed another !defined(PIDTEMP) compile in ultralcd.cpp
lajos 7d03c52511 fixed compile error in ultralcd.cpp when PIDTEMP undefined
ErikZalm 312b4aa7c2 Merge pull request from lajos/azteeg_x1
added Azteeg X1 motherboard
lajos 02dee80fa5 added Azteeg X1 motherboard
ErikZalm 73569d891f Merge pull request from henrikbrixandersen/Makefile-fixes
Makefile fixes
Henrik Brix Andersen 47dc70e3ec Fix location of avrdude.conf