Erik van der Zalm
1e05d192ab
Make the beep tone less offensive
12 anos atrás
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 anos atrás
ErikZalm
e36d31a3b7
Merge pull request #467 from kiyoshigawa/Marlin_v1
Support for Elefu RA Board
12 anos atrás
kiyoshigawa
f295712008
Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h
12 anos atrás
kiyoshigawa
5c70c785f5
Fixed small error in lcd define statements.
12 anos atrás
kiyoshigawa
69b02031ca
Fixed small error in lcd define statements.
12 anos atrás
kiyoshigawa
2ca6c5fbd7
Fixed small error in lcd define statements.
12 anos atrás
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 anos atrás
BorisLandoni
15b1b896e8
Update pins.h
12 anos atrás
BorisLandoni
c1cb5977ee
Update Configuration.h
12 anos atrás
BorisLandoni
8a5bd8a808
Update Configuration.h
12 anos atrás
ErikZalm
3dea417c25
Merge pull request #506 from codexmas/ServoEndstops
Servo Enstops working!
12 anos atrás
BorisLandoni
c1d7cf939e
Update language.h
12 anos atrás
BorisLandoni
4c7d1436e9
Update pins.h
12 anos atrás
BorisLandoni
6588933c04
Update Configuration.h
12 anos atrás
Scott Lahteine
5dabc95409
Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
12 anos atrás
Gord Christmas
a733537ddd
Missed some variable declarations
Integrated fixes from henrikbrixandersen pull request #504
12 anos atrás
Gord Christmas
f4f30c9d64
Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.
12 anos atrás
Erik van der Zalm
79374f0b93
Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1
12 anos atrás
ErikZalm
1520de0093
Merge pull request #505 from MStohn/much-faster-glcd-st7920
faster GLCD (ST7920 SW-SPI) implementation / fixes
12 anos atrás
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 anos atrás
kiyoshigawa
4b19c8552e
Fixing changed Configuration.h settings to be default values per ErikZalm Request.
12 anos atrás
Erik van der Zalm
971ec35135
Expanded M302 to allow setting the temp
12 anos atrás
Erik van der Zalm
4de419e26e
Updated README.md
12 anos atrás
Erik van der Zalm
a0729f0c3a
no message
12 anos atrás
Erik van der Zalm
5090c56651
More redundant temp sensor changes. (After testing and debugging by reifsnderb)
12 anos atrás
Guillaume Seguin
16b9239a26
Report temperatures for all extruders
12 anos atrás
ErikZalm
a964b3cf3d
Merge pull request #495 from Gatulibu/Marlin_v1
Added support for Megatronics v2.0 and Minitronics v1.0
12 anos atrás
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 anos atrás
Maik Stohn
e8572c5239
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
12 anos atrás
Maik Stohn
7ee70c2248
Fix: removed wrong ; at end of define
12 anos atrás
Gatulibu
b78fa6bb70
Added support for Megatronics v2.0 and Minitronics v1.0
merged from code downloaded from reprapworld.com
12 anos atrás
Erik van der Zalm
9be61cdc02
Added redundant temp sensor
12 anos atrás
Erik van der Zalm
7231a20dba
Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42.
12 anos atrás
ErikZalm
7296de34cb
Merge pull request #491 from stoneburner/patch-1
Fixed typo in Comment
12 anos atrás
Alexander Kasimir
e2ff536b03
Fixed typo in Comment
12 anos atrás
ErikZalm
df776f36a4
Merge pull request #490 from buildrob101/Marlin_v1
Revert previous change pin check change
12 anos atrás
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 anos atrás
ErikZalm
440cf2bc10
Merge pull request #488 from MStohn/fix-typo
fixed typo / added "const" to defines for newer gcc compatibility
12 anos atrás
Maik Stohn
bd33cf4a9f
fixed typo / added "const" to defines for newer gcc compatibility
12 anos atrás
ErikZalm
567291e734
Merge pull request #485 from Banjer/Panelolu2_Melzi
Add Panelolu2 support for Melzi
12 anos atrás
ErikZalm
68f9f2521e
Merge pull request #487 from MStohn/fix-bad-lcd-commit-from-buildrob
fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementati...
12 anos atrás
Maik Stohn
8d80cbbf4c
fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored
12 anos atrás
ErikZalm
273502a172
Merge pull request #486 from xifle/Marlin_v1
LCD: Added Deadzone at 100% Feedrate
12 anos atrás
xifle
98d0d48191
fixed merge
12 anos atrás
xifle
bbe67fca5a
soft tab correction
12 anos atrás
xifle
9eeb711c96
Merged from Upstream Master
12 anos atrás
Bas Spaans
424101110c
Add Panelolu2 support for Melzi
12 anos atrás
ErikZalm
b2eeebd9c3
Merge pull request #409 from buildrob202/Marlin_v1
Implement automatic cold-end/extruder motor fan control based on nozzle temperature
12 anos atrás
Robert F-C
0d4a9444c4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 anos atrás