Commit graph

3200 commits

Author SHA1 Message Date
Lars Brubaker
4aedfbedd6 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2015-12-03 13:55:09 -08:00
Lars Brubaker
82126ec7e5 Made more stream base classes to help with tracking position
Made a proxy class.
Made all position tracking streams keep track of the authoritative printer
2015-12-03 13:54:18 -08:00
johnlewin
8dba12d975 Merge pull request #470 from jlewin/master
Update for xbuild
2015-12-03 10:46:14 -08:00
John Lewin
c1e144d467 Update for xbuild 2015-12-03 10:40:13 -08:00
Lars Brubaker
0dc24d357a Show the offset for adjustment height
Don't try to heat if we are below a given temp.
2015-12-03 10:15:59 -08:00
Lars Brubaker
d81224de7a Support drag and drop onto the settings widget will still add to queue. 2015-12-02 18:51:33 -08:00
Lars Brubaker
b7a0dff005 Made baby steps change to 5mm after the first layer
Made streams out of extrusion multiplier and feed rate multiplier
2015-12-02 18:33:25 -08:00
Lars Brubaker
3c76bb5368 Make sure we record what temp to go to for the bed. 2015-12-01 17:33:59 -08:00
Lars Brubaker
ab4873a67e Report state of bed and extruder. 2015-12-01 16:48:00 -08:00
Lars Brubaker
edb0faa002 Took out dead code (GCodeFileProxy.cs)
Took out trying to time the last instruction (not required with path max sizing).
2015-12-01 16:36:15 -08:00
Lars Brubaker
ea13ab5f76 Fixed the settings properties file with a closing brace. 2015-12-01 16:16:29 -08:00
Lars Brubaker
0142ed1a01 latest agg and ms 2015-12-01 16:09:53 -08:00
Lars Brubaker
90882bf2a8 Merge branch 'master' of https://github.com/MatterHackers/MatterControl
Conflicts:
	SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
	Submodules/agg-sharp
2015-12-01 16:08:50 -08:00
Lars Brubaker
88a00079a2 Made all the streams disposable
Made them get disposed
The leveling stream seems to be working.
2015-12-01 14:49:50 -08:00
Lars Brubaker
c62cf36818 Working to move the print leveling into a stream 2015-12-01 14:18:01 -08:00
Lars Brubaker
63fc87fee2 Put in the actual fix. 2015-12-01 12:05:24 -08:00
Lars Brubaker
340dc21c86 Better checking of if at temp. And a time to wait for temp. 2015-12-01 11:50:53 -08:00
Lars Brubaker
f72219113c Put in request temperature stream for changing m109 into m104 2015-11-30 19:42:35 -08:00
johnlewin
e920dbbe3d Merge pull request #469 from gregory-diaz/master
Master
2015-11-30 17:13:31 -08:00
Gregory Diaz
e59fc5a836 revising pause on print 2015-11-30 17:12:39 -08:00
Gregory Diaz
48cb8927cd Pause on layer semi-completed 2015-11-30 16:50:53 -08:00
John Lewin
6397c7b70f Pause on layer 2015-11-30 16:50:52 -08:00
Lars Brubaker
e3dbb19c2b Tracking the unleveled and the absolute position of the printer separately 2015-11-30 12:26:55 -08:00
larsbrubaker
01c3e3b820 Made the CreateMovmentLine create the minimum line required
Fixed the understanding of feedrate in MaxLengthStream
Wrote test for MaxLengthStream
Renaming for clarity
2015-11-29 23:15:47 -08:00
larsbrubaker
3887662a5a Enabled baby stepping in the adjustment controls. 2015-11-29 08:31:02 -08:00
larsbrubaker
e854ae13df Taking out unused functions that have been replaced by the gcode stream 2015-11-29 07:48:48 -08:00
larsbrubaker
4287330f45 Max length steam is now working
Baby Stepping stream working better.
2015-11-29 07:42:10 -08:00
larsbrubaker
3293e2e9e4 Merge remote-tracking branch 'origin/master' into BabySteps 2015-11-28 20:00:00 -08:00
larsbrubaker
39c8603ae4 Merge remote-tracking branch 'origin/1.4.1' into BabySteps 2015-11-28 19:59:35 -08:00
larsbrubaker
a66fe85bfa Made separate files for all the gcode streaming classes.
Got more of them hooked up and working.
More of baby steps is implemented.
Wrote a new max length stream.
2015-11-28 19:59:14 -08:00
larsbrubaker
cbb704d7b0 made a new gcode stream that only implements Line
working to implement baby steps (and other line processing)
2015-11-28 07:46:57 -08:00
larsbrubaker
c8b126ef67 Fixed the macro window to grow in y 2015-11-27 16:34:36 -08:00
johnlewin
5c1b5d6f42 Merge pull request #468 from jlewin/master
Latest agg
2015-11-25 14:47:21 -08:00
John Lewin
627b557bc8 Latest agg 2015-11-25 14:45:44 -08:00
johnlewin
411151e692 Merge pull request #467 from gregory-diaz/1.4.1
changed default infill over lap to .2 for SeeMeCNC Orion
2015-11-24 16:51:32 -08:00
Gregory Diaz
ab6af5ea4e changed default infill over lap to .2 for SeeMeCNC Orion 2015-11-24 16:43:57 -08:00
johnlewin
8a59fa36a1 Merge pull request #465 from gregory-diaz/1.4.1
Printer profile changes and Wanhao manufacturer name change
2015-11-24 14:42:38 -08:00
Gregory Diaz
ce6f60efe3 Printer profile changes and Wanhao manufacturer name change 2015-11-24 14:40:05 -08:00
Lars Brubaker
0f1f933de5 Merge pull request #464 from unlimitedbacon/master
keep track of position after G2 and G3 commands
2015-11-23 17:28:03 -08:00
Tyler Anderson
53a6dcb01f keep track of position after G2 and G3 commands 2015-11-23 16:31:14 -08:00
Lars Brubaker
319615026c latest agg. 2015-11-23 16:05:00 -08:00
Lars Brubaker
26e781e302 also ask the printer for its position on startup. 2015-11-23 16:04:27 -08:00
Lars Brubaker
d49739f490 Make sure we ask for position after auto bed level.
Make sure we always show the known position of the printer when we re-build the display.
2015-11-23 15:45:35 -08:00
Lars Brubaker
5b13fc9c5a Put in position reporting and a new utility class to limit the rate we call a function. 2015-11-23 13:08:21 -08:00
johnlewin
d94b62ff12 Merge pull request #463 from gregory-diaz/1.4.1
Modified code so that we can include the shop button on Android builds
2015-11-23 13:05:37 -08:00
Gregory Diaz
108507aded Modified code so that we can include the shop button on Android builds 2015-11-23 13:04:16 -08:00
Lars Brubaker
0587fb2d23 ran code maid. 2015-11-23 10:49:08 -08:00
Lars Brubaker
f73d3b7eb9 latest ms 2015-11-20 17:28:57 -08:00
Lars Brubaker
743e8c70ab latest ms 2015-11-19 18:02:40 -08:00
johnlewin
fa7b0421e1 Merge pull request #462 from jlewin/master
Add .vs/ to ignore file
2015-11-19 17:18:46 -08:00