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

1167 commits

Author SHA1 Message Date
Erik van der Zalm a94e588765 Changed slow buttons behavior. 2013-11-17 17:41:30 +01:00
Erik van der Zalm 69af392554 Added HEATERS_PARALLEL (Request from reifsnyderb) 
This allows a hot end with two heaters and a FET for each heater. This is useful if the FET is not capable of heating two heaters.
 2013-11-17 13:29:02 +01:00
Erik van der Zalm 48a185d004 Fixed compile errors from bad commits. 2013-11-10 16:36:37 +01:00
ErikZalm 24d1f480b6 Merge pull request #647 from shaggythesheep/newfeature-M226 
Implement M226 - GCode Initiated Pause
 2013-11-10 07:27:01 -08:00
ErikZalm 95b41413e6 Merge pull request #641 from hugokernel/master 
M80 - ATX Power On related modification
 2013-11-10 07:26:35 -08:00
ErikZalm 59b96e323e Merge pull request #640 from fmalpartida/SAV-MkI 
Added support for BT on AT90USB devices, corrected LCD bug, added new board and LCD
 2013-11-10 07:26:08 -08:00
ErikZalm 2433ee6fc8 Merge pull request #637 from justuswilhelm/Marlin_v1 
Fix servo control for Melzi v2.0
 2013-11-10 07:22:12 -08:00
ErikZalm 3455a2bac2 Merge pull request #636 from PrintToPeer/Marlin_v1 
Add UUID support to M115 responses.
 2013-11-10 07:21:46 -08:00
Richard Miles dc887ef99b Implement M226 - GCode Initiated Pause 
Implemented M226 as described here:
http://reprap.org/wiki/G-code#M226:_Gcode_Initiated_Pause

Waits for pin to be become either HIGH, LOW or the inverse of what it
was before. Allows printing to pause until user interaction
 2013-11-09 15:11:58 +00:00
Charles R c244eb860c If you have a switch on suicide pin, this is useful if you want to 
start another print with suicide feature after a print without
suicide...
 2013-11-04 12:04:04 +01:00
fmalpartida 7b556d2e96 Added BT support on AT90USB devices 
Added AT90USB device BT connectivity support using second UART.
 2013-11-03 19:57:06 +01:00
Kaz Walker a5e8575829 Add UUID support to M115 responses. 2013-11-01 14:51:50 -06:00
Daniel Benamy cab84e0e5b Add (correct) missing pin definitions for Y2 
I tested this and it works.
 2013-10-30 22:44:20 -04:00
fmalpartida 5b3f60ea2e Corrected LCD only error 
If only an LCD is defined and no menu or keyboard defined, there is a
compilation error.

Added conditional compilation.
 2013-10-30 21:52:46 +01:00
Justus Perlwitz 62d0b79023 Fix servo control for Melzi 2013-10-30 20:59:58 +01:00
fmalpartida b5a964fcc5 Initial SAV MkI (RepRap CloneWars board) integration. 
Included support for BT dongle on AT90USB boards.
Added LCD Shift Register LCD control
Included support for RepRap Clone Wars project board (SAV MKI).
 2013-10-30 11:45:32 +01:00
dumle29 f941203172 PS_ON configurable boot state 
Allows the user to select wheter or not the PSU should be turned on or
kept in standby when marlin boots
 2013-10-29 18:44:56 +01:00
whosawhatsis c79e3967b3 Make G11 not horribly broken 2013-10-24 18:58:42 -07:00
bkubicek d69822ed51 Fix '#' 
since it can occure in comments.
 2013-10-22 10:34:51 +02:00
bkubicek 2fb2a0a119 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2013-10-22 10:08:21 +02:00
bkubicek 39d88bcccb preparation for hibernation 
If a print is stopped, it would be nice in the future to write a file with the printer state, the filename of the print, and the position within the print.
this file could be read, to continue a previously stopped print.
not finished yet.
 2013-10-22 10:04:08 +02:00
