nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4898 commits 1 branch 0 tags 103 MiB
Commit graph

4898 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Anderson
15f1c9efb6 Fixed estimated cost 2016-07-25 18:30:35 -07:00
johnlewin
7d35a765d6 Merge pull request #1186 from mmoening/master 
Converted ReloadOemProfiles into a Task
 2016-07-25 17:58:09 -07:00
Matt Moening
7a2f59bb8e Converted ReloadOemProfiles into a Task 2016-07-25 17:41:35 -07:00
johnlewin
9d957dcb8c Merge pull request #1180 from jlewin/master 
Add Load event to ApplicationController
 2016-07-25 17:01:10 -07:00
John Lewin
5d8070cdfd Add Load event to ApplicationController 
- Extract code from Deserialize into ReloadOemProfiles
 - Wire up ReloadOemProfiles to Load event
 - Revert to lowercase oemprofiles.json filename
 - Issue #1179
 2016-07-25 16:50:24 -07:00
johnlewin
f366736a46 Merge pull request #1183 from gregory-diaz/master 
Created M109 test
 2016-07-25 16:31:03 -07:00
johnlewin
025bb2750f Merge pull request #1182 from larsbrubaker/master 
Show the queue options menu on touchscreen
 2016-07-25 16:26:38 -07:00
Greg
3e91f6447e Created M109 test 
- issue #939
 2016-07-25 16:14:19 -07:00
Lars Brubaker
d6c8cb9b04 Merge pull request #1181 from mmoening/master 
Fixed Capitalization errors in oemProfiles.json
 2016-07-25 16:03:05 -07:00
Lars Brubaker
aebfd5b8e7 Show the queue options menu on touchscreen 
also removed the 'Remove All' 'More...' option as it is in the 'Queue...' options.
 2016-07-25 16:02:03 -07:00
Matt Moening
4d84b11706 Fixed Capitalization errors in oemProfiles.json 2016-07-25 15:56:03 -07:00
Lars Brubaker
1db16b7568 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-25 15:32:16 -07:00
Lars Brubaker
0f66e65d52 Merge pull request #1178 from larsbrubaker/master 
Don't shut down the heaters if closing MatterControl while printing f…
 2016-07-25 15:14:37 -07:00
Lars Brubaker
41f140e49a Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-25 15:06:19 -07:00
Lars Brubaker
976482bb93 Don't shut down the heaters if closing MatterControl while printing from SD card. 2016-07-25 15:06:05 -07:00
Lars Brubaker
51c0a3dcc6 Merge pull request #1177 from larsbrubaker/master 
Don't leave the movement controls on .02 when not printing.
 2016-07-25 15:04:39 -07:00
Lars Brubaker
998c06772e didn't click save on this file 2016-07-25 14:58:45 -07:00
Lars Brubaker
d78d0bb944 Don't leave the movement controls on .02 when not printing. 
Now we change them back to 1 when not printing.
 2016-07-25 14:54:25 -07:00
johnlewin
b450156536 Merge pull request #1176 from jlewin/master 
Make DownloadPrinterProfile async, move to MHWebServices
 2016-07-25 14:49:46 -07:00
John Lewin
3e79fb6590 Make DownloadPrinterProfile async, move to MHWebServices 
- Issue  MatterHackers/MCCentral#218
 - Rename function to DownloadPublicProfileAsync
 2016-07-25 14:39:23 -07:00
johnlewin
36947b5cbc Merge pull request #1175 from larsbrubaker/master 
Updated the density for all PLA and ABS settings in the profiles.
 2016-07-25 14:38:39 -07:00
Lars Brubaker
a463f1dbfa Updated the density for all PLA and ABS settings in the profiles. 2016-07-25 14:18:56 -07:00
Lars Brubaker
6c9c6f0965 Merge pull request #1174 from larsbrubaker/master 
Ensure turn off temps on finish print and exit
 2016-07-25 13:33:36 -07:00
Lars Brubaker
bc31533d94 Always rest all extruders on finish print 
Keep track of what extruder is selected
Make sure M104 S[??] with no T sets the current temp tracking
Always reset each
 2016-07-25 12:29:43 -07:00
