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

1165 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik van der Zalm 314fd13c39 Fix for Viki display 2013-09-26 20:32:19 +02:00
phq1910 4f7c6dfe35 Update pins.h 
Include Pins cpu Sethi 3D
 2013-09-26 11:40:54 -03:00
phq1910 57173739a1 Update Configuration.h 
Include CPU Sethi 3D
 2013-09-26 11:29:44 -03:00
Erik van der Zalm 0dca49a7c0 Added Azteeg X3 board. 2013-09-24 17:31:16 +02:00
Erik van der Zalm d8c2c810b4 Added info to the delta configuration files in the configuration.h file 2013-09-23 23:29:46 +02:00
Erik van der Zalm 9bc88f8bab Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file 2013-09-23 23:25:11 +02:00
Erik van der Zalm 3ca1ca6869 Fixed missing ENCODER_PULSES_PER_STEP 2013-09-23 23:18:35 +02:00
Tim Koster 97b0da0c2e Removed #ifndef BLINKM 2013-09-22 10:43:27 +03:00
Tim Koster 61db046b32 Added #ifdef BLINKM around new code. Also refined BlinkM.h. 2013-09-20 10:57:42 +03:00
Richard Miles 77df2ab0e7 Make Y_DUAL_STEPPER_DRIVERS disabled by default 2013-09-17 21:49:44 +01:00
Richard Miles ed1ab42186 Added Y_DUAL_STEPPER_DRIVERS 
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped in either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
 2013-09-17 19:19:20 +01:00
Richard Miles f4a59e4ce5 Revert "Added Y_DUAL_STEPPER_DRIVERS" 
This reverts commit 7ee275b620.
 2013-09-17 19:05:49 +01:00
Richard Miles 7ee275b620 Added Y_DUAL_STEPPER_DRIVERS 
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
 2013-09-17 19:02:00 +01:00
ErikZalm 6a1e980c6d Merge pull request #600 from xoan/Encoder_Pulses_Per_Step 
add ENCODER_PULSES_PER_STEP
 2013-09-14 04:56:45 -07:00
