cdaaad3df1
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
11 years ago
e3bdefd873
fixed missing #endif
11 years ago
a5be0c52c6
no message
11 years ago
e73611f5fa
Merge pull request #535 from GabinoLopez/patch-1
...
Update language.h
11 years ago
e509cdbeb0
added contrast control function for gLCDs
11 years ago
99b7e926e7
added MaKr3d Melzi board
11 years ago
68be33b1fc
Update language.h
...
I update the spanish Messages, now this compile for spanish language.
12 years ago
acb3271c9a
Merge pull request #534 from xifle/Marlin_v1
...
Fixes compiler warning for feedrate deadzone
12 years ago
61fe430d4f
Should fix compiler warning for feedrate deadzone
12 years ago
d77f5ee722
Merge pull request #532 from codexmas/ServoEndstops
...
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
12 years ago
fde17d5720
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
12 years ago
ecf3ab5de4
Added thermistor 60 to configuration.h
12 years ago
2015989f84
Added DISABLE_MIN_ENDSTOPS
12 years ago
1c86adc760
Merge pull request #526 from ch100/Marlin_v1
...
Fix Pin Description Typo
12 years ago
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
171719f18c
Merge pull request #525 from lajos/ultralcd_pid
...
ultralcd.cpp compile errors when !defined(PIDTEMP)
12 years ago
b519af4f05
fixed another !defined(PIDTEMP) compile in ultralcd.cpp
12 years ago
7d03c52511
fixed compile error in ultralcd.cpp when PIDTEMP undefined
12 years ago
312b4aa7c2
Merge pull request #521 from lajos/azteeg_x1
...
added Azteeg X1 motherboard
12 years ago
02dee80fa5
added Azteeg X1 motherboard
12 years ago
73569d891f
Merge pull request #520 from henrikbrixandersen/Makefile-fixes
...
Makefile fixes
12 years ago
47dc70e3ec
Fix location of avrdude.conf
12 years ago
1d258903bb
Allow command line compilation when using BEEPER.
12 years ago
e34c9981ab
Delta disabled by default
12 years ago
26a441fc7d
More 3Drag controller patches.
12 years ago
ac975ed8c2
Merge branch 'deltabot' into Marlin_v1
12 years ago
58d12aad73
Merge pull request #511 from wolfmanjm/ezdelta
...
fix homing for deltas
12 years ago
caa848f943
fix homing for deltas
12 years ago
7ad12be763
Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
README.md
12 years ago
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
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
73f21cd5d6
Spanish updated so far.
12 years ago
6f4a6e531c
Merge branch 'deltabot' into Marlin_v1
12 years ago
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
ff6fa09ecf
Moved corexy implementation from stepper to planner
...
(Thanks iquizzle)
12 years ago
c8dcc7c208
Allow increasing the software PWM frequency.
12 years ago
8b0d82e9db
Removed "awaiting translation" for french
12 years ago
1e05d192ab
Make the beep tone less offensive
12 years ago
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
e36d31a3b7
Merge pull request #467 from kiyoshigawa/Marlin_v1
...
Support for Elefu RA Board
12 years ago
f295712008
Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h
12 years ago
5c70c785f5
Fixed small error in lcd define statements.
12 years ago
69b02031ca
Fixed small error in lcd define statements.
12 years ago
2ca6c5fbd7
Fixed small error in lcd define statements.
12 years ago
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
15b1b896e8
Update pins.h
12 years ago
c1cb5977ee
Update Configuration.h
12 years ago
8a5bd8a808
Update Configuration.h
12 years ago
3dea417c25
Merge pull request #506 from codexmas/ServoEndstops
...
Servo Enstops working!
12 years ago
c1d7cf939e
Update language.h
12 years ago
Erik van der Zalm