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
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
f3aa2a48e7
update max pos
2013-07-17 01:29:51 -07:00
460751503e
Added default configurations for deltas when DELTA is defined
2013-07-17 01:17:27 -07:00
9da94c247a
fixed bad lcd commit from makr3d
...
#elsif does not exist #elif is correct
2013-07-15 17:34:21 +02:00
59004023fd
Fixed typo
2013-07-15 17:22:56 +02:00
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
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
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
6397b3339c
restored configuration.h defaults
2013-07-14 15:49:03 +02:00
cdaaad3df1
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
2013-07-14 15:45:49 +02:00
e3bdefd873
fixed missing #endif
2013-07-14 15:42:53 +02:00
a5be0c52c6
no message
2013-07-14 15:35:54 +02:00
e509cdbeb0
added contrast control function for gLCDs
2013-07-14 15:28:26 +07:00
99b7e926e7
added MaKr3d Melzi board
2013-07-14 15:17:55 +07:00
68be33b1fc
Update language.h
...
I update the spanish Messages, now this compile for spanish language.
2013-07-04 10:23:00 +02:00
acb3271c9a
Merge pull request #534 from xifle/Marlin_v1
...
Fixes compiler warning for feedrate deadzone
2013-07-01 23:41:51 -07:00
61fe430d4f
Should fix compiler warning for feedrate deadzone
2013-07-01 11:10:02 +02:00
fde17d5720
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
2013-06-28 08:02:04 -07:00
aa65c20d1f
Only clamp panel movements if software endstops are enabled
2013-06-28 14:18:00 +02:00
ecf3ab5de4
Added thermistor 60 to configuration.h
2013-06-27 23:25:51 +02:00
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
2013-06-20 23:59:56 +02:00
2015989f84
Added DISABLE_MIN_ENDSTOPS
2013-06-18 19:20:26 +02:00
648d45cfb2
Fix Pin Description Typo
...
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com >
2013-06-16 23:35:33 +02:00
171719f18c
Merge pull request #525 from lajos/ultralcd_pid
...
ultralcd.cpp compile errors when !defined(PIDTEMP)
2013-06-16 00:02:54 -07:00
b519af4f05
fixed another !defined(PIDTEMP) compile in ultralcd.cpp
2013-06-15 20:49:18 -04:00
7d03c52511
fixed compile error in ultralcd.cpp when PIDTEMP undefined
2013-06-15 18:09:52 -04:00
02dee80fa5
added Azteeg X1 motherboard
2013-06-15 16:58:17 -04:00
47dc70e3ec
Fix location of avrdude.conf
2013-06-15 09:50:25 +02:00
1d258903bb
Allow command line compilation when using BEEPER.
2013-06-15 09:36:55 +02:00
e34c9981ab
Delta disabled by default
2013-06-11 22:33:58 +02:00
26a441fc7d
More 3Drag controller patches.
2013-06-10 18:26:15 +02:00
ac975ed8c2
Merge branch 'deltabot' into Marlin_v1
2013-06-10 18:20:29 +02:00
caa848f943
fix homing for deltas
2013-06-09 21:10:00 -07:00
7ad12be763
Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
README.md
2013-06-09 23:10:41 +02:00
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
2013-06-09 22:57:40 +02:00
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
2013-06-09 22:26:47 +02:00
73f21cd5d6
Spanish updated so far.
2013-06-09 21:40:35 +02:00
6f4a6e531c
Merge branch 'deltabot' into Marlin_v1
2013-06-09 13:55:18 +02:00
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.
2013-06-09 13:54:19 +02:00
ff6fa09ecf
Moved corexy implementation from stepper to planner
...
(Thanks iquizzle)
2013-06-09 13:10:06 +02:00
c8dcc7c208
Allow increasing the software PWM frequency.
2013-06-09 12:52:49 +02:00
8b0d82e9db
Removed "awaiting translation" for french
2013-06-09 12:24:06 +02:00
1e05d192ab
Make the beep tone less offensive
2013-06-09 12:21:16 +02:00
373f3ecab3
Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/pins.h
2013-06-09 00:51:58 +02:00
f295712008
Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h
2013-06-08 09:27:56 -06:00
69b02031ca
Fixed small error in lcd define statements.
2013-06-08 09:09:11 -06:00
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
2013-06-08 08:48:18 -06:00
c1cb5977ee
Update Configuration.h
2013-06-08 14:37:39 +02:00
8a5bd8a808
Update Configuration.h
2013-06-08 14:37:17 +02:00
