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