bkubicek ab965376ff Sub-file calls. 
by overloading M32 it is now possible to execute gcode files from other gcode files, with a fixed recursion level.
This can be used e.g. for having a real start.g and end.g somewhere on the sd card, which are then called from the normal print file.
Another usecase would be to have macro-files for nozzle-change and layerchange.
I have not tested the speedwise performance. The testing was done with pronterface.

syntax:
normal call from sd card will open the new file and continue executing there.
M32 !/path/filename#
this however will call the new file and return to the caller file.
M32 P !/path/filename#
with the optional "S<position>" the  file starting position can be set.
this is for continuing prints from a previous location.
 2013-10-22 10:02:18 +02:00
bkubicek b2cc27e5ea Added a magic character for sd buffering. 
if a '#' is read now the buffer will be emptied before reading ahead.
This is so one can execute files from within gcode files, without messing the buffer with preread characters from the caller file.
# can not occure in sd files imho, because it should only occure within checksums in ther serial communication.
Yes, thats a lame argument. If you have a better idea please tell me. It has to be a character that one can type
on a keyboard manually.
 2013-10-22 09:54:13 +02:00
Erik van der Zalm 8a08cca0f2 Added temperature status less. 
Hopefully fixed viky button handling without braking other boards
 2013-10-20 12:12:35 +02:00
Erik van der Zalm 667d278f54 Revert "Fix for Viki display" 
This reverts commit 314fd13c39.
 2013-10-20 10:16:46 +02:00
Erik van der Zalm bf27e79e74 Small BlinkM fix 2013-10-20 10:06:02 +02:00
Erik van der Zalm 87e28c0599 Added ifdefs to blinkm 2013-10-20 09:55:15 +02:00
Erik van der Zalm 24c6b2ab35 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2013-10-20 09:51:58 +02:00
ErikZalm 6a803ba9c5 Merge pull request #590 from timkoster/Marlin_v1 
Added BlinkM support over i2c
 2013-10-20 00:51:35 -07:00
Erik van der Zalm 457d8a0acb Fixed merge conflicts 2013-10-20 09:50:27 +02:00
Alex Borro 6f85a8c7aa Bed auto Leveling change: Raise Z before homing 
- Added "Z_RAISE_BEFORE_HOMING" for raising Z the defined distance
before homing. This is useful to avoid Z-Probe collision when hotend is
near bed.

- Fixed the issue of Z not going bellow Z_PROBE_OFFSET when
"min_software_endstops" is true.
Now the Z_PROBE_OFFSET is not set in Z_MIN_POS, it is added after
homing.
 2013-10-12 17:28:11 -03:00
Alex Borro dd3086d3f2 Show Temperature ADC values 
If "SHOW_TEMP_ADC_VALUES" is defined in Configuration_adv.h, the M105
command will present, after tradicional temperatures, the ADC value read
from temp sensors. This is great for adjusting thermistor tables with
thermocouple.

From Pronterface you can see the ADC value and compare with a
thermocouple reading.. then you just need to create your own thermistor
table.

Since this merge doesnt change the original information, it doesnt mess
with PC software parsing (tested under Pronterface and Repetier-Host).
 2013-10-12 10:41:23 -03:00
bkubicek 7fad13a1e2 Reverse SD card file name order. 
This is _not_ automatically the cronological, since deleting a file will free
the filesystem descriptor for it, which then will be used by the next file copied on it.
Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu.

this should satisfy https://github.com/ErikZalm/Marlin/pull/373

as a reminder, auto0.g will be executed every time after a boot with sd card present and file present.
thereafter, if there is a file auto1.g this will be done. Thats IMHO the best place to put settings, and prepare heating.
I also execute again after each (now again via the prepare menu) before starting a new print/ after a failed one.
It for me 100% replaces any start.gcode form the slicers.
 2013-10-12 13:24:55 +02:00
