Commit graph

97 commits

Author SHA1 Message Date
Adrian Bowyer
ad4a451bed Version 0.65b. This version fixes the incompatibility between the
code in the web interface and the firmware.  The web expects to select tool T1
when it changes temperatures.  The firmware now also uses T1.
2014-05-07 18:42:54 +01:00
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
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
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
e66d1cb4ea Merge RRP upstream changes 2014-04-14 20:04:02 +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
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
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
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
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
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
1129fa218f Added in David Crocker's improvements (many thanks to him). 2014-02-11 11:23:28 +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
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
Adrian Bowyer
95a54f763f Macros made so that they can call macros. Beware recursion.... 2014-01-05 16:49:42 +00:00
Adrian Bowyer
387dae22cd P parameter added to M559, so that macros can be uploaded. 2013-12-30 23:09:46 +00:00
Adrian Bowyer
f746616e8c Workround added for bug in Pronterface (it sends 2 M24 commands on second file print). M24 is now ignored if a file
is actively printing.
2013-12-30 17:25:38 +00:00
Adrian Bowyer
71c1571c6c Synchronising duet branch with the mastr branch. 2013-12-27 15:02:04 +00:00
Adrian Bowyer
be1a790c47 Added more efficient canned cycle for when all three axes are being homed. 2013-12-23 21:25:40 +00:00
Adrian Bowyer
c12ebed79c All axis homing now done with canned cycle files. 2013-12-23 18:07:16 +00:00
Adrian Bowyer
10bf338aa4 Homeing after bed transform applied bug fixed in the duet branch. The master branch will be updated after some further testing. The problem was the X endstop. If X is homed, that stop is triggered. Homeing Y then only moves Y, and so only the Y endstop is tested. But when the transform is applied X moves slightly when Y is homed (as it should) and the X endstop stoped the movement prematurely. You will need to update the files on the SD card as well as the firmware to activate the fix. 2013-12-21 16:46:42 +00:00
Adrian Bowyer
4ed66b8b01 Experimental macro/canned-cycle on the SD implemented. 2013-12-19 23:30:23 +00:00
Adrian Bowyer
4feab9afce Homing modified to correspond with Ian's documentation... 2013-12-19 18:53:17 +00:00
Adrian Bowyer
e9539d97f0 Added M27 response. 2013-12-18 16:51:57 +00:00
Adrian Bowyer
e2a2ccc64b Bug whereby heaters would not restart after an M0 is received fixed. 2013-12-17 23:28:57 +00:00
Adrian Bowyer
6f275e0df1 Bug where by selecting an already selected extruder did not reply (eg "ok" to Pronterface) fixed. 2013-12-13 14:49:05 +00:00
Adrian Bowyer
cfdb9dcd89 Dud temperature count now has to reach 6 (about a second) before a heater trips out (Ian's request). Also heater reset M code (M562) added. Use that with great caution. 2013-12-11 14:11:51 +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
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
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
dd978290b5 Emergency stop added to the web interface (and Home All taken away, as you almost never want to home Z with the other two.) SD files tidied. 2013-12-04 15:36:26 +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
27ae5f8730 Fixed (I hope) G92 bug found by Tony. 2013-11-30 17:22:16 +00:00
Adrian Bowyer
dfbc35d369 Bug found by Tony in the offsetting code fixed (I hope). 2013-11-29 23:50:59 +00:00
Adrian Bowyer
f0b7da252b M561 reset bed transform to identity added. 2013-11-29 10:55:43 +00:00
Adrian Bowyer
f9fe813610 Improved functionality for G30; can now be set from pre-recorded
measurements as well as doing live probing (automatic or manual).
2013-11-28 12:54:00 +00:00
Adrian Bowyer
409af6bb11 Manual Z probing added to G30 (see http://reprap.org/wiki/G-code). 2013-11-28 11:57:38 +00:00
Adrian Bowyer
a4d8f41271 G31 now waits for moves to end before measuring/reporting. G30 implemented. Has argument Pn n = 0,1,2 - takes probe reading at current XY and calls them point n for the purpose of bed plane calculation. Add an S field on the last probe (i.e. when n=2 usually, though you can do them in any order) to get it to fit the bed plane. 2013-11-27 22:59:37 +00:00
Adrian Bowyer
7b9894e543 M206 implemented. This commit has the ethernet enabled and heaters set on by 1 (i.e. Duet v0.5 or below). 2013-11-26 15:12:24 +00:00
Adrian Bowyer
c0b7b4bace Working on the ether/USB problem. The network can now be disabled (#define NETWORK in Configuration.h). With it disabled the USB works with or without a network cable plugged in. With it enabled the USB only works with a network cable plugged in too. You have to wait for the ether to reinitialise (ether socket lights go out for a couple of secs, then come on, then the green one starts flashing) before trying to talk via the USB. The ether is initialised before config.g is run, so the IP is the one defined in platform.h. The network is disabled in this commit. The heaters are set on by 0, not 1 (i.e. Duet board v0.6 or later). To change this see #define HEAT_ON in platform.h 2013-11-26 13:38:23 +00:00
Adrian Bowyer
00a0ffd9b4 Homing against max endstop for Y (and X) implemented when there is a top
endstop but not a bottom one.
2013-11-25 11:03:36 +00:00
Adrian Bowyer
0670357001 Merge branch 'duet' of https://github.com/reprappro/RepRapFirmware into duet 2013-11-25 09:33:08 +00:00
Adrian Bowyer
d89b8bace0 X axis endstop now done with Z Probe (if it's activated). 2013-11-25 09:32:13 +00:00
Adrian Bowyer
d4dc6f2cfe M84 added for Pronterface compatibility. 2013-11-23 17:17:59 +00:00