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