chiark / gitweb /
marlin.git
13 years agoreformating and some minor bugs/things found on the way.
Bernhard Kubicek [Sun, 6 Nov 2011 18:23:08 +0000 (19:23 +0100)]
reformating and some minor bugs/things found on the way.

13 years agooverworked the serial responses. Quite difficult, since many texts are Pronterface...
Bernhard Kubicek [Sun, 6 Nov 2011 16:33:09 +0000 (17:33 +0100)]
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.

13 years agocorrecting commit errors.
Bernhard Kubicek [Sun, 6 Nov 2011 14:10:29 +0000 (15:10 +0100)]
correcting commit errors.

13 years agowrong file location
Bernhard Kubicek [Sun, 6 Nov 2011 13:58:12 +0000 (14:58 +0100)]
wrong file location

13 years agowatchdog into dedicated file
Bernhard Kubicek [Sun, 6 Nov 2011 13:22:15 +0000 (14:22 +0100)]
watchdog into dedicated file

13 years agorefactured temperature.cpp so that there are now abstract functions to access tempera...
Bernhard Kubicek [Sun, 6 Nov 2011 13:03:41 +0000 (14:03 +0100)]
refactured temperature.cpp so that there are now abstract functions to access temperatures.

13 years agoFirst arcs version. (Arcs not working ok)
Erik van der Zalm [Sun, 6 Nov 2011 11:39:00 +0000 (12:39 +0100)]
First arcs version. (Arcs not working ok)

13 years agoCorrected temp variables.
Erik van der Zalm [Sat, 5 Nov 2011 19:21:09 +0000 (20:21 +0100)]
Corrected temp variables.

13 years agoMerge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm [Sat, 5 Nov 2011 19:03:38 +0000 (20:03 +0100)]
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

Conflicts:
Marlin/Configuration.h
Marlin/EEPROMwrite.h
Marlin/Marlin.h
Marlin/Marlin.pde
Marlin/temperature.cpp
Marlin/temperature.h
Marlin/thermistortables.h

13 years agoTemperature changes
Erik van der Zalm [Sat, 5 Nov 2011 18:21:36 +0000 (19:21 +0100)]
Temperature changes

13 years agomoved the variables in the ISR, thats the most normal use case of static.
Bernhard Kubicek [Sat, 5 Nov 2011 15:53:37 +0000 (16:53 +0100)]
moved the variables in the ISR, thats the most normal use case of static.

13 years agoRevert "this is not working. Do you maybe know why?"
Bernhard Kubicek [Sat, 5 Nov 2011 15:49:29 +0000 (16:49 +0100)]
Revert "this is not working. Do you maybe know why?"

This reverts commit 8bcdb9f5f062fe68d90e31752453e1d662b3f0e2.

13 years agothis is not working. Do you maybe know why?
Bernhard Kubicek [Sat, 5 Nov 2011 15:43:44 +0000 (16:43 +0100)]
this is not working. Do you maybe know why?

13 years agochanged end of line to windows, which seems to be the majority of developers main...
Bernhard Kubicek [Sat, 5 Nov 2011 13:19:57 +0000 (14:19 +0100)]
changed end of line to windows, which seems to be the majority of developers main platform.

13 years agomerge from the branch bkubicek/Marlin/zalmmerge
Bernhard Kubicek [Sat, 5 Nov 2011 13:13:20 +0000 (14:13 +0100)]
merge from the branch bkubicek/Marlin/zalmmerge

13 years agoAdded M42, M80 and M81
Erik van der Zalm [Sat, 5 Nov 2011 10:18:52 +0000 (11:18 +0100)]
Added M42, M80 and M81

13 years agoM109 now equal to sprinter
Erik van der Zalm [Fri, 4 Nov 2011 22:38:25 +0000 (23:38 +0100)]
M109 now equal to sprinter

13 years agoAdded thermistor tables
Erik van der Zalm [Fri, 4 Nov 2011 21:51:14 +0000 (22:51 +0100)]
Added thermistor tables

13 years agoMerged Marlin, Marlin non gen6 and Ultimaker changes
Erik van der Zalm [Fri, 4 Nov 2011 17:02:56 +0000 (18:02 +0100)]
Merged Marlin, Marlin non gen6 and Ultimaker changes

13 years agoFixed crashes.
Erik van der Zalm [Tue, 18 Oct 2011 17:13:30 +0000 (19:13 +0200)]
Fixed crashes.

13 years agoSoftware endstps added
Erik van der Zalm [Thu, 15 Sep 2011 15:37:58 +0000 (17:37 +0200)]
Software endstps added

13 years agoMerge branch 'master' of github.com:ErikZalm/Marlin
Erik van der Zalm [Wed, 14 Sep 2011 16:57:32 +0000 (18:57 +0200)]
Merge branch 'master' of github.com:ErikZalm/Marlin

13 years agoSync with non-gen6 version
Erik van der Zalm [Wed, 14 Sep 2011 16:56:45 +0000 (18:56 +0200)]
Sync with non-gen6 version

13 years agoEdited README via GitHub
ErikZalm [Sun, 28 Aug 2011 21:09:18 +0000 (00:09 +0300)]
Edited README via GitHub

13 years agoFixed small feedrate bug.
Erik van der Zalm [Sun, 21 Aug 2011 16:29:47 +0000 (18:29 +0200)]
Fixed small feedrate bug.
Copied Camiels comments in the Configuration.h file

13 years agoFixed lookup table bug.
Erik van der Zalm [Mon, 15 Aug 2011 17:26:40 +0000 (19:26 +0200)]
Fixed lookup table bug.

13 years agoFix M109
Erik van der Zalm [Sun, 14 Aug 2011 20:15:33 +0000 (22:15 +0200)]
Fix M109

13 years agofirst-commit
Erik van der Zalm [Sat, 13 Aug 2011 08:09:54 +0000 (10:09 +0200)]
first-commit

13 years agoSigned-off-by: Erik van der Zalm <erik@vdzalm.eu>
Erik van der Zalm [Fri, 12 Aug 2011 20:31:59 +0000 (22:31 +0200)]
Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
13 years agofirst commit
Erik van der Zalm [Fri, 12 Aug 2011 20:28:35 +0000 (22:28 +0200)]
first commit

13 years agofirst commit
Erik van der Zalm [Fri, 12 Aug 2011 20:23:37 +0000 (22:23 +0200)]
first commit