Erik van der Zalm
ac975ed8c2
Merge branch 'deltabot' into Marlin_v1
12 år sedan
ErikZalm
58d12aad73
Merge pull request #511 from wolfmanjm/ezdelta
fix homing for deltas
12 år sedan
Jim Morris
caa848f943
fix homing for deltas
12 år sedan
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 år sedan
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 år sedan
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 år sedan
Erik van der Zalm
73f21cd5d6
Spanish updated so far.
12 år sedan
Erik van der Zalm
6f4a6e531c
Merge branch 'deltabot' into Marlin_v1
12 år sedan
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 år sedan
Erik van der Zalm
ff6fa09ecf
Moved corexy implementation from stepper to planner
(Thanks iquizzle)
12 år sedan
Erik van der Zalm
c8dcc7c208
Allow increasing the software PWM frequency.
12 år sedan
Erik van der Zalm
8b0d82e9db
Removed "awaiting translation" for french
12 år sedan
Erik van der Zalm
1e05d192ab
Make the beep tone less offensive
12 år sedan
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 år sedan
ErikZalm
e36d31a3b7
Merge pull request #467 from kiyoshigawa/Marlin_v1
Support for Elefu RA Board
12 år sedan
kiyoshigawa
f295712008
Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h
12 år sedan
kiyoshigawa
5c70c785f5
Fixed small error in lcd define statements.
12 år sedan
kiyoshigawa
69b02031ca
Fixed small error in lcd define statements.
12 år sedan
kiyoshigawa
2ca6c5fbd7
Fixed small error in lcd define statements.
12 år sedan
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 år sedan
BorisLandoni
15b1b896e8
Update pins.h
12 år sedan
BorisLandoni
c1cb5977ee
Update Configuration.h
12 år sedan
BorisLandoni
8a5bd8a808
Update Configuration.h
12 år sedan
ErikZalm
3dea417c25
Merge pull request #506 from codexmas/ServoEndstops
Servo Enstops working!
12 år sedan
BorisLandoni
c1d7cf939e
Update language.h
12 år sedan
BorisLandoni
4c7d1436e9
Update pins.h
12 år sedan
BorisLandoni
6588933c04
Update Configuration.h
12 år sedan
Scott Lahteine
5dabc95409
Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
12 år sedan
Gord Christmas
a733537ddd
Missed some variable declarations
Integrated fixes from henrikbrixandersen pull request #504
12 år sedan
Gord Christmas
f4f30c9d64
Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.
12 år sedan
Erik van der Zalm
79374f0b93
Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1
12 år sedan
ErikZalm
1520de0093
Merge pull request #505 from MStohn/much-faster-glcd-st7920
faster GLCD (ST7920 SW-SPI) implementation / fixes
12 år sedan
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 år sedan
kiyoshigawa
4b19c8552e
Fixing changed Configuration.h settings to be default values per ErikZalm Request.
12 år sedan
Erik van der Zalm
971ec35135
Expanded M302 to allow setting the temp
12 år sedan
Erik van der Zalm
4de419e26e
Updated README.md
12 år sedan
Erik van der Zalm
a0729f0c3a
no message
12 år sedan
Erik van der Zalm
5090c56651
More redundant temp sensor changes. (After testing and debugging by reifsnderb)
12 år sedan
ErikZalm
a964b3cf3d
Merge pull request #495 from Gatulibu/Marlin_v1
Added support for Megatronics v2.0 and Minitronics v1.0
12 år sedan
ErikZalm
34fb4831a2
Merge pull request #496 from MStohn/fix-16x2-lcd
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
12 år sedan
Maik Stohn
e8572c5239
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
12 år sedan
Maik Stohn
7ee70c2248
Fix: removed wrong ; at end of define
12 år sedan
Gatulibu
b78fa6bb70
Added support for Megatronics v2.0 and Minitronics v1.0
merged from code downloaded from reprapworld.com
12 år sedan
Erik van der Zalm
9be61cdc02
Added redundant temp sensor
12 år sedan
Erik van der Zalm
7231a20dba
Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42.
12 år sedan
ErikZalm
7296de34cb
Merge pull request #491 from stoneburner/patch-1
Fixed typo in Comment
12 år sedan
Alexander Kasimir
e2ff536b03
Fixed typo in Comment
12 år sedan
ErikZalm
df776f36a4
Merge pull request #490 from buildrob101/Marlin_v1
Revert previous change pin check change
12 år sedan
Robert F-C
40eb07bad4
Revert and extend previous change pin check change
Reviert previous change of #if BLAH_PIN > 0 to #if defined(BLAH_PIN) &&
BLAH_PIN > -1. Unfortunately some times pin 0 is used. For my sins I've
gone through and replaced all unsafe checks of #if BLAH_PIN > -1 with
the safe version.
12 år sedan
ErikZalm
440cf2bc10
Merge pull request #488 from MStohn/fix-typo
fixed typo / added "const" to defines for newer gcc compatibility
12 år sedan