Commit graph

75 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
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
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
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
ebfc9bd75b Tidying small errors introduced (deliberately) at the last commit. This one should work. 2014-02-20 23:15:52 +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
Adrian Bowyer
8ee075289d Updating master branch to include David Crocker's improvements. Plus a little tidying. 2014-01-13 17:07:18 +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
Adrian Bowyer
95a54f763f Macros made so that they can call macros. Beware recursion.... 2014-01-05 16:49:42 +00:00
Adrian Bowyer
71c1571c6c Synchronising duet branch with the mastr branch. 2013-12-27 15:02:04 +00:00
Adrian Bowyer
12de593b41 User-called macro (M98) added. 2013-12-27 15:00:16 +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
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
96818433c6 Making master branch the same as the duet branch. 2013-12-14 12:03:25 +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
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
4c74c4eb30 Upload of reprap.htm implemented (M560). The file must end "<!-- **EoF** -->" without the quotes. 2013-11-20 22:13:23 +00:00
Jean-Marc Giacalone
3b0dd0ec58 Upload of configuration file config.g implemented with M559. 2013-11-20 10:25:44 +00:00
Adrian Bowyer
ec5f5fe536 M503 implemented. Prints the config file to USB. 2013-11-19 16:10:53 +00:00
Adrian Bowyer
21424714f7 File upload mechanism also now works with the web code. If we can open a user's GCode file in the Javascript this will allow web uploads. Horay! See: http://www.html5rocks.com/en/tutorials/file/dndfiles/ 2013-11-18 17:40:14 +00:00
Adrian Bowyer
3dc0c7a27e GCode file upload via USB working. 2013-11-18 15:04:32 +00:00
Adrian Bowyer
965f41e953 Shifted new M codes to start at M550. Added setting of Netmask and gateway. 2013-11-17 22:10:14 +00:00
Adrian Bowyer
104528ab66 Added user-selection of IP address via M502. 2013-11-17 17:58:30 +00:00
Adrian Bowyer
68e0f833df Marlin emulation implemented. Pretty much working, but not extensively tested. 2013-11-14 23:32:50 +00:00
Adrian Bowyer
bd51a7c3f0 Fixed Timer overflow bug. 2013-11-13 23:23:31 +00:00
Adrian Bowyer
f907e2253e All responses to GCodes routed through a single function in the class GCodes
to allow the firmware to emulate how other firmware (e.g. Marlin) responds.  Emulation not yet implemented, but should now be easy.
2013-11-11 17:39:17 +00:00
Adrian Bowyer
971fed0d02 Temperature range checking added (see Configuration.h). If temps repeatedly
fall outside the set range, it assumes the thermistor is bust and turns off the heater.
2013-11-10 21:55:44 +00:00
Adrian Bowyer
e8eafeda22 Hooks added for (I hope) the final and complete set of all parameter-changing
M Codes that we will need.  Network initialisation delayed until after the
config.g file is run, to allow machine name etc to be set from that.
2013-11-10 19:39:13 +00:00
Adrian Bowyer
fa9b0d1478 Fixed small bug that prevented absolute extrude moves working right. 2013-11-06 11:10:26 +00:00
Adrian Bowyer
4f703d86ec Various minor G/M codes implemented like M0. Z start speed and acceleration reduced; they were a bit fierce before. 2013-10-29 22:27:49 +00:00
Adrian Bowyer
708822a54e A couple of tidyings and additions:
1. Z home now moves home, rather than just setting the coordinate.
2. Wait for temps implemented.

Also the JSON requests for the g code filelist has been temporarily commented
out in reprap.htm.  It was causing the firmware to hang sometimes.  To be investigated.

Machine now prints nicely...
2013-10-22 18:27:12 +01:00
Adrian Bowyer
79c008d469 G31 modified to allow reporting of probe values, and setting of a Z value and threshold. (See http://reprap.org/wiki/G-code#G29-G32:_Bed_probing) 2013-10-20 22:48:26 +01:00
Adrian Bowyer
de96171b5d Z probe code improved, but still not there. It now uses hysteresis to
track up the low-precision slope of the IR probe before measuring down
the high-precision slope near 0 mm.  But this means that the probe has to
be set only a fraction of a mm higher than the nozzle itself.  Also (at
the moment for safety) the code thinks Z = 0 occurs when it is actually
0.2mm.  This is easy to fix when the rest is reliable.
2013-10-17 23:18:57 +01:00
Adrian Bowyer
49e9bc29c3 G92 Implemented. Tested interactively, but not from a G Code file. Should work though. 2013-09-27 18:15:49 +01:00
Adrian Bowyer
d525597ebb Z probing being implemented under G32. Not finished yet, so don't call G32... 2013-09-13 22:33:14 +01:00
Adrian Bowyer
e3fd24ca95 Configuration file (in sys/config.g) implemented. 2013-09-05 16:10:44 +01:00
Adrian Bowyer
07d323a41d Setting up latest Due code to work on the Duet. 2013-08-28 16:36:38 +01:00
Adrian Bowyer
7e282c96ea Added serial transmission of GCodes via USB. 2013-08-05 23:45:31 +01:00