chiark / gitweb /
marlin.git
12 years agoUpdate Marlin/thermistortables.h
linagee [Sun, 20 May 2012 10:55:22 +0000 (04:55 -0600)]
Update Marlin/thermistortables.h

12 years agoUpdate Marlin/thermistortables.h
linagee [Sun, 20 May 2012 10:35:28 +0000 (04:35 -0600)]
Update Marlin/thermistortables.h

12 years agoUpdate Marlin/Configuration.h
linagee [Sun, 20 May 2012 10:27:52 +0000 (04:27 -0600)]
Update Marlin/Configuration.h

12 years agoTested May 19 - It works! Verified with separate thermocouple TM-902C also.
linagee [Sun, 20 May 2012 10:13:29 +0000 (04:13 -0600)]
Tested May 19 - It works! Verified with separate thermocouple TM-902C also.

12 years agoExtended range above 250C. (Operating range states up to 300C)
linagee [Sun, 20 May 2012 10:01:30 +0000 (04:01 -0600)]
Extended range above 250C. (Operating range states up to 300C)

12 years agoGrammar correction.
linagee [Sat, 19 May 2012 13:40:35 +0000 (07:40 -0600)]
Grammar correction.

12 years agoUpdate Marlin/Configuration.h
linagee [Sat, 19 May 2012 11:56:17 +0000 (05:56 -0600)]
Update Marlin/Configuration.h

12 years agoUpdate Marlin/thermistortables.h
linagee [Sat, 19 May 2012 11:52:12 +0000 (05:52 -0600)]
Update Marlin/thermistortables.h

12 years agoUpdate Marlin/Configuration.h
linagee [Sat, 19 May 2012 11:47:30 +0000 (05:47 -0600)]
Update Marlin/Configuration.h

12 years agoLimit PID autotune PWM to PID_MAX
Erik van der Zalm [Wed, 16 May 2012 17:32:23 +0000 (19:32 +0200)]
Limit PID autotune PWM to PID_MAX

12 years agoMerge pull request #159 from MaikStohn/Marlin_v1
ErikZalm [Wed, 16 May 2012 19:32:35 +0000 (12:32 -0700)]
Merge pull request #159 from MaikStohn/Marlin_v1

Marlin v1 - BUG FIXES / CORRECTIONS

12 years agoMerge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
Erik van der Zalm [Wed, 16 May 2012 17:22:08 +0000 (19:22 +0200)]
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1

12 years agoMerge pull request #164 from guanix/Marlin_v1
ErikZalm [Wed, 16 May 2012 19:21:48 +0000 (12:21 -0700)]
Merge pull request #164 from guanix/Marlin_v1

Melzi support

12 years agoMerge pull request #166 from zittix/Marlin_v1
ErikZalm [Wed, 16 May 2012 19:00:22 +0000 (12:00 -0700)]
Merge pull request #166 from zittix/Marlin_v1

Fixes #153 for bad call to abs()

12 years agoadd additional dropsegments test
Erik van der Zalm [Wed, 16 May 2012 17:21:44 +0000 (19:21 +0200)]
add additional dropsegments test

12 years agoFixes #153 for bad call to abs()
zittix [Wed, 16 May 2012 16:17:34 +0000 (18:17 +0200)]
Fixes #153 for bad call to abs()

12 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
MaikStohn [Fri, 11 May 2012 14:57:08 +0000 (16:57 +0200)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

12 years agobug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only)
MaikStohn [Fri, 11 May 2012 13:23:10 +0000 (15:23 +0200)]
bug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only)

12 years agofixed typo
MaikStohn [Fri, 11 May 2012 13:22:06 +0000 (15:22 +0200)]
fixed typo

12 years agochanged encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm...
MaikStohn [Fri, 11 May 2012 13:19:09 +0000 (15:19 +0200)]
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu

12 years agoMelzi support
Guan Yang [Fri, 27 Apr 2012 15:28:10 +0000 (11:28 -0400)]
Melzi support

12 years agoResidual in the comments: there are no more mm/minutes but only mm/sec in the planner...
Bernhard Kubicek [Wed, 9 May 2012 05:05:13 +0000 (08:05 +0300)]
Residual in the comments: there are no more mm/minutes but only mm/sec in the planner buffer.

12 years agoRevert "magic PROGMEM defines to avoid hundreds of wrong GCC warnings"
MaikStohn [Fri, 4 May 2012 10:24:07 +0000 (12:24 +0200)]
Revert "magic PROGMEM defines to avoid hundreds of wrong GCC warnings"

