c1cb5977ee
Update Configuration.h
12 years ago
8a5bd8a808
Update Configuration.h
12 years ago
3dea417c25
Merge pull request #506 from codexmas/ServoEndstops
...
Servo Enstops working!
12 years ago
c1d7cf939e
Update language.h
12 years ago
4c7d1436e9
Update pins.h
12 years ago
6588933c04
Update Configuration.h
12 years ago
5dabc95409
Apply all changes from latest Marlin_V1
...
Diffed and merged, preserving my updates
12 years ago
a733537ddd
Missed some variable declarations
...
Integrated fixes from henrikbrixandersen pull request #504
12 years ago
f4f30c9d64
Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.
12 years ago
79374f0b93
Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
1520de0093
Merge pull request #505 from MStohn/much-faster-glcd-st7920
...
faster GLCD (ST7920 SW-SPI) implementation / fixes
12 years ago
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 years ago
4b19c8552e
Fixing changed Configuration.h settings to be default values per ErikZalm Request.
12 years ago
971ec35135
Expanded M302 to allow setting the temp
12 years ago
4de419e26e
Updated README.md
12 years ago
a0729f0c3a
no message
12 years ago
5090c56651
More redundant temp sensor changes. (After testing and debugging by reifsnderb)
12 years ago
16b9239a26
Report temperatures for all extruders
12 years ago
a964b3cf3d
Merge pull request #495 from Gatulibu/Marlin_v1
...
Added support for Megatronics v2.0 and Minitronics v1.0
12 years ago
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 years ago
e8572c5239
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
12 years ago
7ee70c2248
Fix: removed wrong ; at end of define
12 years ago
b78fa6bb70
Added support for Megatronics v2.0 and Minitronics v1.0
...
merged from code downloaded from reprapworld.com
12 years ago
9be61cdc02
Added redundant temp sensor
12 years ago
7231a20dba
Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42.
12 years ago
7296de34cb
Merge pull request #491 from stoneburner/patch-1
...
Fixed typo in Comment
12 years ago
e2ff536b03
Fixed typo in Comment
12 years ago
df776f36a4
Merge pull request #490 from buildrob101/Marlin_v1
...
Revert previous change pin check change
12 years ago
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 years ago
440cf2bc10
Merge pull request #488 from MStohn/fix-typo
...
fixed typo / added "const" to defines for newer gcc compatibility
12 years ago
bd33cf4a9f
fixed typo / added "const" to defines for newer gcc compatibility
12 years ago
567291e734
Merge pull request #485 from Banjer/Panelolu2_Melzi
...
Add Panelolu2 support for Melzi
12 years ago
68f9f2521e
Merge pull request #487 from MStohn/fix-bad-lcd-commit-from-buildrob
...
fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementati...
12 years ago
8d80cbbf4c
fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored
12 years ago
273502a172
Merge pull request #486 from xifle/Marlin_v1
...
LCD: Added Deadzone at 100% Feedrate
12 years ago
98d0d48191
fixed merge
12 years ago
bbe67fca5a
soft tab correction
12 years ago
9eeb711c96
Merged from Upstream Master
12 years ago
424101110c
Add Panelolu2 support for Melzi
12 years ago
b2eeebd9c3
Merge pull request #409 from buildrob202/Marlin_v1
...
Implement automatic cold-end/extruder motor fan control based on nozzle temperature
12 years ago
0d4a9444c4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
86cce025f4
Added #ifdef NUM_SERVOS to servo.cpp
12 years ago
1a18a487f9
Merge pull request #407 from buildrob101/Marlin_v1
...
Combine and converge other I2C LCD branches (PANELOLU2, VIKI & PCF8575)
12 years ago
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%.
12 years ago
28ada096e2
Adding servo documentation
12 years ago
4121311b9d
Change to LCD status indicators
...
The I2C LCD status indicators now indicate when the hotends or bed are
turned on at all (rather than just when they are in their heating phase)
12 years ago
dfa549f268
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
64360164ad
Merge pull request #482 from codexmas/Marlin_v1
...
servosupport
12 years ago
86405cdd11
Merge pull request #479 from MStohn/thermocouple
...
BUGFIXES for temperature.cpp / add RUMBA thermocouple support
12 years ago
6c45c3f4e7
BariCUDA changes
12 years ago
BorisLandoni