bkubicek b832f5b9f6 added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try. 
also, removed some trouble for compilation with corexy.
I think that babystepping is only possible in z for a delta tower.
not sure if it would be usefull to step individual motors on a delta, i don't own one
 2013-10-07 09:14:04 +02:00
bkubicek c38b0855c8 I think that filament change is ready for the masses. I have tested very often with my ultimaker. 
I strongly vote for it being a single gcode, because otherwise the triggering from the menu is terrible.
 2013-10-06 21:20:26 +02:00
bkubicek d147a057ac Add the socalled "Babystepping" feature. 
It is a realtime control over the head position via the LCD menu system that works _while_ printing.
Using it, one can e.g. tune the z-position in realtime, while printing the first layer.
Also, lost steps can be manually added/removed, but thats not the prime feature.
Stuff is placed into the Tune->Babystep *

It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then.

Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name.

say goodby to fuddling around with the z-axis.
 2013-10-06 21:14:51 +02:00
Erik van der Zalm bca353cc12 Fixed duplicate define in fastio.h 2013-10-03 19:24:53 +02:00
Alex Borro 253dfc4bc1 Bed Auto Leveling feature 
Check the Readme for instruction how to enable and configure the feature
 2013-09-29 13:20:06 -03:00
ErikZalm 1bda6bf862 Merge pull request #609 from phq1910/patch-1 
Update Configuration.h
 2013-09-26 11:47:58 -07:00
ErikZalm c80aac1518 Merge pull request #610 from phq1910/patch-2 
Update pins.h
 2013-09-26 11:47:47 -07:00
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
Martin Lukasik acd8619809 Fan fix for Panelolu2+Sanguinololu. 2013-09-10 22:10:58 +01: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
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
Peter Hercek 9aa2229077 add command M666 for adjusting delta printer endstop position 2013-08-28 01:15:20 +02:00
Robert F-C 9547fb9dfb Add duplication and auto-park mode for dual x-carriage support. 2013-08-08 00:10:26 +10: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
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
Nicolas Rossi 394ed08f88 Added feedrate setting for manual moves from panel 2013-07-30 14:33:30 +02:00
Nicolas Rossi 9bf1cf1b22 Pre-calculate diagonal rod length squared 2013-07-30 14:09:21 +02:00
Nicolas Rossi 4623e78ce0 Added Honeywell thermistor 135-104LAF-J01 2013-07-30 14:02:18 +02:00
Brendan-csel d7f384f680 Skip SD menu refresh if nothing has changed 2013-07-30 14:02:15 +02:00
Brendan-csel abc8320a68 Save LCD_CLICKED before it is cleared 
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
 2013-07-30 14:02:13 +02:00
Guillaume Seguin f4c3135c6d Add Panelolu2 pins for RAMPS1.3 2013-07-30 14:02:11 +02:00
Guillaume Seguin aae42c68f9 Update French translation in language.h 2013-07-30 14:02:08 +02:00
Guillaume Seguin 4d435c38a6 Add support of LiquidTWI2-based panels to Makefile 
Use LIQUID_TWI2=1 as make argument to enable this support
 2013-07-30 14:02:06 +02:00
Guillaume Seguin 6c42a3a339 Woops, fix logic 2013-07-30 14:02:04 +02:00
Guillaume Seguin 376d8af2c8 Report temperatures for all extruders 2013-07-30 14:02:01 +02:00
ErikZalm 434b6a05c1 Merge pull request #552 from iXce/Marlin_v1 
Report temperatures for all extruders in reply to M105
 2013-07-29 10:39:21 -07:00
ErikZalm bdc2621119 Merge pull request #561 from Brendan-csel/Marlin_v1 
Fix for Viki LCD issues printing from SD card
 2013-07-29 10:38:17 -07:00
ErikZalm 6965bd4e15 Merge pull request #560 from njprossi/Marlin_v1 
Fixed move from panel for delta bot #557
 2013-07-29 10:37:40 -07:00
