Commit graph

510 commits

Author SHA1 Message Date
larsbrubaker
58a56977a3 Moved AABB caching to mesh. 2015-05-01 07:44:57 -07:00
Lars Brubaker
e329cc2631 Merge pull request #246 from jlewin/AtxPowerControl
Revise ATX Power submission from peter1960
2015-04-30 15:51:29 -07:00
John Lewin
875bbb40b0 Revise ATX Power submission from peter1960 2015-04-30 15:46:45 -07:00
Gregory Diaz
ebe5c28614 Merge remote-tracking branch 'origin/development' into development 2015-04-30 15:46:45 -07:00
Lars Brubaker
2eb3c6abaa Made the auto arrange layout on a grid.
Spelling fixes
2015-04-30 15:10:07 -07:00
Gregory Diaz
88cbb22e19 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
Conflicts:
	StaticData/Translations/Master.txt
2015-04-30 09:38:41 -07:00
Lars Brubaker
357505a1cc Put in a wipe before retract feature
Put in an extra extrusion on unretract
2015-04-29 12:12:30 -07:00
Lars Brubaker
b125d62429 Added support material spacing to intermediate level
Made sure we don't throw an exception of bad resend receive.
2015-04-27 17:05:19 -07:00
Lars Brubaker
41d03a2ed5 Made the default profile base have mm for top, bottom, interface and z gap layer
Made the R1 default have mm for top and bottom layer
Made the connection try to always ensure we have a active read write thread
More debugging of printer state
Improved some settings text.
2015-04-27 15:42:31 -07:00
Gregory Diaz
f59840d390 commit with correct versions of agg-sharp and matterslice 2015-04-24 13:32:49 -07:00
Gregory Diaz
ab9c737b81 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
Conflicts:
	StaticData/Translations/Master.txt
	Submodules/agg-sharp
2015-04-24 13:26:44 -07:00
Lars Brubaker
fad6e32e79 Made the slice detail editor work correctly with the new settings. 2015-04-24 13:18:41 -07:00
Lars Brubaker
9ed545ad22 Put in the ability to specify bottom and top layers in mm
Also interface layers and z gap
improved the slice settings layout
improved intermediate settings to be much more useful
Added a new mm setting and improved the optional % editing.
2015-04-24 13:09:25 -07:00
Gregory Diaz
2c5da92c70 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
Conflicts:
	StaticData/SliceSettings/Layouts.txt
2015-04-24 10:40:10 -07:00
Gregory Diaz
13c8091fbc added 'Extruder Wipe Temperature' and "Bed Remove Part Temperature" to Slice Settings 2015-04-24 10:25:03 -07:00
Lars Brubaker
3f7c21135d Working on the ray tracing being an option all the time.
Making the intermediate layout much more intuitive
2015-04-24 10:17:05 -07:00
Lars Brubaker
cd6b1615f6 Refactor 2015-04-22 18:11:47 -07:00
Lars Brubaker
b5d3bb9c04 Got the touch screen to remember tab state.
Got the Options page to remember its state
Fixed a early binding bug in PopOutManager
2015-04-16 13:08:26 -07:00
Lars Brubaker
7370964df5 Put in TAZ 5 settings 2015-04-16 10:00:01 -07:00
Lars Brubaker
f2ee388013 Put in a profile for Huxley 2015-04-15 17:10:43 -07:00
Gregory Diaz
1e78809ff7 added material settings for PrintSpace, Altair 2015-04-14 17:20:58 -07:00
Lars Brubaker
86175bd500 Fixed some strange M190 settings in configs
Made the html widget not show debug
Made the mapping classes not use unsetable temperatures in MatterSlice
2015-04-14 15:27:11 -07:00
Lars Brubaker
ec865af371 new string in Spanish master 2015-04-11 10:50:44 -07:00
Lars Brubaker
3cab6e5395 Shared the PrintActionRow file. 2015-04-09 12:05:05 -07:00
Lars Brubaker
2a2a9c2ebd Merge branch '1.2.2' into development
Conflicts:
	StaticData/PrinterSettings/RoBo 3D/R1/config.ini
