Commit graph

157 commits

Author SHA1 Message Date
Adrian Bowyer
4104ff461b Version 0.65a. This allows the MAC address for the Duet to be set in config.g (q.v.),
which allows multiple Duets to be on the same network.
2014-05-07 18:17:44 +01:00
Jean-Marc Giacalone
ecb93ffcf6 Merged version065 from duet branch. 2014-04-24 21:44:16 +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
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
ebc6cc393c Merge remote-tracking branch 'origin/duet' into selected_head_changes
Conflicts:
	Platform.h
2014-04-14 15:48:46 -04:00
Tony
e66d1cb4ea Merge RRP upstream changes 2014-04-14 20:04:02 +01:00
Tony
eb2645022c Merged RRP Changes 2014-04-14 14:55:18 +01: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
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
1129fa218f Added in David Crocker's improvements (many thanks to him). 2014-02-11 11:23:28 +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
Tony
34a63f9968 Merge remote-tracking branch 'upstream/duet' into duet 2014-01-14 21:03:02 +00:00
David Crocker
618304c021 Support for modulated IR sensor
Add code to support sensors that allow the IR output to be modulated, to
reduce the sensitivity to ambient IR. Use M558 P2 command to enable
sensor modulation. Also changed the sensor reading averaging code to
give more consistent z-height seeking.
2014-01-14 19:03:42 +00:00
Adrian Bowyer
8ee075289d Updating master branch to include David Crocker's improvements. Plus a little tidying. 2014-01-13 17:07:18 +00:00
Adrian Bowyer
14b247053f Removed legacy support for Duet v0.4 heaters. Last commit before changes to max velocity code. 2014-01-13 15:04:00 +00:00
David Crocker
ee70ee22ed Improve performance of SD card upload via USB
This change approximately doubles the speed of SD-card uploading via USB
to 2.2Mbyte/sec on the test system, provided that Pronterface has been
patched to not wait for an acknowledgement after sending each line of
g-code.
2014-01-12 16:02:49 +00:00
David Crocker
c09afc035b Fixed slow printing over USB
Fixed printing over USB and via HTTP so that it uses the same lookahead
mechanism as for printing from SD provided the data arrives fast enough.
Added an incoming buffer for data arriving from USB. NOTE: Pronterface
needs to be patched  to send the data fast enough for this to work well.
Also changed signatures of some member functions to be const-correct
2014-01-11 20:56:53 +00:00
David Crocker
1e444839e0 Improved network recovery from errors and fixed small temp cal error
Improved network error recovery so that it it possible to reconnect
after some types of network error have occurred
Corrected calculation of temperatures to give more accurate results
towards the limits of the ADC range
2014-01-07 13:42:30 +00:00
Tony
93990445a7 Merge remote-tracking branch 'upstream/duet' into duet 2014-01-07 01:48:44 +00:00
Adrian Bowyer
e12bb99d2f Thermistor updates applied to the duet branch. 2014-01-06 21:50:35 +00:00
Adrian Bowyer
522ffffd9b Comment updated to reflect new thermistor values. 2014-01-06 21:41:24 +00:00
Adrian Bowyer
8a648bd31e Improved thermistor beta values. 2014-01-06 21:08:15 +00:00
Tony
676ba30dc9 Merge remote-tracking branch 'upstream/duet' into duet 2014-01-03 23:16:55 +00:00
Adrian Bowyer
a34c8ed79e Bringing M24 Pronterface bug workround to master branch. 2014-01-03 22:36:16 +00:00
Adrian Bowyer
ef7e528bad README updated to include compile instructions. 2013-12-30 18:43:26 +00:00
Adrian Bowyer
ed16ce9682 Updating master branch to bring in homing improvements from the duet branch. 2013-12-23 21:42:58 +00:00
Adrian Bowyer
c12ebed79c All axis homing now done with canned cycle files. 2013-12-23 18:07:16 +00:00
Adrian Bowyer
96818433c6 Making master branch the same as the duet branch. 2013-12-14 12:03:25 +00:00
Adrian Bowyer
26f26affc2 Build volume made less conservative (now 220x200x200). 2013-12-14 11:51:10 +00:00
Adrian Bowyer
386e3e03cd Default steps/mm set for new pulleys. 2013-12-13 15:00:44 +00:00
Adrian Bowyer
7215696e8b Function added to set hypotenuse lengths for multi-axis steps. These were previously computed on initialisation, but are now re-done after every M92. 2013-12-07 18:56:56 +00:00
Tony
7cd9c49a43 Merge remote-tracking branch 'upstream/duet' into duet 2013-12-07 15:12:21 +00:00
Adrian Bowyer
91efcc4e48 M82 changed so that it reports steps/mm when given no arguments. 2013-12-06 20:56:08 +00:00
Adrian Bowyer
c6021aba5f Snowman tested... 2013-12-05 21:33:02 +00:00
Adrian Bowyer
92a48d2ec3 Snowman added to G Codes... 2013-12-05 21:32:08 +00:00
Adrian Bowyer
869373a546 Corrected heater flag in Platform.h for Duet v0.6 (wrong in previous commit...) 2013-12-05 17:34:42 +00:00
Adrian Bowyer
2022e8ab28 Various bits of file tidying... 2013-12-05 17:24:53 +00:00
Adrian Bowyer
d29058cf9d Bug in Z probing (the Move class had no function to return the number of probe points) fixed. 2013-12-05 13:22:01 +00:00
Adrian Bowyer
fd2cee2076 This time with th heater set correctly... 2013-12-04 15:38:05 +00:00
Adrian Bowyer
ad4246e6af Better version of the ORMAXIS.G file. 2013-12-04 11:53:50 +00:00
Adrian Bowyer
1a8ffb2d00 Second degree (ruled quadratic surface) bed plane compensation added. Probe three points to get plane compensation. Probe 4 [0 = min, 1 = max: (x0, y0), (x0, y1), (x1, y1), (x1, y0) in that order] to get second degree compensation. Also M115 print version added. 2013-12-03 14:46:28 +00:00
Adrian Bowyer
820b17857a This time with correct heater settings... 2013-12-03 09:56:27 +00:00
Adrian Bowyer
bfb02c8fb5 README updated to include library details and links to documentation. 2013-12-03 09:55:00 +00:00
Tony
64cb9e382c Merge remote-tracking branch 'upstream/duet' into duet 2013-11-30 17:30:14 +00:00