tschwery/reprapfirmware-dc42
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
311 commits 3 branches 0 tags 52 MiB
Commit graph

311 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jean-Marc Giacalone
ecb93ffcf6 Merged version065 from duet branch. 2014-04-24 21:44:16 +01:00
Adrian Bowyer
d44d715526 Version 065. Merged in Tony's stuff. Added M code to allow machine to move outside the box. 
Added code to parse argument lists like G1 X10 E1.5:3.2:-2
 2014-04-15 16:20:13 +01:00
Adrian Bowyer
4fa348306a Merge branch 'duet' of https://github.com/reprappro/RepRapFirmware into duet 
Conflicts:
	GCodes.h
 2014-04-15 16:17:15 +01:00
Adrian Bowyer
27191db607 Code to handle lists of parameters added to GCodes. 2014-04-14 22:53:23 +01:00
Tony
66f783e070 Merge pull request #40 from T3P3/Multi_extruder_support 
Multi extruder support
 2014-04-14 21:48:50 +01:00
Tony
72005e7322 corrected merge error 
Also added re-compiled binary
 2014-04-14 16:45:07 -04:00
Tony
eccdef5709 M160 implemented 
/*Fixed to work with multiple concurrent extruder drives:
*  Default or M160 S1 (set use only one extruder drive)
*    "G1 En.n" adds the float n.n to the move buffer for the selected
head
*  There is no change in behaviour for one extruder drive setups, or
multiple extruder
*  setups where only one drive is used at any one time.
*
*  M160 Sn (set to use "n" extruder drives) eg
*    "M160 S3"
*    "G1 En.n:m.m:o.o" adds the floats to the move buffer in the
following way:
*      moveBuffer[AXES+selectedHead) = n.n
*      moveBuffer[AXES+selectedHead+1) = m.m
*      moveBuffer[AXES+selectedHead+2) = o.o
*    so if selectedHead=0 move buffer ends up looking like this for a 5
extruder drive setup:
*    {x.x, y.y, z.z, n.n, m.m, o.o, 0.0,0.0, f.f}
*    where x,y,z are the axes and f is the feedrate.
*    If selected head > 0 then there is the possibility that more drives
can be set than
*    exist, in that case the last values are discarded e.g:
*    "T3"
*    "M160 S3"
*    "G1 En.n:m.m:o.o"
*    would leave the move buffer on a 4 extruder drive setup looking
like this:
*    {x.x, y.y, z.z, 0.0, 0.0, 0.0, n.n,m.m, f.f}
*/
 2014-04-14 16:22:11 -04:00
Tony
a0193d0197 Merge pull request #30 from T3P3/FanFix 
Fan fix
 2014-04-14 20:56:27 +01:00
Tony
80e2d52713 merging upstream changes 2014-04-14 15:55:41 -04:00
Tony
65e82a44ec Merge pull request #28 from T3P3/selected_head_changes 
Selected head changes
 2014-04-14 20:49:37 +01:00
Tony
ebc6cc393c Merge remote-tracking branch 'origin/duet' into selected_head_changes 
Conflicts:
	Platform.h
 2014-04-14 15:48:46 -04:00
Tony
9623a20827 Merge remote-tracking branch 'upstream/duet' into duet 
Conflicts:
	GCodes.cpp
 2014-04-14 15:46:12 -04:00
Tony
09a9f50ede Merge branch 'T3P3-selected_head_changes' into selected_head_changes 
Conflicts:
	GCodes.cpp
 2014-04-14 15:36:40 -04:00
Tony
e66d1cb4ea Merge RRP upstream changes 2014-04-14 20:04:02 +01:00
Tony
36dba7f895 Merge pull request #29 from T3P3/Multiple_Digipots 
Multiple digipots
 2014-04-14 14:56:04 +01:00
Tony
eb2645022c Merged RRP Changes 2014-04-14 14:55:18 +01:00
Adrian Bowyer
a44da7774a Bit of tidying... 2014-04-11 21:49:12 +01:00
Adrian Bowyer
6a1031f107 First hack at the Tool class. Implemented, but not yet called. 2014-04-11 21:41:28 +01:00
Adrian Bowyer
61ea528fba Tool class created. This will allow tool definitions with multimple drives and heaters. Blank for the moment... 2014-04-11 16:31:06 +01:00
Adrian Bowyer
e14d2de613 Fixed bug whereby pausing a print then starting a new one failed to close the old GCode file. 2014-04-11 16:12:37 +01:00
Adrian Bowyer
cecb22766d This time with the binary file... 2014-04-10 21:44:18 +01:00
Adrian Bowyer
00d236c5ba Temperature A to D readings now done using a moving average, like the Z probe. 2014-04-10 17:22:22 +01:00
Adrian Bowyer
33cf94e0cf Z probe averaging fixed. Loop timer added (try M122). Code reverted to the point where it worked... 2014-04-10 15:56:47 +01:00
Adrian Bowyer
adb6ac3fc6 Fixed z probe averaging code. 2014-04-10 14:25:09 +01:00
Adrian Bowyer
cced20f303 Merge branch 'duet' of https://github.com/reprappro/RepRapFirmware into duet 
Conflicts:
	Platform.h
 2014-04-07 22:20:21 +01:00
