Commit Graph

8394 Commits (4183a249b6b3102add751f661a852543852569a1)
 

Author SHA1 Message Date
ErikZalm 34fb4831a2 Merge pull request from MStohn/fix-16x2-lcd
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
Maik Stohn e8572c5239 Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
Maik Stohn 7ee70c2248 Fix: removed wrong ; at end of define
Gatulibu b78fa6bb70 Added support for Megatronics v2.0 and Minitronics v1.0
merged from code downloaded from reprapworld.com
Erik van der Zalm 9be61cdc02 Added redundant temp sensor
Erik van der Zalm 7231a20dba Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42.
ErikZalm 7296de34cb Merge pull request from stoneburner/patch-1
Fixed typo in Comment
Alexander Kasimir e2ff536b03 Fixed typo in Comment
ErikZalm df776f36a4 Merge pull request from buildrob101/Marlin_v1
Revert previous change pin check change
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.
ErikZalm 440cf2bc10 Merge pull request from MStohn/fix-typo
fixed typo / added "const" to defines for newer gcc compatibility
Maik Stohn bd33cf4a9f fixed typo / added "const" to defines for newer gcc compatibility
ErikZalm 567291e734 Merge pull request from Banjer/Panelolu2_Melzi
Add Panelolu2 support for Melzi
ErikZalm 68f9f2521e Merge pull request from MStohn/fix-bad-lcd-commit-from-buildrob
fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementati...
Maik Stohn 8d80cbbf4c fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored
ErikZalm 273502a172 Merge pull request from xifle/Marlin_v1
LCD: Added Deadzone at 100% Feedrate
xifle 98d0d48191 fixed merge
xifle bbe67fca5a soft tab correction
xifle 9eeb711c96 Merged from Upstream Master
Bas Spaans 424101110c Add Panelolu2 support for Melzi
ErikZalm b2eeebd9c3 Merge pull request from buildrob202/Marlin_v1
Implement automatic cold-end/extruder motor fan control based on nozzle temperature
Robert F-C 0d4a9444c4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Erik van der Zalm 86cce025f4 Added #ifdef NUM_SERVOS to servo.cpp
ErikZalm 1a18a487f9 Merge pull request from buildrob101/Marlin_v1
Combine and converge other I2C LCD branches (PANELOLU2, VIKI & PCF8575)
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%.
Gord Christmas 28ada096e2 Adding servo documentation
Robert F-C 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)
Robert F-C dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
ErikZalm 64360164ad Merge pull request from codexmas/Marlin_v1
servosupport
ErikZalm 86405cdd11 Merge pull request from MStohn/thermocouple
BUGFIXES for temperature.cpp / add RUMBA thermocouple support
Erik van der Zalm 6c45c3f4e7 BariCUDA changes
Gord Christmas 96624f0f31 Forgot to include reference to Servo in makefile
Gord Christmas dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple.
Gord Christmas b668cb0516 Adding in clean copies of Servo library from Arduino 1.0.4
MaikStohn 95dff34b73 fixed wrong compare for min temp check of heater 1 and heater 2
MaikStohn 4cc6f9f6de fixed wrong pin initialization when using temperature 2 pin input
MaikStohn 61a48cc662 Add support for RUMBA thermocouple add on
MaikStohn 9cc15876be Add support for RUMBA thermocouple add on
ErikZalm c9cf2174dd Merge pull request from xifle/Marlin_v1
Fixed "Cooldown" Selection not reseting bed temp
Erik van der Zalm bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes
Jordan Miller 37f3199df3 fixed problems in planner with solenoids for BariCUDA when set to 0
Jordan Miller fbd899a37d Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.
xifle 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)
Robert F-C 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.
ErikZalm 90664d20a4 Merge pull request from gregor2005/Marlin_v1
added support for the reprapworld keypad
gregor 2739c26c4f changes:
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
gregor 6fb9573157 added support for the reprapworld keypad
Tim Anderson 594193c908 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Tim Anderson 1fa61c297e Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion.
kiyoshigawa b27a59f41e Added support for Elefu RA Board and Elefu Control Panel