5090c56651
More redundant temp sensor changes. (After testing and debugging by reifsnderb)
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
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
96624f0f31
Forgot to include reference to Servo in makefile
12 years ago
dc59f07d24
First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple.
12 years ago
b668cb0516
Adding in clean copies of Servo library from Arduino 1.0.4
12 years ago
95dff34b73
fixed wrong compare for min temp check of heater 1 and heater 2
12 years ago
4cc6f9f6de
fixed wrong pin initialization when using temperature 2 pin input
12 years ago
61a48cc662
Add support for RUMBA thermocouple add on
12 years ago
9cc15876be
Add support for RUMBA thermocouple add on
12 years ago
c9cf2174dd
Merge pull request #474 from xifle/Marlin_v1
Fixed "Cooldown" Selection not reseting bed temp
12 years ago
bd2cd4903e
Added #ifdef BARICUDA around the BariCUDA changes
12 years ago
37f3199df3
fixed problems in planner with solenoids for BariCUDA when set to 0
12 years ago
fbd899a37d
Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.
12 years ago
29bb8d7d4f
Fixed "Cooldown" Selection not reseting bed temp
- enquecommand with multiple lines "\n" doesn't work -> M140 S0 didn't
get processed. So I wrote a new func for the cooldown which uses
setTargetHotend. In addition this does return to status page after
selection.
- Added setWatch() to preheat-functions (Temperatur sanity check
would never have worked when preheating from the lcd panel)
12 years ago
015d0594b0
Optimize menu selection for Viki rotary encoder.
The Viki LCD rotary encoder uses a different number of steps per
rotation. This fixes the seeming "missed" steps when selecting a menu.
12 years ago
90664d20a4
Merge pull request #472 from gregor2005/Marlin_v1
added support for the reprapworld keypad
12 years ago
2739c26c4f
changes:
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
12 years ago
6fb9573157
added support for the reprapworld keypad
12 years ago
2c0fa34c9e
Merge pull request #466 from midopple/Marlin_v1
BUG Fix in Commands M907,M350 and M351
12 years ago
a65a26d6b4
If CORE_XY is in use X and Y Axis had to be activated at the same time
12 years ago
db2f157a22
Replace the <= to < in the Command M907, M350 and M351.
The for loop for Axis count over the Array.
Add a break after M907
12 years ago
e3bc420daa
Merge pull request #464 from arnoudja/Marlin_v1
Solved minor bug in controllerFan()
12 years ago
fc4ab05157
Solved minor bug in controllerFan()
Extruder 2 was checked where extruder 1 should be checked.
12 years ago
727aa2a051
Merge pull request #459 from martinxyz/fix-rounding-error
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
12 years ago
1a397825f9
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
12 years ago
Erik van der Zalm
Alexander Kasimir
Robert F-C
Maik Stohn
xifle
Bas Spaans
Gord Christmas
MaikStohn
Jordan Miller
gregor
midopple
daid
Arnoud
Martin Renold