Commit graph

478 commits

Author SHA1 Message Date
Adrian Bowyer
7a78c5ecde More trivial text corrections... 2014-05-12 11:24:29 +01:00
Adrian Bowyer
2419b6825c More text corrections... 2014-05-12 11:23:12 +01:00
Adrian Bowyer
2079714096 Trivial punctuation corrections in English text... 2014-05-12 11:20:27 +01:00
Adrian Bowyer
8e1e9cda4e Merge branch 'master' of https://github.com/reprappro/RepRapFirmware 2014-05-10 10:42:29 +01:00
Adrian Bowyer
15c2b8e176 Correct version number in the .bin file. 2014-05-10 10:41:31 +01:00
Jean-Marc Giacalone
a4ab3d43be Sample gcode files updated to reflect new tool numbering. 2014-05-09 17:25:36 +01:00
David Crocker
b7701832bc Made MAC address depend on IP address
Made the last 4 bytes of the MAC address the same as the IP address so
that multiple Duets can be connected on the same network
2014-05-09 07:39:22 +01:00
Adrian Bowyer
e796a7466a Version 0.65d.
There were some bugs that surfaced if one tried to set variables (like accelerations) for extruders
if no tool had been selected.  Those should be fixed here so
that attempting such things now sets parameters for the first extruder drive if
no tool has been selected.
2014-05-08 22:33:29 +01:00
Adrian Bowyer
ea86fe1c5a Merge branch 'master' of https://github.com/reprappro/RepRapFirmware 2014-05-08 21:24:08 +01:00
Adrian Bowyer
dfeed15d53 Version 0.65c. The way that the Webserver class responds to a poll request
has been altered to send the X, Y, Z, and E coordinates first, followed by temperatures.
It was the other way round.  This led to compatibility problems between versions as
the experimental multiple tool versions (duet branch V0.70+) report many temperatures
and this was confusing the X Y Z stuff if the temps came first.  We can only realistically have one
live version of reprap.js (served from RepRapPro's Github to all running machines), so reprap.js
now expects coordinates first, and both this master version and all future master and experimental
versions will do that.
2014-05-08 21:17:14 +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
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
David Crocker
ceae4df7a1 Fix jerky SD card printing when no network cable
Fixed problem whereby gcode files printed from SD card that used lots of
small fast moves in sequence would print jerkily if a network cable had
not been connected since reset.
Fixed problem whereby object height and filament needed were not
retrieved from the SD card file to be printed if the filename contained
spaces.
Added support for deprecated M190 command, because slic3r appears to
generate it sometimes
Added support for M564 command to allow movement without limits, copied
from RepRapPro dev branch
2014-05-05 18:47:22 +01:00
David Crocker
6c1aeb0277 Close file if necessary after network error
If a network error occurs when sending a file, we now close that file,
otherwise we would use up open file entries. Also added number of
available open file entries to M111 S2 command.
2014-05-02 20:37:57 +01:00
David Crocker
11bb293b10 Fixed file handling for pause/resume
Fixed bug in file handling that affected SD card pause/resume
operations. Merged changes from zombiepantslol to allow a height to be
set for a Z endstop switch. Reverted to blocking USB I/O but only for
debug and M503 output. Added return codes for file close and seek
operations. Increased the size of the tail of the file that we scan for
G1 Z commands from 32K to nearly 200K.
2014-05-01 01:49:37 +01:00
dc42
c784faa569 Merge pull request #2 from zombiepantslol/duet
Fixed G31 for Z endstop switch
2014-04-30 17:03:42 +01:00
zombiepantslol
dbb2a442a1 Fixed G31 for Z endstop switch 2014-04-30 15:37:42 +02:00
David Crocker
406a0c074f Fixed nested file bug, other minor changes
Fixed a bug when one file was called from another
M111 S2 command now displays time since last reset
M106 'I' parameter now only inverts fan PWM when >0
Non-homing moves when bed probing are now done at max speed
M999 reset command now delays 0.5 second to allow response to be sent
back to browser, otherwise it may retry the reset
2014-04-29 23:21:31 +01:00
dc42
81b213752b Merge pull request #1 from zombiepantslol/duet
Added new "I" parameter to M106
2014-04-29 19:02:20 +01:00
dc42
544a946c99 Delete RepRapFirmware-058a-dc42.bin 2014-04-28 01:15:02 +01:00
dc42
c0edfe5b4d Delete RepRapFirmware-058b-dc42.bin 2014-04-28 01:14:47 +01:00
David Crocker
a8e9029478 Work around SDHC stack bug
Reduced block read size when retrieving file info to work around an
intermittent bug that causes the SDHC card/ FATfs stack to return data
from the wrong sector sometimes. Tidied up some other code.
2014-04-28 01:13:00 +01:00
David Crocker
f06527f67b Fix for slic3r 1.1.1
Changed code that looks for G1 Z commands to find object height, so that
it ignores G1 Z commands in the end-of-file comments added by slic3r
1.1.1
Increased max number of open files
2014-04-27 10:01:04 +01:00
zombiepantslol
fe72890dad Added new "I" parameter to M106. Any non-zero value will invert the cooling fan PWM value. 2014-04-26 16:34:12 +02:00
David Crocker
2e154a3e91 Various
Added new variable "extr" in Json response to report extruder positions
Added new fileinfo request type, returns file size, object height, and
total filament needed (if available)
Fixed bug in returning last command response in Json response
Disable interrupts when adding/removing network request structs from
linked lists, in case lwip does callbacks from ISR contexts
2014-04-25 23:15:17 +01:00
David Crocker
74bb951934 Added another patched Arduino core file 2014-04-25 19:43:33 +01:00
David Crocker
05a1f81167 Added patched Arduino 1.5.4 core files 2014-04-25 15:03:12 +01:00
Jean-Marc Giacalone
ecb93ffcf6 Merged version065 from duet branch. 2014-04-24 21:44:16 +01:00
dc42
30e445b585 Delete RepRapFirmware.bin
Deleted obsolete firmware files because some people were downloading them from this branch instead of from the Duet branch.
2014-04-24 12:20:48 +01:00
dc42
e8f6fc013d Delete RepRapFirmware-053-06-01-2014.bin 2014-04-24 12:19:47 +01:00
David Crocker
d9c9fa8f59 Network startup & other changes
Changed network startup to avoid long delay if no network cable is
connected
Enable DHCP support if IP address is configured as 0.0.0.0 (not working
yet)
Move thermistor parameters to M305, added parameter to configure series
resistance
Added B and W PID parameters
2014-04-19 14:14:54 +01:00
David Crocker
0c85453ace Added libs; prepare network startup change
Added the libraries to the repository
Preliminary changes to fix slow startup when no network cable is
connected
2014-04-18 21:06:16 +01:00
David Crocker
f709cd082d Fixed USB output bug; added M80/M81 commands
Fixed problem with garbled USB output sometimes seen using version 057za
Added support for M80 and M81 commands
2014-04-16 10:35:40 +01:00
David Crocker
aaf6f7128e Better USB error recovery and diagnostics
Firmware now recovers from USB disconnection without halting. Needs
changes to Arduino core library.
Added a timeout in the Spin() functions, which causes diagnostic info to
be stored and the system to be reset if a Spin() function takes more
than 20 seconds.
2014-04-16 00:00:45 +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