Adrian Bowyer
17b533fe2e Incorporating some of dc42's enhancements. This compiles BUT IT HASN'T BEEN TESTED. Use with extreme caution. 2014-04-07 22:15:19 +01:00
Tony
f3943dd15e M112 now works 
Linked emergency stop routine to M112
 2014-04-06 23:50:38 +01:00
Tony
61bfc38979 Merge pull request #37 from T3P3/Emergency_stop 
M112 Emergency stop
 2014-04-06 23:44:17 +01:00
Tony
81df66e438 M112 now works 
Linked emergency stop routine to M112
 2014-04-06 23:41:15 +01:00
Tony
794d0e33c3 Implement M190 
Fixed Issue #33
 2014-03-10 21:50:47 +00:00
Tony
0da2319c67 Fixed Fan to use correct library and range 2014-03-03 20:32:37 +00:00
Tony
6357a827f9 removed erroneous addition to previous commit 2014-03-03 20:16:33 +00:00
Tony
5325195f80 Support For two MCP4461 digipots 
Required to support the Duet+ Duex4 or other expansion boards that use a
second MCP4461.
 2014-03-03 20:13:24 +00:00
Tony
2f23e4a2f5 clean up a comment 2014-03-03 19:49:28 +00:00
Tony
63ea3b0554 Check for the Selected head (selected tool). 
This will allow for multi extruder printing support in future pull
requests. It works fine for single extruder setups as well as the
selected head is always E0.
 2014-03-03 19:39:39 +00:00
Tony
799e69dca2 Merge pull request #1 from reprappro/duet 
Duet
 2014-03-03 00:07:50 +00:00
Adrian Bowyer
1c749dba9e Continuing with adding comments to .h files 2014-02-23 16:50:58 +00:00
Adrian Bowyer
a91f650dd9 Now that a number of people are working on this code, I have been going 
through making the comments more copious, especially in the .h files.
W.I.P.
 2014-02-21 16:39:02 +00:00
Adrian Bowyer
ebfc9bd75b Tidying small errors introduced (deliberately) at the last commit. This one should work. 2014-02-20 23:15:52 +00:00
Adrian Bowyer
ba04363345 Merge branch 'duet' of https://github.com/reprappro/RepRapFirmware into duet 2014-02-20 23:09:35 +00:00
Adrian Bowyer
fedd74750f This commit DOESN'T WORK. Use the next one or the previous one. This is an intermediate commit done merely to facilitate the moving of files between machines. 2014-02-20 21:22:25 +00:00
Adrian Bowyer
3c02c4c104 Updated reprap.htm 2014-02-18 11:25:47 +00:00
Adrian Bowyer
c5d6085772 Added in iamburney's web interface (many thanks to him). 2014-02-11 12:14:59 +00:00
Adrian Bowyer
1129fa218f Added in David Crocker's improvements (many thanks to him). 2014-02-11 11:23:28 +00:00
Adrian Bowyer
cc730a8013 Experimental version of Move.cpp... 2014-01-24 12:53:07 +00:00
Adrian Bowyer
0ea1b57328 First implementation of the optimised maximum speed in any direction code. This is still buggy. To print with, use the previous release. 2014-01-16 17:49:59 +00:00
Adrian Bowyer
a0387cd020 Reduced SD start delay to 5ms. Put David's check in for thermistor disconnected. 2014-01-16 16:32:37 +00:00
Adrian Bowyer
eaeadd174b Merging David Crocker's latest changes and fixes. 2014-01-15 17:03:10 +00:00
Adrian Bowyer
aa8d3a5196 Merge branch 'duet' of https://github.com/dc42/RepRapFirmware into duet 2014-01-15 15:57:28 +00:00
David Crocker
3e8cfd7355 New binary built from previous committed sources 2014-01-15 14:16:51 +00:00