Lars Brubaker
49f4cde726 Make sure we do replacement on m109->m104 for each extruder unless it is an autotemp setting or a reset. 2016-07-25 12:05:51 -07:00
Lars Brubaker
bedc8225da Merge pull request #1173 from jlewin/master 
Backport improvements from scene_bundle
 2016-07-25 11:14:04 -07:00
John Lewin
9f01abe653 Backport onload event from scene_bundle 2016-07-24 17:26:24 -07:00
John Lewin
208d9b334a Rename Draw events 2016-07-24 16:32:04 -07:00
johnlewin
f53b177ec8 Merge pull request #1172 from jlewin/master 
Refactor for clarity, conciseness
 2016-07-24 08:36:11 -07:00
John Lewin
135b4df7ad Refactor for clarity, conciseness 2016-07-24 08:24:47 -07:00
johnlewin
30ca54f800 Merge pull request #1171 from jlewin/master 
Assign current theme to new printers
 2016-07-24 08:05:52 -07:00
John Lewin
063ac60ec9 Assign current theme to new printers 
- Issue #1158
 2016-07-24 07:48:42 -07:00
John Lewin
1e57909497 Migrate active_theme_index to SettingsKey 2016-07-24 07:45:33 -07:00
Lars Brubaker
90292e476e Merge pull request #1170 from larsbrubaker/master 
Made the profile history page read better.
 2016-07-22 18:06:25 -07:00
Lars Brubaker
42844b0fd2 Fixed test to pass 2016-07-22 18:02:18 -07:00
Lars Brubaker
559c55e875 Merge pull request #1169 from mmoening/master 
Convert Properties.json to Tabs to remain consistent with our standards
 2016-07-22 17:54:51 -07:00
Lars Brubaker
e949c7b52f Made the profile history page read better. 2016-07-22 17:49:03 -07:00
johnlewin
fe6bbbf9e8 Merge pull request #1168 from jlewin/master 
Revise OemSettings.OemProfiles initialization for clarity, async
 2016-07-22 15:27:51 -07:00
Matt Moening
7d7baa4f5a Convert Properties.json to Tabs to remain consistent with our standards 
This also prevents auto formatting from altering the entire file when you edit
 2016-07-22 15:25:21 -07:00
John Lewin
2950df095d Disable breaking test, guard for null on public builds 2016-07-22 15:21:24 -07:00
John Lewin
c797c6e394 Fix broken RetrievePrinterProfileListWorking test 
- Rename RetrievePrinterProfileListWorking to GetPublicProfileList
 2016-07-22 15:01:24 -07:00
John Lewin
4871997976 Revise OemSettings.OemProfiles initialization for clarity, async 
- Define OemProfileDictionary alias to clean up declarations
 - Unify StaticData and WebServices persistence format for OemProfiles
   - Delete allModels.json
   - Add oemprofiles.json
 - Simplify creation of list for SetManufacturers
 - Revise OemProfile loading for async, remove AutoResetEvent
 - Remove PublicProfilesRequest object
 - Use new async MHWebServices.GetPublicProfileList replacement
 - Execute OemProfiles assignment on the UiThread
 2016-07-22 14:52:52 -07:00
John Lewin
6f394c7c1f Make LoadCacheable async 
- Collector func<string> becomes async
 - Propagate async to LoadCacheable callers
 2016-07-22 14:09:25 -07:00
Lars Brubaker
fb23f3cca9 Merge pull request #1167 from larsbrubaker/master 
New test for time parsing.
 2016-07-22 14:08:17 -07:00
Lars Brubaker
e7279aa32f Put in the ability to set how much the perimeter overlap is set to 2016-07-22 14:02:39 -07:00
Lars Brubaker
91f2aff29e Merge pull request #1166 from gregory-diaz/master 
allModels.json with oemProfilesJson
 2016-07-22 13:33:01 -07:00
Lars Brubaker
23a84139ec New test for time parsing. 2016-07-22 13:31:29 -07:00
Greg
bee4bdb35e allModels.json with oemProfilesJson 2016-07-22 13:21:35 -07:00
Lars Brubaker
5058d3af64 Merge pull request #1165 from larsbrubaker/master 
Added tests for new relative time calculator.
 2016-07-22 13:11:42 -07:00
Lars Brubaker
87bfa40f23 Added tests for new relative time calculator. 2016-07-22 12:43:41 -07:00