CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
934 Commits 1 Branch 0 Tags 107 MiB
3dea417c25
Commit Graph

934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ErikZalm
3dea417c25 Merge pull request #506 from codexmas/ServoEndstops 
Servo Enstops working!
 2013-06-08 04:41:27 -07:00
Gord Christmas
a733537ddd Missed some variable declarations 
Integrated fixes from henrikbrixandersen pull request #504
 2013-06-06 09:18:03 -07:00
Gord Christmas
f4f30c9d64 Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles. 2013-06-06 07:36:52 -07:00
Erik van der Zalm
79374f0b93 Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1 2013-06-05 17:44:48 +02:00
ErikZalm
1520de0093 Merge pull request #505 from MStohn/much-faster-glcd-st7920 
faster GLCD (ST7920 SW-SPI) implementation / fixes
 2013-06-05 08:40:59 -07:00
Maik Stohn
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
 2013-06-05 16:27:44 +02:00
Erik van der Zalm
971ec35135 Expanded M302 to allow setting the temp 2013-06-02 17:36:23 +02:00
Erik van der Zalm
4de419e26e Updated README.md 2013-06-02 16:26:42 +02:00
Erik van der Zalm
a0729f0c3a no message 2013-06-02 15:42:59 +02:00
Erik van der Zalm
5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb) 2013-05-29 19:29:30 +02:00
ErikZalm
a964b3cf3d Merge pull request #495 from Gatulibu/Marlin_v1 
Added support for Megatronics v2.0 and Minitronics v1.0
 2013-05-28 07:51:49 -07:00
ErikZalm
34fb4831a2 Merge pull request #496 from MStohn/fix-16x2-lcd 
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
 2013-05-28 07:50:52 -07:00
Maik Stohn
e8572c5239 Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation 2013-05-28 15:53:07 +02:00
Maik Stohn
7ee70c2248 Fix: removed wrong ; at end of define 2013-05-28 15:50:48 +02:00
Gatulibu
b78fa6bb70 Added support for Megatronics v2.0 and Minitronics v1.0 
merged from code downloaded from reprapworld.com
 2013-05-28 14:03:31 +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