This reverts commit 3682d9bd5b34bdc6560d97278d6d7eff3243bddc.

12 years agofuther docu of M500
Bernhard Kubicek [Fri, 4 May 2012 05:37:49 +0000 (08:37 +0300)]
futher docu of M500

12 years agoadded missing declaration of buttons_init()
MaikStohn [Thu, 3 May 2012 13:48:44 +0000 (15:48 +0200)]
added missing declaration of buttons_init()

This is required when moving the buttons_init() function to the
lcd_init() function

12 years agomagic PROGMEM defines to avoid hundreds of wrong GCC warnings
MaikStohn [Thu, 3 May 2012 13:43:23 +0000 (15:43 +0200)]
magic PROGMEM defines to avoid hundreds of wrong GCC warnings

12 years agoMoved LCD initialization out of constructor
MaikStohn [Thu, 3 May 2012 12:28:17 +0000 (14:28 +0200)]
Moved LCD initialization out of constructor

Since the class "MainMenu" was used within a static variable the
initialization of the object (constructor call) was done before Arduino
library startup. It always caused a crash when using AVRStudio with
JTAG debugger (caused from calling the LCD initialization / the lot of
I/O work / the stack used during this calls). By moving the LCD_INIT
out of the constructor and using an explicit call inside of Arduino
setup() implementation immediately fixed all problems and the JTAG
debugger runs fine.

12 years agoexplicit includes to make it compile with AVRStudio/Eclipse
MaikStohn [Thu, 3 May 2012 12:22:43 +0000 (14:22 +0200)]
explicit includes to make it compile with AVRStudio/Eclipse

12 years agodelete obsolete and wrong code
MaikStohn [Thu, 3 May 2012 12:15:46 +0000 (14:15 +0200)]
delete obsolete and wrong code

"i" runs from 0 to 4 but "add_homeing" array size is 3 only. On the
other hand the calculated value gets overwritten by either one of the
if choice.

12 years agofixed typo in comment
MaikStohn [Thu, 3 May 2012 12:13:53 +0000 (14:13 +0200)]
fixed typo in comment

12 years agoAdded option to increase the FAN PWM frequency.
Erik van der Zalm [Wed, 2 May 2012 17:26:14 +0000 (19:26 +0200)]
Added option to increase the FAN PWM frequency.

12 years agoSmall cleanup
Erik van der Zalm [Mon, 30 Apr 2012 11:37:49 +0000 (13:37 +0200)]
Small cleanup

12 years agoMerge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
Erik van der Zalm [Mon, 30 Apr 2012 11:36:27 +0000 (13:36 +0200)]
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1

12 years agoAdded temperature window to M109. This is needed for systems with no overshoot PID.
Erik van der Zalm [Mon, 30 Apr 2012 11:36:19 +0000 (13:36 +0200)]
Added temperature window to M109. This is needed for systems with no overshoot PID.

12 years agoMerge pull request #154 from daid/Marlin_v1
ErikZalm [Sat, 28 Apr 2012 20:19:55 +0000 (13:19 -0700)]
Merge pull request #154 from daid/Marlin_v1

Added 2nd extruder temperature LCD readout and setting.

12 years agoMerge pull request #155 from Atntias/patch-1
ErikZalm [Sat, 28 Apr 2012 20:19:19 +0000 (13:19 -0700)]
Merge pull request #155 from Atntias/patch-1

adding M120 and 121 for turning on and off the endstops only for homing

12 years agoMerge pull request #156 from Atntias/patch-2
ErikZalm [Sat, 28 Apr 2012 20:19:00 +0000 (13:19 -0700)]
Merge pull request #156 from Atntias/patch-2

Fix to allow M120/M121

12 years agoFix to allow M120/M121
sefi [Sat, 28 Apr 2012 14:35:51 +0000 (17:35 +0300)]
Fix to allow M120/M121

12 years agoadding M120 and 121 for turning on and off the endstops only for homing function
sefi [Sat, 28 Apr 2012 14:31:22 +0000 (17:31 +0300)]
adding M120 and 121 for turning on and off the endstops only for homing function

12 years agoShow proper temperature for extruder 2
Daid [Fri, 27 Apr 2012 13:00:01 +0000 (15:00 +0200)]
Show proper temperature for extruder 2

12 years agoAdded support for 2nd extruder temperature to UltraLCD
Daid [Fri, 27 Apr 2012 12:51:32 +0000 (14:51 +0200)]
Added support for 2nd extruder temperature to UltraLCD