ErikZalm a55b33e613 Merge pull request #559 from iXce/panelolupinsramps13 
Add Panelolu2 pins for RAMPS1.3
 2013-07-29 10:37:03 -07:00
ErikZalm 8b34351537 Merge pull request #558 from iXce/frenchupdate 
Update French translation in language.h
 2013-07-29 10:36:43 -07:00
ErikZalm 735e556724 Merge pull request #555 from iXce/liquidtwi2_makefile 
Add support of LiquidTWI2-based panels to Makefile
 2013-07-29 10:33:54 -07:00
Brendan-csel d80aecda0a Skip SD menu refresh if nothing has changed 2013-07-29 21:00:29 +12:00
Brendan-csel be2dea1dc6 Save LCD_CLICKED before it is cleared 
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
 2013-07-29 20:58:09 +12:00
Nicolas Rossi 55c287a69e Fixed move from panel for delta bot #557 2013-07-28 22:54:37 +02:00
Guillaume Seguin 1902d339b0 Add Panelolu2 pins for RAMPS1.3 2013-07-28 19:19:57 +02:00
Guillaume Seguin eb23a68e92 Update French translation in language.h 2013-07-28 18:50:47 +02:00
ErikZalm 1561c6df51 Merge pull request #547 from wolfmanjm/delta-configuration 
Setup Default configuration for Deltas if DELTA is defined
 2013-07-24 03:11:36 -07:00
Guillaume Seguin 374bc99fa3 Add support of LiquidTWI2-based panels to Makefile 
Use LIQUID_TWI2=1 as make argument to enable this support
 2013-07-24 12:09:53 +02:00
Jim Morris ab624eac2a revert COnfiguratiuon to the same as head 2013-07-24 02:57:46 -07:00
Jim Morris 52f79ffeca add an example default configuration for delta style bots 2013-07-24 02:55:52 -07:00
Jim Morris b9d7ccf1cd Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration 
Conflicts:
	Marlin/Marlin_main.cpp
 2013-07-24 02:49:25 -07:00
Guillaume Seguin d4d1540727 Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit 2013-07-24 11:19:38 +02:00
Guillaume Seguin 01ed99143c Woops, fix logic 2013-07-23 23:34:42 +02:00
Guillaume Seguin 76841450c8 Only display poweron/poweroff if PS_ON_PIN > -1 2013-07-23 22:28:30 +02:00
Guillaume Seguin 44f327d738 Uniformly reindent language.h 2013-07-23 22:13:40 +02:00
Guillaume Seguin 326d2db025 Update language.h so that all languages compile 
Some strings still need translation, but at least everything compiles.
 2013-07-23 22:11:54 +02:00
Guillaume Seguin 2cb716f513 Run Marlin/language.h through dos2unix 2013-07-23 21:49:37 +02:00
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1 
Conflicts:
	Marlin/language.h
 2013-07-23 21:46:41 +02:00
Guillaume Seguin 18199ff960 Merge github.com:ErikZalm/Marlin into Marlin_v1 2013-07-23 21:33:52 +02:00
Robert F-C fb5334f428 Fixed compile error when QUICK_HOME is defined. 
As well a couple of minor changes to handling of extruder offset for
dual x-carriage mode.
 2013-07-22 22:46:14 +10:00
Robert F-C c3568398b5 Disable DUAL_X_CARRIAGE by default 2013-07-20 23:50:30 +10:00
Robert F-C 39cd3dbdbe Remove dual x-carriage functionality that could/should be implemented in slicer 
Also added a couple of missed merge lines in homeaxis() from previous
commit.
 2013-07-20 13:07:50 +10:00
Jim Morris fb20ceabce enable soft endstops for delta 
disable delta by default
 2013-07-17 16:21:51 -07:00
Jim Morris d01ee7e7b5 fix zjerk being the same for delta as xy jerk 
add more delta defaults
on delta make second home even slower
 2013-07-17 16:14:07 -07:00
