daid
acb3271c9a
Merge pull request #534 from xifle/Marlin_v1
Fixes compiler warning for feedrate deadzone
12 years ago
xifle
61fe430d4f
Should fix compiler warning for feedrate deadzone
12 years ago
daid
d77f5ee722
Merge pull request #532 from codexmas/ServoEndstops
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
12 years ago
Gord Christmas
fde17d5720
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
12 years ago
Erik van der Zalm
ecf3ab5de4
Added thermistor 60 to configuration.h
12 years ago
Erik van der Zalm
2015989f84
Added DISABLE_MIN_ENDSTOPS
12 years ago
ErikZalm
1c86adc760
Merge pull request #526 from ch100/Marlin_v1
Fix Pin Description Typo
12 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>
12 years ago
ErikZalm
171719f18c
Merge pull request #525 from lajos/ultralcd_pid
ultralcd.cpp compile errors when !defined(PIDTEMP)
12 years ago
lajos
b519af4f05
fixed another !defined(PIDTEMP) compile in ultralcd.cpp
12 years ago
lajos
7d03c52511
fixed compile error in ultralcd.cpp when PIDTEMP undefined
12 years ago
ErikZalm
312b4aa7c2
Merge pull request #521 from lajos/azteeg_x1
added Azteeg X1 motherboard
12 years ago
lajos
02dee80fa5
added Azteeg X1 motherboard
12 years ago
ErikZalm
73569d891f
Merge pull request #520 from henrikbrixandersen/Makefile-fixes
Makefile fixes
12 years ago
Henrik Brix Andersen
47dc70e3ec
Fix location of avrdude.conf
12 years ago
Henrik Brix Andersen
1d258903bb
Allow command line compilation when using BEEPER.
12 years ago
Erik van der Zalm
e34c9981ab
Delta disabled by default
12 years ago
Erik van der Zalm
26a441fc7d
More 3Drag controller patches.
12 years ago
Erik van der Zalm
ac975ed8c2
Merge branch 'deltabot' into Marlin_v1
12 years ago
ErikZalm
58d12aad73
Merge pull request #511 from wolfmanjm/ezdelta
fix homing for deltas
12 years ago
Jim Morris
caa848f943
fix homing for deltas
12 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
12 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
12 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
12 years ago
Erik van der Zalm
73f21cd5d6
Spanish updated so far.
12 years ago
Erik van der Zalm
6f4a6e531c
Merge branch 'deltabot' into Marlin_v1
12 years ago
Erik van der Zalm
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
Erik van der Zalm
ff6fa09ecf
Moved corexy implementation from stepper to planner
(Thanks iquizzle)
12 years ago
Erik van der Zalm
c8dcc7c208
Allow increasing the software PWM frequency.
12 years ago
Erik van der Zalm
8b0d82e9db
Removed "awaiting translation" for french
12 years ago
Erik van der Zalm
1e05d192ab
Make the beep tone less offensive
12 years ago
Erik van der Zalm
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
ErikZalm
e36d31a3b7
Merge pull request #467 from kiyoshigawa/Marlin_v1
Support for Elefu RA Board
12 years ago
kiyoshigawa
f295712008
Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h
12 years ago
kiyoshigawa
5c70c785f5
Fixed small error in lcd define statements.
12 years ago
kiyoshigawa
69b02031ca
Fixed small error in lcd define statements.
12 years ago
kiyoshigawa
2ca6c5fbd7
Fixed small error in lcd define statements.
12 years ago
kiyoshigawa
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
BorisLandoni
15b1b896e8
Update pins.h
12 years ago
BorisLandoni
c1cb5977ee
Update Configuration.h
12 years ago
BorisLandoni
8a5bd8a808
Update Configuration.h
12 years ago
ErikZalm
3dea417c25
Merge pull request #506 from codexmas/ServoEndstops
Servo Enstops working!
12 years ago
BorisLandoni
c1d7cf939e
Update language.h
12 years ago
BorisLandoni
4c7d1436e9
Update pins.h
12 years ago
BorisLandoni
6588933c04
Update Configuration.h
12 years ago
Scott Lahteine
5dabc95409
Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
12 years ago
Gord Christmas
a733537ddd
Missed some variable declarations
Integrated fixes from henrikbrixandersen pull request #504
12 years ago
Gord Christmas
f4f30c9d64
Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.
12 years ago
Erik van der Zalm
79374f0b93
Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
ErikZalm
1520de0093
Merge pull request #505 from MStohn/much-faster-glcd-st7920
faster GLCD (ST7920 SW-SPI) implementation / fixes
12 years ago