12 years agoMerge pull request #152 from loganb/Marlin_v1
Bernhard Kubicek [Thu, 26 Apr 2012 05:23:31 +0000 (22:23 -0700)]
Merge pull request #152 from loganb/Marlin_v1

Fix compile error on boards without a bed heater.

I could not find why this problem was introduced.
Its quite obvious, so I think its in general interest to merge.

12 years agoWrap the call to turn off the bed heater in a #if to prevent a compile error on board...
Logan Bowers [Thu, 26 Apr 2012 02:22:38 +0000 (19:22 -0700)]
Wrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater

12 years agoreinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can...
Bernhard [Sun, 22 Apr 2012 19:12:17 +0000 (21:12 +0200)]
reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time.
Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt.
actually, it solves a problem with the UltiControlle

12 years agoadded support for the UltiController
Bernhard [Sun, 22 Apr 2012 18:55:56 +0000 (20:55 +0200)]
added support for the UltiController

12 years agofixed quickhome
Bernhard [Sun, 22 Apr 2012 18:44:27 +0000 (20:44 +0200)]
fixed quickhome

12 years agofixed catsting to (int)e in serial error messages.
Bernhard [Sun, 22 Apr 2012 18:04:39 +0000 (20:04 +0200)]
fixed catsting to (int)e in serial error messages.
see https://github.com/ErikZalm/Marlin/issues/148

12 years agoUpdate readme file
Erik van der Zalm [Sun, 15 Apr 2012 20:44:03 +0000 (22:44 +0200)]
Update readme file

12 years agoMerge pull request #138 from triffid/fix-makefile
ErikZalm [Sun, 15 Apr 2012 17:21:46 +0000 (10:21 -0700)]
Merge pull request #138 from triffid/fix-makefile

make should rebuild if configuration or Makefile is changed

12 years agoFixed AUTOTEMP (M109 S215 B260 F1 starts autotemp)
Erik van der Zalm [Sun, 15 Apr 2012 17:17:33 +0000 (19:17 +0200)]
Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp)
Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.

12 years agoDisabled disable_heater in PID_autotune.
Erik van der Zalm [Thu, 12 Apr 2012 19:12:31 +0000 (21:12 +0200)]
Disabled disable_heater in PID_autotune.

12 years agoMerge pull request #140 from daid/Marlin_v1
ErikZalm [Thu, 12 Apr 2012 12:29:24 +0000 (05:29 -0700)]
Merge pull request #140 from daid/Marlin_v1

Fix for wrong systax in #ifdef.

12 years agoFix for wrong systax in #ifdef.
Daid [Thu, 12 Apr 2012 12:01:30 +0000 (14:01 +0200)]
Fix for wrong systax in #ifdef.

12 years agoFix Makefile
Michael Moon [Wed, 11 Apr 2012 01:37:55 +0000 (11:37 +1000)]
Fix Makefile

12 years agoFixed MAX6675
Erik van der Zalm [Tue, 10 Apr 2012 19:57:57 +0000 (21:57 +0200)]
Fixed MAX6675

12 years agoMerge pull request #136 from grrf/patch-1
ErikZalm [Tue, 10 Apr 2012 16:48:45 +0000 (09:48 -0700)]
Merge pull request #136 from grrf/patch-1

This breaks temperature readout for pronterface!

12 years agoThis breaks temperature readout for pronterface!
grrf [Mon, 9 Apr 2012 20:37:34 +0000 (23:37 +0300)]
This breaks temperature readout for pronterface!

12 years agoMerge pull request #134 from tgiphil/Marlin_v1
ErikZalm [Sun, 8 Apr 2012 12:16:29 +0000 (05:16 -0700)]
Merge pull request #134 from tgiphil/Marlin_v1

- Fixed a typo

12 years ago- Fixed a typo
tgiphil [Sun, 8 Apr 2012 03:01:31 +0000 (20:01 -0700)]
- Fixed a typo

12 years agoFixed typo in arc
Erik van der Zalm [Mon, 2 Apr 2012 15:19:20 +0000 (17:19 +0200)]
Fixed typo in arc

12 years agoChanged default MINIMUM_PLANNER_SPEED -> 0.05
Erik van der Zalm [Sun, 1 Apr 2012 14:23:40 +0000 (16:23 +0200)]
Changed default MINIMUM_PLANNER_SPEED -> 0.05
Fixed small bug in arcs
M105 prints now actual_temp/target_temp