Robert F-C d7390e13d9 Support dual x-carriage printers 
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
 2013-07-17 22:44:45 +10:00
Jim Morris f3aa2a48e7 update max pos 2013-07-17 01:29:51 -07:00
Jim Morris 460751503e Added default configurations for deltas when DELTA is defined 2013-07-17 01:17:27 -07:00
Maik Stohn 9da94c247a fixed bad lcd commit from makr3d 
#elsif does not exist #elif is correct
 2013-07-15 17:34:21 +02:00
Erik van der Zalm 59004023fd Fixed typo 2013-07-15 17:22:56 +02:00
Erik van der Zalm 461dad6e05 Added : M32 - Select file and start SD print (Can be used when printing from SD card) 
Untested
 2013-07-14 22:39:59 +02:00
Erik van der Zalm c4a2077951 M109 and M190 now wait when cooling down if R is used instead of S. 
M109 S180 waits only when heating.
M109 R180 also waits when cooling.
 2013-07-14 21:10:24 +02:00
ErikZalm 8a2a3ef91d Merge pull request #531 from iXce/Marlin_v1_lcd 
Only clamp panel movements if software endstops are enabled
 2013-07-14 06:50:23 -07:00
Erik van der Zalm 6397b3339c restored configuration.h defaults 2013-07-14 15:49:03 +02:00
Erik van der Zalm cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 2013-07-14 15:45:49 +02:00
Erik van der Zalm e3bdefd873 fixed missing #endif 2013-07-14 15:42:53 +02:00
Erik van der Zalm a5be0c52c6 no message 2013-07-14 15:35:54 +02:00
Michael Mayer e509cdbeb0 added contrast control function for gLCDs 2013-07-14 15:28:26 +07:00
Michael Mayer 99b7e926e7 added MaKr3d Melzi board 2013-07-14 15:17:55 +07:00
Gabino Lopez 68be33b1fc Update language.h 
I update the spanish Messages, now this compile for spanish language.
 2013-07-04 10:23:00 +02:00
daid acb3271c9a Merge pull request #534 from xifle/Marlin_v1 
Fixes compiler warning for feedrate deadzone
 2013-07-01 23:41:51 -07:00
xifle 61fe430d4f Should fix compiler warning for feedrate deadzone 2013-07-01 11:10:02 +02:00
Gord Christmas fde17d5720 Fix for ugly code compilation errors in SERVO_ENDSTOP checks 2013-06-28 08:02:04 -07:00
Guillaume Seguin aa65c20d1f Only clamp panel movements if software endstops are enabled 2013-06-28 14:18:00 +02:00
Erik van der Zalm ecf3ab5de4 Added thermistor 60 to configuration.h 2013-06-27 23:25:51 +02:00
Nicolas Rossi 2daa85918e Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/ultralcd.cpp
 2013-06-20 23:59:56 +02:00
Erik van der Zalm 2015989f84 Added DISABLE_MIN_ENDSTOPS 2013-06-18 19:20:26 +02:00
Christian Inci 648d45cfb2 Fix Pin Description Typo 
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
 2013-06-16 23:35:33 +02:00
ErikZalm 171719f18c Merge pull request #525 from lajos/ultralcd_pid 
ultralcd.cpp compile errors when !defined(PIDTEMP)
 2013-06-16 00:02:54 -07:00