2015-04-07 11:25:01 -07:00
Gregory Diaz
2153df7923 Added slice setting update to for Revolution 3D 2015-04-07 10:54:03 -07:00
Gregory Diaz
cb74f82830 Added most recent slice settings update for Revolution 3D 2015-04-07 10:33:02 -07:00
Lars Brubaker
f3bea1bb07 Adding in the touchscreen icons
Fixed the PrintProgressBar to move up and down.
2015-04-06 16:01:57 -07:00
Lars Brubaker
d4453d199b Merge in touch screen code. 2015-04-06 15:39:22 -07:00
Gregory Diaz
b847ed878d Start Gcode changes for robo 2015-04-01 16:06:48 -07:00
Gregory Diaz
154e76c0cb Implemented the new start gcode requested by Robo 2015-04-01 10:23:22 -07:00
larsbrubaker
a47aab9b56 Latest matter slice. 2015-04-01 08:23:31 -07:00
Lars Brubaker
c8a009be25 Made the M2 settings valid.
Put in a starting stl.
2015-03-30 18:16:53 -07:00
Gregory Diaz
1391faad19 added MakerGear to printer white list 2015-03-30 16:39:53 -07:00
Gregory Diaz
95619c6e8e removed all curly brackets from start/end/resume/ gcode and replaced them with square brackets. 2015-03-25 14:31:05 -07:00
Gregory Diaz
95cd04b7b1 Added new settings for all 3D Stuffmaker printers 2015-03-23 12:06:05 -07:00
Gregory Diaz
bb8e6ba3c8 Added most recent 3D Stuffmaker settings for 'Evolution', 'Creator', 'Core'. 2015-03-23 11:04:08 -07:00
Lars Brubaker
c69bce5b39 Merge branch '1.2.2' into development 2015-03-19 14:22:26 -07:00
Gregory Diaz
08c8205f59 Updated settings for all 3D Stuffmaker printers. 2015-03-19 12:31:52 -07:00
Lars Brubaker
bbbbd6a626 Merge pull request #210 from gregory-diaz/1.2.2
Added updated settings sent from 'Revolution 3D' and '3D Stuffmaker'
2015-03-18 13:32:21 -07:00
Gregory Diaz
bb1504d0a3 Added updated settings sent from 'Revolution 3D' and '3D Stuffmaker' 2015-03-18 12:36:44 -07:00
Lars Brubaker
2437948068 Open our gcode files with read right share when only needing read. 2015-03-17 17:43:20 -07:00
Gregory Diaz
c79182c882 Added new settings sent by Revolution 3D to INF3D-AF1-DE and INF3D-AF1-SE profiles 2015-03-16 13:17:35 -07:00
Lars Brubaker
4f8c0742ce Made the com tester able to respond as if it is MarlinFirmware
Took out the ability to print to printer sd card.
    You can still print from sd card)
    You can still save gcode to an sd card
Put in and EXTENSIONS check from firmware
Putting in a URI_GCODE_SEND
2015-03-14 16:00:04 -07:00
Gregory Diaz
2a4e2de6e5 Added new profile for MakerGear M2 2015-03-10 15:48:27 -07:00
Kevin Pope
c5845ecefa Merge pull request #194 from gregory-diaz/development
Development
2015-03-05 17:59:04 -08:00
Lars Brubaker
0ae8c9c861 Changing the way we restore positions in resume gcode. 2015-03-05 10:03:16 -08:00
Lars Brubaker
072a25e0ce Made the resume gcode control if we restore the print position or reset the extruder position. 2015-03-04 17:59:28 -08:00
Gregory Diaz
2465bb4071 Added new German Translation.txt file 2015-03-03 13:20:04 -08:00
Gregory Diaz
50834043b2 Added has_sd_card 'Solidoodle Press' profile 2015-03-02 15:08:55 -08:00