Commit graph

510 commits

Author SHA1 Message Date
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
Tony
eb2645022c Merged RRP Changes 2014-04-14 14:55:18 +01:00
Adrian Bowyer
a44da7774a Bit of tidying... 2014-04-11 21:49:12 +01:00
Adrian Bowyer
6a1031f107 First hack at the Tool class. Implemented, but not yet called. 2014-04-11 21:41:28 +01:00
Adrian Bowyer
61ea528fba Tool class created. This will allow tool definitions with multimple drives and heaters. Blank for the moment... 2014-04-11 16:31:06 +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
cecb22766d This time with the binary file... 2014-04-10 21:44:18 +01:00
Adrian Bowyer
00d236c5ba Temperature A to D readings now done using a moving average, like the Z probe. 2014-04-10 17:22:22 +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
adb6ac3fc6 Fixed z probe averaging code. 2014-04-10 14:25:09 +01:00
David Crocker
009a2045d0 Concurrent HTTP connection support & more
Completed changes to support multiple concurrent HTTP file requests.
Added support for new poll response for future support of additional
heaters and multiple extruders. Fixed a bug in reporting extruder
distance.
2014-04-08 13:20:06 +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
David Crocker
db3f5adda9 Tidied up http/lwip interface
Removed file httpd.c and moved its functions into Network.cpp. This
gives us type-checking across more interface boundaries and eliminates a
number of global functions. Also removed unused files fs.c, fsdata.c,
httpd-original.c.
2014-04-07 13:10:39 +01:00
Tony
f3943dd15e M112 now works
Linked emergency stop routine to M112
2014-04-06 23:50:38 +01:00
Tony
61bfc38979 Merge pull request #37 from T3P3/Emergency_stop
M112 Emergency stop
2014-04-06 23:44:17 +01:00
Tony
81df66e438 M112 now works
Linked emergency stop routine to M112
2014-04-06 23:41:15 +01:00
David Crocker
68e6ed2575 Preliminary version for serving all files for Duet
Changed webserver and network code to support multiple concurrent
connections
Removed support for differential-mode ultrasonic z-sensor
Reduced X and Y instantDv from 15 to 10 mm/sec to allow outlines of
holes to e drawn at lower speed
Changed temperature reading code to give thermistor disconnected reading
of -273C when there is a negative high ADC offset correction
2014-04-06 22:50:24 +01:00
David Crocker
9149a1eb3a Fix M201 issue and support long filenames
When processing an M201 command, leave the acceleration of any axis that
is not specified as the existing value instead of setting it to a silly
value.
Corrected Platform.cpp to work with long filenames - note that this fix
requires a commented-out section of code in file ff.c in the SD_HSMCI
library to be re-instated.
2014-03-28 22:14:46 +00:00