zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
920 commits 1 branch 0 tags 156 MiB
Commit graph

920 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik van der Zalm 5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb) 2013-05-29 19:29:30 +02:00
Erik van der Zalm 9be61cdc02 Added redundant temp sensor 2013-05-26 17:57:49 +02:00
Erik van der Zalm 7231a20dba Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42. 2013-05-24 21:05:11 +02:00
ErikZalm 7296de34cb Merge pull request #491 from stoneburner/patch-1 
Fixed typo in Comment
 2013-05-22 06:10:25 -07:00
Alexander Kasimir e2ff536b03 Fixed typo in Comment 2013-05-22 16:02:03 +03:00
ErikZalm df776f36a4 Merge pull request #490 from buildrob101/Marlin_v1 
Revert previous change pin check change
 2013-05-22 05:37:25 -07:00
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.
 2013-05-22 21:33:23 +10:00
ErikZalm 440cf2bc10 Merge pull request #488 from MStohn/fix-typo 
fixed typo / added "const" to defines for newer gcc compatibility
 2013-05-21 09:36:14 -07:00
Maik Stohn bd33cf4a9f fixed typo / added "const" to defines for newer gcc compatibility 2013-05-21 17:58:34 +02:00
ErikZalm 567291e734 Merge pull request #485 from Banjer/Panelolu2_Melzi 
Add Panelolu2 support for Melzi
 2013-05-21 08:46:27 -07:00
ErikZalm 68f9f2521e Merge pull request #487 from MStohn/fix-bad-lcd-commit-from-buildrob 
fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementati...
 2013-05-21 08:17:21 -07:00
Maik Stohn 8d80cbbf4c fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored 2013-05-21 16:53:38 +02:00
ErikZalm 273502a172 Merge pull request #486 from xifle/Marlin_v1 
LCD: Added Deadzone at 100% Feedrate
 2013-05-20 08:09:51 -07:00
xifle 98d0d48191 fixed merge 2013-05-20 14:52:35 +02:00
xifle bbe67fca5a soft tab correction 2013-05-20 14:50:39 +02:00
xifle 9eeb711c96 Merged from Upstream Master 2013-05-20 14:45:37 +02:00
Bas Spaans 424101110c Add Panelolu2 support for Melzi 2013-05-19 12:09:34 +02:00
ErikZalm b2eeebd9c3 Merge pull request #409 from buildrob202/Marlin_v1 
Implement automatic cold-end/extruder motor fan control based on nozzle temperature
 2013-05-19 02:10:33 -07:00
Robert F-C 0d4a9444c4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-19 08:50:58 +10:00
Erik van der Zalm 86cce025f4 Added #ifdef NUM_SERVOS to servo.cpp 2013-05-18 23:12:28 +02:00
ErikZalm 1a18a487f9 Merge pull request #407 from buildrob101/Marlin_v1 
Combine and converge other I2C LCD branches (PANELOLU2, VIKI & PCF8575)
 2013-05-18 11:28:32 -07:00
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%.
 2013-05-18 19:53:46 +02:00
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)
 2013-05-18 22:30:42 +10:00
Robert F-C dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-18 21:59:39 +10:00
ErikZalm 64360164ad Merge pull request #482 from codexmas/Marlin_v1 
servosupport
 2013-05-16 10:19:00 -07:00
ErikZalm 86405cdd11 Merge pull request #479 from MStohn/thermocouple 
BUGFIXES for temperature.cpp / add RUMBA thermocouple support
 2013-05-16 10:06:59 -07:00
Erik van der Zalm 6c45c3f4e7 BariCUDA changes 2013-05-16 19:01:12 +02:00
Gord Christmas 96624f0f31 Forgot to include reference to Servo in makefile 2013-05-16 08:25:20 -07:00
Gord Christmas dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. 2013-05-16 07:03:01 -07:00
Gord Christmas b668cb0516 Adding in clean copies of Servo library from Arduino 1.0.4 2013-05-16 06:47:42 -07:00
MaikStohn 95dff34b73 fixed wrong compare for min temp check of heater 1 and heater 2 2013-05-16 01:17:38 +02:00
MaikStohn 4cc6f9f6de fixed wrong pin initialization when using temperature 2 pin input 2013-05-16 01:17:08 +02:00
MaikStohn 61a48cc662 Add support for RUMBA thermocouple add on 2013-05-16 01:16:33 +02:00
MaikStohn 9cc15876be Add support for RUMBA thermocouple add on 2013-05-16 01:16:08 +02:00
ErikZalm c9cf2174dd Merge pull request #474 from xifle/Marlin_v1 
Fixed "Cooldown" Selection not reseting bed temp
 2013-05-14 14:58:53 -07:00
Erik van der Zalm bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes 2013-05-14 23:56:32 +02:00
Jordan Miller 37f3199df3 fixed problems in planner with solenoids for BariCUDA when set to 0 2013-05-14 23:35:01 +02:00
Jordan Miller fbd899a37d Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129. 2013-05-14 23:34:45 +02:00
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)
 2013-05-14 16:56:19 +02:00
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.
 2013-05-12 07:51:28 +10:00
ErikZalm 90664d20a4 Merge pull request #472 from gregor2005/Marlin_v1 
added support for the reprapworld keypad
 2013-05-10 13:26:17 -07:00
gregor 2739c26c4f changes: 
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
 2013-05-10 22:20:02 +02:00
gregor 6fb9573157 added support for the reprapworld keypad 2013-05-10 21:57:17 +02:00
ErikZalm 2c0fa34c9e Merge pull request #466 from midopple/Marlin_v1 
BUG Fix in Commands M907,M350 and M351
 2013-05-05 14:24:48 -07:00
midopple a65a26d6b4 If CORE_XY is in use X and Y Axis had to be activated at the same time 2013-05-05 19:23:59 +02:00
midopple 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
 2013-05-05 19:19:55 +02:00
daid e3bc420daa Merge pull request #464 from arnoudja/Marlin_v1 
Solved minor bug in controllerFan()
 2013-05-03 12:38:23 -07:00
Arnoud fc4ab05157 Solved minor bug in controllerFan() 
Extruder 2 was checked where extruder 1 should be checked.
 2013-05-03 21:32:34 +02:00
daid 727aa2a051 Merge pull request #459 from martinxyz/fix-rounding-error 
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
 2013-05-02 08:34:03 -07:00
Martin Renold 1a397825f9 fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error 2013-05-01 08:30:24 +02:00