ErikZalm 20076a8bd3 Merge pull request #598 from GDV0/Marlin_v1 
FIx compilation error when enabling SERVO_ENDSTOPS (#591)
 2013-09-14 04:54:19 -07:00
Erik van der Zalm 3626b5ad8b Removed Delta from the default config file. 
Changed EEPROM CHITCHAT behavior. M503 is always enabled.
 2013-09-14 13:50:09 +02:00
Xoan Sampaiño bf7007d02f add ENCODER_PULSES_PER_STEP 2013-09-13 04:12:51 +02:00
GDV0 f17506c504 FIx compilation error when enabling SERVO_ENDSTOPS (#591) 2013-09-11 23:09:37 +02:00
ErikZalm 59e36f1d27 Merge pull request #595 from nothinman/Marlin_v1 
Fan fix for Panelolu2+Sanguinololu.
 2013-09-11 00:39:17 -07:00
Martin Lukasik acd8619809 Fan fix for Panelolu2+Sanguinololu. 2013-09-10 22:10:58 +01:00
ErikZalm 7c35be7fd8 Merge pull request #594 from gr5/Marlin_v1 
Fixed bug that makes ulticontroller knob backwards introduced Feb 28 201...
 2013-09-10 07:56:55 -07:00
George Roberts 595580556c Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert. 
Bug introduced in version 6beb42cdf6.
Robert did a good job of simplifying but messed up this chunk of code.

Looking at working version: 839bef6d5d
it seems there is no case where encrot3 should be defined as 2
because if ULTICONTROLLER is defined then NEWPANEL is also defined.
 2013-09-10 09:56:19 -04:00
Tim Koster 88dfeefca3 Define BlinkM default disabled 2013-09-10 12:32:21 +03:00
Tim Koster 5350faf2a2 Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1 2013-09-10 12:27:26 +03:00
Tim Koster 7016cc9511 Added BlinkM support over i2c 2013-09-10 12:18:29 +03:00
ErikZalm d78db12abd Merge pull request #589 from wolfmanjm/upgrade 
Fix the example delta configuration by adding DELTA_DIAGONAL_ROD_2
 2013-09-09 07:09:19 -07:00
Tim Koster 3b315b3da0 Added BlinkM support over i2c 2013-09-06 22:25:39 +03:00
Jim Morris f26f26b7bd Fix the example delta configuration as someone forgot to do it. 2013-09-05 16:36:55 -07:00
Erik van der Zalm a447e76fdf Update read me. Added comment about products that have a patent. 2013-08-30 14:39:19 +02:00
ErikZalm f8d173bd0b Merge pull request #582 from hercek/upstream 
add command M666 for adjusting delta printer endstop position
 2013-08-28 01:49:44 -07:00
Peter Hercek 9aa2229077 add command M666 for adjusting delta printer endstop position 2013-08-28 01:15:20 +02:00
ErikZalm aa6c58ad37 Merge pull request #575 from buildrob101/DualXCarriageMerge 
Add duplication and auto-park mode for dual x-carriage support.
 2013-08-07 13:10:54 -07:00
Robert F-C 221286c10a Add .gitignore change to ignore .bak files (produced by WinMerge and other editors) 2013-08-08 00:16:38 +10:00
Robert F-C 9547fb9dfb Add duplication and auto-park mode for dual x-carriage support. 2013-08-08 00:10:26 +10:00
ErikZalm 62aab66299 Merge pull request #572 from ultimachine/rambo_LCD 
RAMBo LCD Support, Additional Pins, and Arduino add ons
 2013-08-05 10:04:47 -07:00
Steve Kelly d7b1a8ba33 add rambo arduino addons 2013-08-03 12:42:34 -05:00
Steve Kelly 53614e5144 add pins for rambo lcd 2013-08-03 11:45:53 -05:00
Steve Kelly b42d24e31e add additional pins to avr2560 for rambo lcd 2013-08-03 11:37:12 -05:00
ErikZalm 07f029c2d5 Merge pull request #563 from njprossi/Marlin_v1 
Improvment for delta, Honeywell thermistor table and move from panel
 2013-08-03 08:05:26 -07:00
Nicolas Rossi b0c8120fcc Added feedrate setting in exemple config for manual moves from panel 2013-08-03 13:09:53 +02:00
Nicolas Rossi a54fe2d73c Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 
Conflicts:
	Marlin/Marlin_main.cpp
 2013-08-03 13:05:56 +02:00
ErikZalm 7ea63d08df Merge pull request #565 from iXce/avrdudeconfpath 
Detect OS in Makefile to use the correct avrdude.conf path
 2013-08-02 13:16:07 -07:00
ErikZalm 4187b637a5 Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops 
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
 2013-08-02 13:15:30 -07:00
ErikZalm 07e7de3600 Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions 
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
 2013-08-02 13:13:29 -07:00
Guillaume Seguin c0c4c97db6 Detect OS in Makefile to use the correct avrdude.conf path 2013-08-01 19:20:27 +02:00
hg42@gmx.net 2ca983568d separate INVERTING for MIN and MAX endstops (6 #defines instead of 3) 2013-08-01 15:06:39 +02:00
hg42@gmx.net 3700f688f5 convert PROTOCOL macros from statements to (multiple, comma separated) expressions 2013-08-01 14:56:39 +02:00
daid a504c88346 Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts. 2013-08-01 14:12:30 +02:00
ErikZalm c6cb93d38c Merge pull request #556 from ellensp/Marlin_v1 
renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works...
 2013-07-31 13:34:40 -07:00
Nicolas Rossi 394ed08f88 Added feedrate setting for manual moves from panel 2013-07-30 14:33:30 +02:00