Commit graph

99 commits

Author SHA1 Message Date
David Crocker
f0d7fd5005 Updated SD fles in /sys 2014-07-17 11:01:11 +01:00
David Crocker
57704f033b Merge RRP's 0.78 version and my 0.65k version 2014-07-06 19:57:21 +01:00
Adrian Bowyer
2b96c2b6f6 Version 0.78
Release.
2014-07-03 13:10:36 +01:00
David Crocker
9e1ad597a4 Merge branch 'duet'
Conflicts:
	.gitignore
	Configuration.h
	GCodes.cpp
	GCodes.h
	Heat.cpp
	Heat.h
	Move.cpp
	Move.h
	Platform.cpp
	Platform.h
	RepRapFirmware.cpp
	RepRapFirmware.h
	Reprap.h
	SD-image/sys/config.g
	Webserver.cpp
	Webserver.h
	network/ethernet_sam.c
	network/ethernet_sam.h
	network/httpd.c
2014-06-28 17:58:03 +01:00
Adrian Bowyer
2079714096 Trivial punctuation corrections in English text... 2014-05-12 11:20:27 +01:00
Jean-Marc Giacalone
a4ab3d43be Sample gcode files updated to reflect new tool numbering. 2014-05-09 17:25:36 +01:00
Jean-Marc Giacalone
23c5f47204 Move tool call in config.g to before M92 command. 2014-05-08 15:47:24 +01:00
Jean-Marc Giacalone
5204dfa834 config.g now selects tool head 1 and sets speeds and accelerations. 2014-05-08 11:19:39 +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
Jean-Marc Giacalone
ecb93ffcf6 Merged version065 from duet branch. 2014-04-24 21:44:16 +01: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
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
David Crocker
9edaed4ac1 Further improvements to web upload and tidy-up
Further improved web file upload speed
Dealt with Eclipse code analysis warnings
Made some more functions and parameters const-correct
2014-01-30 14:26:45 +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
95a54f763f Macros made so that they can call macros. Beware recursion.... 2014-01-05 16:49:42 +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
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
96818433c6 Making master branch the same as the duet branch. 2013-12-14 12:03:25 +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
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
ad4246e6af Better version of the ORMAXIS.G file. 2013-12-04 11:53:50 +00:00
Adrian Bowyer
8b76430a9b RRP logo updated. 2013-11-30 15:48:03 +00:00
Adrian Bowyer
f0b7da252b M561 reset bed transform to identity added. 2013-11-29 10:55:43 +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
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
b53832f4ce M92 bug fixed. 2013-11-20 10:41:00 +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
926aabe078 Added z-probe type selection. See M558. 2013-11-19 15:00:23 +00:00
Adrian Bowyer
713a9fb6b1 Line-by-line web file upload added, but causes troub by blitzing http requests; so commented out. Unused pages for first release removed. 2013-11-19 12:14:12 +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
c7286905b2 Ability to specify bed Z probe points added. See M505. 2013-11-15 22:04:52 +00:00
Adrian Bowyer
8b3931c8cf Memory diagnostics added. Mem usage is printed whenever you turn debugging on (even if it is already on). 2013-11-13 18:16:43 +00:00
Adrian Bowyer
b94bb6c811 Added cooling fan control. 2013-11-12 15:53:49 +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
8a8b6eb389 knockout help button now opens new tab on the RepRapPro Firmware documentation page. 2013-10-30 15:32:11 +00:00
Adrian Bowyer
0c7e13a73e Current position boxes added to web interface, and polled along with temperatures. 2013-10-30 15:04:38 +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
5707cc1eea Fixed the file listing bug. Either in the RepRap code, or somewhere in the SD file code, the #define for _USE_LFN is defined as fals for RepRap, true in the library file ff.c. The result is that ff.c tried to write long
file names into a structure created in RepRap that was too short for them.  Result - buffer overflow misery.  For the moment I've commented out the bit of code in ff.c that handles long names (look for the string ******), but this needs to be tracked down and dealt with properly.
2013-10-29 15:42:40 +00:00
Adrian Bowyer
676bbab6a1 Fixed a bug whereby long extrudes simultaneous with short XY moves were constrained by the XY upper velocity and acceleration limits, rather than those for extrusion. Normally you want extrusion to be subservient to XY. But (typically when a retraction is being recovered during an XY move) the extrusion limits should constrain the XY move, not the other way round. 2013-10-27 16:21:21 +00:00
Adrian Bowyer
e1601d7b3f Various bits of code tidying. Lookahead fixed to take account of bed transform (we can no longer assume that Z moves are strictly orthogonal to XY moves, and so their scalar product may be non-zero). All velocities are now in mm/s internally. The GCodes class is responsible for multiplying mm/min by 0.0166667. 2013-10-24 16:53:25 +01: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