12 years agoFixed arc offset.
Erik van der Zalm [Tue, 27 Mar 2012 17:03:33 +0000 (19:03 +0200)]
Fixed arc offset.

12 years agoIgnore ":" in comments.
Erik van der Zalm [Sun, 25 Mar 2012 12:41:26 +0000 (14:41 +0200)]
Ignore ":" in comments.

12 years agoReplaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
Erik van der Zalm [Sun, 25 Mar 2012 12:36:51 +0000 (14:36 +0200)]
Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.

Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp

12 years agoMerge pull request #123 from buserror-uk/for-upstream
ErikZalm [Fri, 23 Mar 2012 18:54:58 +0000 (11:54 -0700)]
Merge pull request #123 from buserror-uk/for-upstream

For upstream

12 years agoMerge pull request #126 from tommycheng/patch-1
ErikZalm [Fri, 23 Mar 2012 18:54:37 +0000 (11:54 -0700)]
Merge pull request #126 from tommycheng/patch-1

Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined...

12 years agoFix compilation error when PIDTEMP is undefined and ULTIPANEL is defined.
Tommy Cheng [Fri, 23 Mar 2012 18:26:59 +0000 (02:26 +0800)]
Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined.

12 years agoNew board variant, Open Motion Controller
Michel Pollet [Thu, 22 Mar 2012 13:51:21 +0000 (13:51 +0000)]
New board variant, Open Motion Controller

Open Hardware board currently used by the group build of http://tvrrug.org.uk
The board can be found at http://solderpad.com/folknology/open-motion-controller/

Signed-off-by: Michel Pollet <buserror@gmail.com>
12 years agoMakefile: Redone
Michel Pollet [Thu, 22 Mar 2012 13:48:10 +0000 (13:48 +0000)]
Makefile: Redone

+ Removed most explicit pathnames, use the standard make "VPATH" to let
make find the files for itself.

+ Added a "hardware variant" variable that allows compiging Sanguino and
Gen7 as well as "generic" arduino.

+ Allows overriding the MOTHERBOARD define from the Makefile

+ Removed the 'preprocessor' bit that wasn't needed, now just "include" the
files that are needed, since it allows gcc to show the right file/line
when displaying error/warnings.

+ Uses gcc's own dependency generator to generate the .d files, and
and include these instead of self-patching the makefile

Signed-off-by: Michel Pollet <buserror@gmail.com>
12 years agomade prepare->autostart independent of current folder.
Bernhard [Mon, 19 Mar 2012 19:24:40 +0000 (20:24 +0100)]
made prepare->autostart  independent of current folder.

12 years agofound error in filenames.
Bernhard [Mon, 19 Mar 2012 19:06:58 +0000 (20:06 +0100)]
found error in filenames.
One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely

12 years agoUpdate README.md
ErikZalm [Sun, 18 Mar 2012 14:59:14 +0000 (15:59 +0100)]
Update README.md

12 years agoFixed compile errors in ultralcd when no ultra_lcd is selected.
Erik van der Zalm [Thu, 15 Mar 2012 21:29:31 +0000 (22:29 +0100)]
Fixed compile errors in ultralcd when no ultra_lcd is selected.

12 years agoAdded DISABLE_MAX_ENDSTOPS
Erik van der Zalm [Mon, 12 Mar 2012 19:32:14 +0000 (20:32 +0100)]
Added DISABLE_MAX_ENDSTOPS

12 years agoPPID tune exports more constants.
Erik van der Zalm [Sun, 11 Mar 2012 21:18:25 +0000 (22:18 +0100)]
PPID tune exports more constants.

12 years agoMerge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
Erik van der Zalm [Sun, 11 Mar 2012 17:03:00 +0000 (18:03 +0100)]
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1

12 years agoAdded more manage_inactivity checks
Erik van der Zalm [Sun, 11 Mar 2012 16:59:44 +0000 (17:59 +0100)]
Added more manage_inactivity checks

12 years agoMerge pull request #99 from Justblair/master
ErikZalm [Sun, 11 Mar 2012 11:34:59 +0000 (04:34 -0700)]
Merge pull request #99 from Justblair/master

Better pin configuration for rotary encoder in RAMPS boards

12 years agoAdded 20MHz support.
Erik van der Zalm [Sun, 11 Mar 2012 11:25:04 +0000 (12:25 +0100)]
Added 20MHz support.

