98d0d48191
fixed merge
13 years ago
bbe67fca5a
soft tab correction
13 years ago
9eeb711c96
Merged from Upstream Master
13 years ago
424101110c
Add Panelolu2 support for Melzi
13 years ago
b2eeebd9c3
Merge pull request #409 from buildrob202/Marlin_v1
...
Implement automatic cold-end/extruder motor fan control based on nozzle temperature
13 years ago
0d4a9444c4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
13 years ago
86cce025f4
Added #ifdef NUM_SERVOS to servo.cpp
13 years ago
1a18a487f9
Merge pull request #407 from buildrob101/Marlin_v1
...
Combine and converge other I2C LCD branches (PANELOLU2, VIKI & PCF8575)
13 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%.
13 years ago
28ada096e2
Adding servo documentation
13 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)
13 years ago
dfa549f268
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
13 years ago
64360164ad
Merge pull request #482 from codexmas/Marlin_v1
...
servosupport
13 years ago
86405cdd11
Merge pull request #479 from MStohn/thermocouple
...
BUGFIXES for temperature.cpp / add RUMBA thermocouple support
13 years ago
6c45c3f4e7
BariCUDA changes
13 years ago
96624f0f31
Forgot to include reference to Servo in makefile
13 years ago
dc59f07d24
First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple.
13 years ago
b668cb0516
Adding in clean copies of Servo library from Arduino 1.0.4
13 years ago
95dff34b73
fixed wrong compare for min temp check of heater 1 and heater 2
13 years ago
4cc6f9f6de
fixed wrong pin initialization when using temperature 2 pin input
13 years ago
61a48cc662
Add support for RUMBA thermocouple add on
13 years ago
9cc15876be
Add support for RUMBA thermocouple add on
13 years ago
c9cf2174dd
Merge pull request #474 from xifle/Marlin_v1
...
Fixed "Cooldown" Selection not reseting bed temp
13 years ago
bd2cd4903e
Added #ifdef BARICUDA around the BariCUDA changes
13 years ago
37f3199df3
fixed problems in planner with solenoids for BariCUDA when set to 0
13 years ago
fbd899a37d
Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.
13 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)
13 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.
13 years ago
90664d20a4
Merge pull request #472 from gregor2005/Marlin_v1
...
added support for the reprapworld keypad
13 years ago
2739c26c4f
changes:
...
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
13 years ago
6fb9573157
added support for the reprapworld keypad
13 years ago
594193c908
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
13 years ago
1fa61c297e
Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion.
13 years ago
b27a59f41e
Added support for Elefu RA Board and Elefu Control Panel
13 years ago
2c0fa34c9e
Merge pull request #466 from midopple/Marlin_v1
...
BUG Fix in Commands M907,M350 and M351
13 years ago
a65a26d6b4
If CORE_XY is in use X and Y Axis had to be activated at the same time
13 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
13 years ago
a5cd582665
Support for 10 level deep SD folder hierarchy
13 years ago
e3bc420daa
Merge pull request #464 from arnoudja/Marlin_v1
...
Solved minor bug in controllerFan()
13 years ago
fc4ab05157
Solved minor bug in controllerFan()
...
Extruder 2 was checked where extruder 1 should be checked.
13 years ago
0ef54f2f85
Make M303 silent when "S0" is sent
...
If S is left out perhaps it should be silent, but check the spec for
this M code.
13 years ago
a200521eab
Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
...
Also cosmetic comment changes and spelling corrections in printed
messages
13 years ago
727aa2a051
Merge pull request #459 from martinxyz/fix-rounding-error
...
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
13 years ago
1a397825f9
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
13 years ago
289c02eda4
Remove unnecessary pin initialization in stepper.cpp
...
(duplicates initialization in Marlin_main.cpp)
13 years ago
d5ad7a0814
Rework change to incorporate CONTROLLERFAN
...
Also refactor extruder auto fan logic to simplify further and now only
check every 2.5 seconds
13 years ago
c3cdaceab3
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
13 years ago
1c127217df
Make DOGLCD merge neater.
13 years ago
7f57f28ccc
Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer.
...
Argument order of lcd_buzz was set to mirror that on tone(). Change
default M300 frequency to something audible.
13 years ago
788d62bcc4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
13 years ago
xifle