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

5808 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
e6c34a9eff Merge pull request #1661 from mmoening/master 
Send reset line number command on connect
 2016-11-29 16:23:25 -08:00
Matt Moening
2cdca4860d Send reset line number command on connect 2016-11-29 16:05:30 -08:00
Lars Brubaker
a0b6fb4ffa Merge pull request #1659 from larsbrubaker/master 
Make sure we try to send commands while attempting to connect.
 2016-11-29 15:18:18 -08:00
Lars Brubaker
2476b1d1f2 Make queued commands parse as they are sent. 2016-11-29 15:14:38 -08:00
Lars Brubaker
f6d30fefaa Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-11-29 14:58:36 -08:00
Lars Brubaker
3928538f22 Make sure we try to send commands while attempting to connect. 2016-11-29 14:58:24 -08:00
Lars Brubaker
8acbe77fd6 Merge pull request #1658 from larsbrubaker/master 
Load and Unload Macros working better
 2016-11-29 14:44:56 -08:00
Lars Brubaker
7c9128c01c Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-11-29 14:18:03 -08:00
Lars Brubaker
06b1512698 Load and Unload Macros working better. 
Fixed colors on redeem purchase disabled button
 2016-11-29 14:17:37 -08:00
Tyler Anderson
f85a741cd9 Fixed more line endings for Smoothie compatability 2016-11-29 14:07:37 -08:00
johnlewin
9dd2896fd3 Merge pull request #1656 from mmoening/NetworkedPrinting 
Networked printing
 2016-11-29 12:22:19 -08:00
Matt Moening
b6d34bcdf7 Converted hard coded strings to SettingsKey 2016-11-29 12:17:36 -08:00
Matt Moening
701dd0bf48 Added Network Printing checks in Edit Printer Settings Page 2016-11-29 10:57:44 -08:00
Matt Moening
025b135a7d Extracted network printing check into function 
- check network printing is enable during serial port availability checking
 - check nwp is enabled before Attempt to Connect
 2016-11-29 10:57:44 -08:00
Matt Moening
91121651cb Updating slice setting save to Use ActiveSliceSettings.Instance 2016-11-29 10:57:44 -08:00
Matt Moening
60b3fe5133 Networked Printing enabled in MC 
- Added properties to enable s3g coms, enable networked communication, store IP and port
 - updated Settings on Change to be a dictionary that stores what they are changing and how to do it
 - added handling in check box for SettingsOnChange
 - SerialPortIsAvailable returns true when networked printing is enabled
 - Engine mapping base updated for new properties
 2016-11-29 10:57:44 -08:00
johnlewin
e78c013fdb Merge pull request #1653 from larsbrubaker/master 
Always printing merge
 2016-11-28 17:31:09 -08:00
Lars Brubaker
a241888635 Merge branch 'AlwaysPrinting' 
# Conflicts:
#	PrinterCommunication/PrinterConnectionAndCommunication.cs
#	StaticData/Translations/Master.txt
#	Submodules/MatterSlice
 2016-11-28 17:10:06 -08:00
johnlewin
75e244a7e5 Merge pull request #1652 from larsbrubaker/master 
Don't send G4 dwell while wating to reach temp.
 2016-11-28 16:32:12 -08:00
Lars Brubaker
a24b54f149 Merge branch 'master' into master 2016-11-28 16:18:36 -08:00
Lars Brubaker
56e56ded99 Merge pull request #1651 from jlewin/master 
Auto select make if only one, remove release notes, add files to csproj
 2016-11-28 16:18:27 -08:00
Lars Brubaker
41d7d91bf1 Don't send G4 dwell while wating to reach temp. 2016-11-28 16:09:25 -08:00
John Lewin
ee798dea03 Auto select make if only one, remove release notes, add files to csproj 2016-11-28 15:56:17 -08:00
Lars Brubaker
c4be48d7a9 Merge pull request #1630 from larsbrubaker/master 
Merge 1.6
 2016-11-17 14:02:34 -08:00
Lars Brubaker
dfd4bd2c32 Merge branch '1.6.0' 
# Conflicts:
#	PrinterControls/PrinterConnections/SetupStepComPortTwo.cs
 2016-11-17 12:28:52 -08:00
