Commit graph

418 commits

Author SHA1 Message Date
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
David Crocker
92fefbf598 Fixed G32 auto bed compensation
Fixed bug introduced at version 057o-dc42 that broke the G32 bed
compensation. Added the Z heights of the bed compensation points to the
information displayed by M111 S2. Simplified the code that does
Z-probing in fast and slow stages. Added function sncatf and used it to
simplify the code in several places.
2014-03-26 18:07:49 +00:00
David Crocker
aa55c61e1d Changed the way the step ISR decides when to step
Changed the step interrupt service routine to use the average step size
when calculating the step interval, instead of the actual step size
which depend son whether X and Y are moving simultaneously. This should
give smoother movement, because from an inertial point of view the axes
are independent. It also fixes a bug whereby the accelerations were
incorrectly calculated, because DDA::AccelerationCalculation assumes a
uniform step size directly from start point to end point, whereas the
ISR was assuming a zigzag path. Also fixed bug with resetting the
minimum z-probe value seen when using an ultrasonic transducer in
differential mode.
2014-03-25 14:04:11 +00:00
David Crocker
b1558648cb Movement speed fix & ultrasonic z-sensor support
1. Fixed bug whereby the first XY move after a Z move would often be at
a speed much higher than requested.
2. Added support for direct-mode ultrasonic sensor using command M558
P3. Command M558 P4 selects differential-mode ultrasonic sensor.
3. Changed temperature parameter in G31 command from T to S.
2014-03-23 22:26:41 +00:00
David Crocker
9686ae924b ADC correction facility + absolute extruder moves
Added L and H parameters to the M301 and M304 commands to allow SAM3X
ADC offsets to be corrected for. Also attempted a fix for absolute
extruder movement. - but this will still be affected by rounding error.
Removed some old binaries.
2014-03-17 11:29:10 +00:00
Tony
794d0e33c3 Implement M190
Fixed Issue #33
2014-03-10 21:50:47 +00:00
David Crocker
6e37eb7de1 Renamed binary to have correct version number 2014-03-05 21:47:10 +00:00
David Crocker
e848a48e86 Various changes
1. Fixed bug introduced at version 57r whereby axis travel limits were
not applied properly.
2. Increased maximum travel on 2nd phase of Z-probing from 1mm to 10mm
3. Added parameters R (thermistor 25C resistance) and B (thermistor
beta) to M301 command
4. Added support for M304 command with same parameters as M301 command
5. PID and thermistor parameters are now saved to flash memory
2014-03-05 20:02:49 +00:00
Tony
0da2319c67 Fixed Fan to use correct library and range 2014-03-03 20:32:37 +00:00
Tony
6357a827f9 removed erroneous addition to previous commit 2014-03-03 20:16:33 +00:00
Tony
5325195f80 Support For two MCP4461 digipots
Required to support the Duet+ Duex4 or other expansion boards that use a
second MCP4461.
2014-03-03 20:13:24 +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
Tony
799e69dca2 Merge pull request #1 from reprappro/duet
Duet
2014-03-03 00:07:50 +00:00
David Crocker
21d688ece0 Various improvements
Tidied up axis homing tracking.
When checking endstops, wait for move to complete before accepting
further moves, otherwise subsequent moves use the wrong coordinates.
Temperatures and Z probes are now monitored continuously using a tick
interrupt to kick off ADC conversions. ADC is now run in 12-bit mode.
Thermistor readings are passed through averaging filters. Thermistors
are monitored for overheat conditions and bad readings in the tick ISR
and the appropriate heater is turned off (useful because the main loop
sometimes gets suspended while trying to do USB communication).
Use watchdog timer to monitor the tick interrupt - needs patch to
Arduino Due core library. Add facility to test watchdog timer (M111
S1001). Added an error status word to record that errors have occurred
(e.g. over-temperature).
M111 command changes so that S0 turns debug off, S1 turns debug on, S2
reports free memory - also now reports the type of the last restart and
the error status word. Fixed problem whereby M111 debug reports were not
sent to the web interface.
Implemented M999 command, which resets the Duet.
Removed an unused variable.
Changed some more "char*" to "const char*".
Changed extruder PID parameters and added more explanation for them.
2014-03-02 23:26:14 +00:00
David Crocker
2305dc27c9 Fixed cooling fan support (M106 command)
Fixed M106 command so that the cooling fan is controllably by PWM and
works the right way round (0 = off, 1 = on). Also added optional P
parameter to specify the value that corresponds to maximum PWM.
2014-02-25 19:39:16 +00:00
David Crocker
2b7b9fc505 Fixed error with z-homing in previous release
Fixed a random hang after z-homing in the previous release. Also make Z
probe temperature coefficient default to zero always, and Z probe
calibration temperature default to current bed temperature always.
2014-02-25 00:32:04 +00:00
David Crocker
92c17dede2 Various changes relating to zprobe and non-volatile data
1. Z-probing is now done in two stages: a fast stage at the configured
home feed rate until within 10% of the target value, then a slow stage
at 20% of that feed rate.
2. Provisional support for ultrasonic Z-probe.
3. Added calibration temperature and height temperature coefficient to Z
probe parameters.
4. Z-probe parameters and Z-probe type are now saved to flash memory so
that they survive power-off and reset cycles. Separate parameters are
retained for IR and ultrasonic probes in case both are fitted.
5. Fixed issue with doing slow Z-moves immediately after Z-homing or
probing.
2014-02-24 14:17:11 +00:00
Adrian Bowyer
1c749dba9e Continuing with adding comments to .h files 2014-02-23 16:50:58 +00: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
ebfc9bd75b Tidying small errors introduced (deliberately) at the last commit. This one should work. 2014-02-20 23:15:52 +00:00
Adrian Bowyer
ba04363345 Merge branch 'duet' of https://github.com/reprappro/RepRapFirmware into duet 2014-02-20 23:09:35 +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
David Crocker
b43af6a8fd Added 57n binary 2014-02-19 20:28:10 +00:00
David Crocker
1450276081 Fix to DDA acceleration calculation
Fixed problem with DDA acceleration calculation identified by rayhicks
2014-02-18 13:30:40 +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
Adrian Bowyer
1129fa218f Added in David Crocker's improvements (many thanks to him). 2014-02-11 11:23:28 +00:00
David Crocker
acbd556350 Remove debug from Heat.cpp 2014-02-09 00:07:40 +00:00
David Crocker
fe0d5f38ee Improved PID parameters and made them configurable
Implemented M301 command to get/set PID parameters. Improved the PID
parameters and made minor changes to the PID algorithm to improve PID
performance with Ormerod hot end.
2014-02-08 23:52:24 +00:00
David Crocker
2d61bba024 G32 and G92 improvements
1. G92 with a Z value now sets exactly that Z value even if bed
compensation is in effect.
2. If G32 is run before the Z axis is homed, the first bed probe in the
G32 sequence homes the Z axiws.
2014-02-07 23:06:20 +00:00
David Crocker
25ad6c9f85 Further improved web page loading speed
Adjusted TCP MSS and HTTP output buffer sizes to further improve speed
of serving web pages
2014-02-06 21:30:17 +00:00
David Crocker
3e4a22196b Web interface improvements
Increase TCP window size from 1 to 2 packets and increase maximum amount
of web data sent to 1460. This decreases the page load time fro a
Windows client fro 6 seconds to less than 1 second. It also fixes a
problem whereby when using a Ubuntu client, file upload and direct print
didn't work unless the reprap.js file was edited to reduce the maximum
amount of data sent per request. Also we now initialize unused memory
with known data so that in response to the M111 S1 command we can better
estimate the amount of free memory.
2014-02-05 17:58:05 +00:00
David Crocker
0ef9d66ff1 Doing a G30 is equivalent to homing the Z-axis
Now sets the axisIsHomed flag for the Z-axis when a G30 command has been
executed successfully, because that puts the Z-axis at a known height.
2014-02-05 17:50:38 +00:00
David Crocker
41daff3d26 Reverted a buffer size to fix random print hang
Reverted STRING_LENGTH to 1029 to avoid random print hangs that occurred
using 0.57f firmware. Reduced max reported buffer size to fit within
this. Report additional memory usage detail in response to M111 S0.
2014-01-31 17:35:55 +00:00
David Crocker
66c934a791 File upload improvements
Further increased upload speed
When uploading files, preserve comments
2014-01-30 16:24:58 +00:00
David Crocker
362feb24c1 Updated binary and changed its name 2014-01-30 14:32:06 +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
David Crocker
603c0c79c5 Web server direct print support
Speed up web server direct print mechanism so that Matt's web interface
can do direct prints without stuttering
2014-01-29 15:32:10 +00:00
David Crocker
0c47fbc923 Add movement limits
Remember whether each axis has been homed. Don't allow z-homing or G31
procedure unless X and Y have been homed. If axes have been homed, limit
travel to size of bed.
2014-01-29 15:30:58 +00:00
David Crocker
b578dd5bc4 Fix bug with large TCP messages
Fixed buffer size definition so that large TCP messages no longer
overflow the buffer
2014-01-29 15:29:21 +00:00
David Crocker
16c20b1a93 Added ARRAY_SIZE macro 2014-01-29 15:28:07 +00:00
David Crocker
e227dab386 Improvements to support Matt's web interface
Increase incoming web gcode buffer size to 1200 chars to allow more
gcodes to be sent in each message
Include free buffer size in poll response
Include response sequence number in poll response
Implement M30 (delete file) via USB interface
Support M503 and M111 commands via web interface
2014-01-27 18:15:46 +00:00