lajos b519af4f05 fixed another !defined(PIDTEMP) compile in ultralcd.cpp 2013-06-15 20:49:18 -04:00
lajos 7d03c52511 fixed compile error in ultralcd.cpp when PIDTEMP undefined 2013-06-15 18:09:52 -04:00
lajos 02dee80fa5 added Azteeg X1 motherboard 2013-06-15 16:58:17 -04:00
Henrik Brix Andersen 47dc70e3ec Fix location of avrdude.conf 2013-06-15 09:50:25 +02:00
Henrik Brix Andersen 1d258903bb Allow command line compilation when using BEEPER. 2013-06-15 09:36:55 +02:00
Erik van der Zalm e34c9981ab Delta disabled by default 2013-06-11 22:33:58 +02:00
Erik van der Zalm 26a441fc7d More 3Drag controller patches. 2013-06-10 18:26:15 +02:00
Erik van der Zalm ac975ed8c2 Merge branch 'deltabot' into Marlin_v1 2013-06-10 18:20:29 +02:00
Jim Morris caa848f943 fix homing for deltas 2013-06-09 21:10:00 -07:00
Erik van der Zalm 7ad12be763 Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1 
Conflicts:
	Marlin/Configuration.h
	README.md
 2013-06-09 23:10:41 +02:00
Erik van der Zalm 408169aef4 Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1 
Conflicts:
	Marlin/Configuration.h
	Marlin/language.h
	Marlin/pins.h
 2013-06-09 22:57:40 +02:00
Erik van der Zalm bd96d22bfb Merge branch 'Marlin_v1' into thinkyhead 
Conflicts:
	Marlin/Configuration.h
	Marlin/Configuration_adv.h
	Marlin/Marlin.h
	Marlin/Marlin_main.cpp
	Marlin/Servo.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/planner.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
	README.md
 2013-06-09 22:26:47 +02:00
Erik van der Zalm 73f21cd5d6 Spanish updated so far. 2013-06-09 21:40:35 +02:00
Erik van der Zalm 6f4a6e531c Merge branch 'deltabot' into Marlin_v1 2013-06-09 13:55:18 +02:00
Erik van der Zalm 01edf22a10 Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue. 2013-06-09 13:54:19 +02:00
Erik van der Zalm ff6fa09ecf Moved corexy implementation from stepper to planner 
(Thanks iquizzle)
 2013-06-09 13:10:06 +02:00
Erik van der Zalm c8dcc7c208 Allow increasing the software PWM frequency. 2013-06-09 12:52:49 +02:00
Erik van der Zalm 8b0d82e9db Removed "awaiting translation" for french 2013-06-09 12:24:06 +02:00
Erik van der Zalm 1e05d192ab Make the beep tone less offensive 2013-06-09 12:21:16 +02:00
Erik van der Zalm 373f3ecab3 Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/pins.h
 2013-06-09 00:51:58 +02:00
kiyoshigawa f295712008 Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h 2013-06-08 09:27:56 -06:00
kiyoshigawa 69b02031ca Fixed small error in lcd define statements. 2013-06-08 09:09:11 -06:00
kiyoshigawa 6a81291c57 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 
This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h
 2013-06-08 08:48:18 -06:00
BorisLandoni c1cb5977ee Update Configuration.h 2013-06-08 14:37:39 +02:00
BorisLandoni 8a5bd8a808 Update Configuration.h 2013-06-08 14:37:17 +02:00
BorisLandoni c1d7cf939e Update language.h 2013-06-07 17:38:17 +02:00
BorisLandoni 4c7d1436e9 Update pins.h 2013-06-07 18:37:44 +03:00
BorisLandoni 6588933c04 Update Configuration.h 2013-06-07 18:36:16 +03:00
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1 
Diffed and merged, preserving my updates
 2013-06-06 15:49:25 -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
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
kiyoshigawa 4b19c8552e Fixing changed Configuration.h settings to be default values per ErikZalm Request. 2013-06-04 12:01:55 -06: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 5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb) 2013-05-29 19:29:30 +02:00
Guillaume Seguin 16b9239a26 Report temperatures for all extruders 2013-05-29 18:06:12 +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
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
Alexander Kasimir e2ff536b03 Fixed typo in Comment 2013-05-22 16:02:03 +03: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
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
Maik Stohn 8d80cbbf4c fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored 2013-05-21 16:53:38 +02: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
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
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
Gord Christmas 28ada096e2 Adding servo documentation 2013-05-18 06:01:58 -07: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