John Lewin
d4ce45b449 Revise failing tests 
- Wait for ReloadAll after calling AddAndSelectPrinter
- Revise ClickQueueRowItemViewAndRemove test
  - Use specialized asserts
  - Assert expected start/end counts
  - Add descriptive failure messages
- Eliminate excess wait times in RemoveAllMenuItemClickedRemovesAll due
  to WaitForName calls. Perform one wait, then assert expected
 2016-11-15 15:15:02 -08:00
Lars Brubaker
356157d154 Merge pull request #1627 from larsbrubaker/1.6.0 
Made the disabled state better.
 2016-11-15 15:05:07 -08:00
Lars Brubaker
b0fe261832 Made the disabled state better. 2016-11-15 13:51:12 -08:00
Lars Brubaker
81c8575faf Merge pull request #1626 from larsbrubaker/1.6.0 
Getting Enter Share Code Window themed correctly.
 2016-11-15 13:43:23 -08:00
Lars Brubaker
cbb67a1018 Merge pull request #1509 from unlimitedbacon/master 
Fixed sending/receiving double lines with Smoothie
 2016-11-15 13:29:01 -08:00
Lars Brubaker
cac5d69c76 Getting Enter Share Code Window themed correctly. 2016-11-15 13:08:16 -08:00
Tyler Anderson
886d614f08 Merge branch 'master' into master 2016-11-14 16:59:03 -08:00
johnlewin
76745e28f6 Merge pull request #1625 from larsbrubaker/1.6.0 
Moved redeem code into ApplicationController
 2016-11-14 16:57:56 -08:00
Lars Brubaker
bfa1d735fc Moved redeem code into ApplicationController 2016-11-14 16:51:01 -08:00
johnlewin
0beb684a69 Merge pull request #1623 from jlewin/1.6.0 
Remove HockeyApp exception
 2016-11-14 16:20:19 -08:00
John Lewin
ba5b3dc780 Remove HockeyApp exception 2016-11-14 16:15:24 -08:00
Lars Brubaker
e8f4dacf2c Merge pull request #1622 from larsbrubaker/1.6.0 
fixed the redeem share code
 2016-11-14 16:02:48 -08:00
Lars Brubaker
313b3b901e fixed the redeem share code 
MatterHackers/MCCentral#817
Redeem Purchase/Share code are non functional
 2016-11-14 15:58:24 -08:00
johnlewin
f0496637f2 Merge pull request #1621 from jlewin/1.6.0 
Throw in release to test HockeyApp reporting
 2016-11-14 15:51:15 -08:00
John Lewin
ef15c50689 Throw in release to test HockeyApp reporting 2016-11-14 15:44:31 -08:00
johnlewin
fd167e2dad Merge pull request #1619 from jlewin/1.6.0 
Remove nunit from production code
 2016-11-14 11:54:17 -08:00
John Lewin
e7f36fcb59 Remove nunit from production code 2016-11-14 11:46:32 -08:00
Lars Brubaker
07393c76f2 Merge pull request #1617 from larsbrubaker/1.6.0 
More smoothie fix
 2016-11-14 09:37:55 -08:00
Lars Brubaker
09eaccb8b9 Merge branch '1.6.0' of https://github.com/MatterHackers/MatterControl into 1.6.0 2016-11-11 18:35:43 -08:00
Lars Brubaker
a01df173d8 More smoothie fix 2016-11-11 18:35:18 -08:00
johnlewin
834c3e5d2c Merge pull request #1616 from jlewin/1.6.0 
Restore original naming
 2016-11-11 17:11:43 -08:00
John Lewin
05dbebec31 Restore original naming 2016-11-11 17:06:12 -08:00
johnlewin
860b4f4e49 Merge pull request #1615 from larsbrubaker/1.6.0 
getting smoothie resend working.
 2016-11-11 16:36:53 -08:00
Lars Brubaker
2f909df4cf getting smoothie resend working. 2016-11-11 16:29:25 -08:00
Lars Brubaker
5e9be765ca accelerated groups 2016-11-11 16:26:39 -08:00