12 years agoMerge pull request #106 from bgamari/Marlin_v1
ErikZalm [Sun, 11 Mar 2012 09:48:30 +0000 (01:48 -0800)]
Merge pull request #106 from bgamari/Marlin_v1

Make F_CPU dependence of stepper.cpp more explicit

12 years agoAdded CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers)
Erik van der Zalm [Sun, 11 Mar 2012 09:44:10 +0000 (10:44 +0100)]
Added CONTROLLERFAN.  (Controlling a fan to cool down the steppper drivers)

12 years agoDo not disable steppers when there are moves in the queue.
Erik van der Zalm [Fri, 9 Mar 2012 19:20:01 +0000 (20:20 +0100)]
Do not disable steppers when there are moves in the queue.

12 years agoFixed typo
Erik van der Zalm [Fri, 9 Mar 2012 16:49:48 +0000 (17:49 +0100)]
Fixed typo

12 years agoRemoved !!!. Stupid arduino bootloader can't handle this.
Erik van der Zalm [Fri, 9 Mar 2012 16:42:32 +0000 (17:42 +0100)]
Removed !!!. Stupid arduino bootloader can't handle this.

12 years agoAdded FAN_PIN -1 checks
Erik van der Zalm [Thu, 8 Mar 2012 21:09:49 +0000 (22:09 +0100)]
Added FAN_PIN -1 checks

12 years agoCorrected active_extruder when autotemp is used.
Erik van der Zalm [Thu, 8 Mar 2012 21:04:13 +0000 (22:04 +0100)]
Corrected active_extruder when autotemp is used.

12 years agoMerge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
Erik van der Zalm [Thu, 8 Mar 2012 20:48:06 +0000 (21:48 +0100)]
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1

12 years agoAdded PID autotune. (experimental)
Erik van der Zalm [Thu, 8 Mar 2012 20:43:21 +0000 (21:43 +0100)]
Added PID autotune. (experimental)
M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed.
Put these values in Configuration.h

12 years agoAdd instructions to regenerate speed_lookuptable when changing F_CPU
Ben Gamari [Wed, 7 Mar 2012 23:05:10 +0000 (18:05 -0500)]
Add instructions to regenerate speed_lookuptable when changing F_CPU

12 years agostepper: Clarify comment on timer-counter configuration
Ben Gamari [Wed, 7 Mar 2012 22:58:35 +0000 (17:58 -0500)]
stepper: Clarify comment on timer-counter configuration

12 years agoAdd create_speed_lookup
Ben Gamari [Wed, 7 Mar 2012 22:41:29 +0000 (17:41 -0500)]
Add create_speed_lookup

12 years agoMerge pull request #100 from tommycheng/patch-1
ErikZalm [Mon, 5 Mar 2012 17:56:50 +0000 (09:56 -0800)]
Merge pull request #100 from tommycheng/patch-1

While Waiting for hotbed to warm up via M190, LCD Display and Click Enco...

12 years agoWhile Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input...
Tommy Cheng [Mon, 5 Mar 2012 15:12:26 +0000 (23:12 +0800)]
While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached.

12 years agoFixed type in e-jerk
Erik van der Zalm [Sun, 4 Mar 2012 22:09:13 +0000 (23:09 +0100)]
Fixed type in e-jerk

12 years agoChanged Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are...
Blair Thompson [Sun, 4 Mar 2012 21:34:20 +0000 (21:34 +0000)]
Changed Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are all wired to AUX-4

This simplifies wiring for those with RAMPS 1.3 and 1.4 boards.

12 years agoAdded E-Jerk
Erik van der Zalm [Sun, 4 Mar 2012 15:34:58 +0000 (16:34 +0100)]
Added E-Jerk

12 years agoAdded missing defines to the german section.
Erik van der Zalm [Sun, 4 Mar 2012 13:08:20 +0000 (14:08 +0100)]
Added missing defines to the german section.
Translation still needed.

12 years agomerging with SCUBA82
Erik van der Zalm [Sun, 4 Mar 2012 12:41:47 +0000 (13:41 +0100)]
merging with SCUBA82

12 years agoQueued fan control. Issue #90
Erik van der Zalm [Sun, 4 Mar 2012 12:05:26 +0000 (13:05 +0100)]
Queued fan control. Issue #90

12 years agoset SD file delete to M30; switch printime output to M31
Christian Thalhammer [Sat, 3 Mar 2012 20:58:12 +0000 (21:58 +0100)]
set SD file delete to M30; switch printime output to M31