Lars Brubaker
352eb792f1
Merge branch 'smash_1.7.1' into design_tools
...
# Conflicts:
# PartPreviewWindow/View3D/View3DWidget.cs
# SlicerConfiguration/SliceSettingsWidget.cs
# SlicerConfiguration/SlicingQueue.cs
# StaticData/SliceSettings/Properties.json
2017-05-19 14:57:04 -07:00
Lars Brubaker
a1e1c48d90
All new 1.7.1 changes
2017-05-19 14:39:57 -07:00
Lars Brubaker
bc9d9ca9c0
Merge remote-tracking branch 'origin/1.7' into design_tools
...
# Conflicts:
# StaticData/SliceSettings/Properties.json
2017-04-14 12:51:17 -07:00
Lars Brubaker
3acaedd605
Adding more filament run out code
2017-04-13 16:32:32 -07:00
Lars Brubaker
e1374ece9d
Putting in support for filament runout sensor
...
writing support for sms message on filament run out and pause
2017-04-13 14:25:46 -07:00
Lars Brubaker
aa7445b618
Merge remote-tracking branch 'origin/1.7' into design_tools
...
# Conflicts:
# StaticData/Translations/Master.txt
2017-04-11 13:25:42 -07:00
Lars Brubaker
f5b2ba6357
Request temp rate should be 1 second
2017-04-11 12:05:24 -07:00
Lars Brubaker
b2515aa2ac
Fixed code related to position reads
...
Make sure we don't send a 105 while waiting for position
Make sure we send a M114 immediately after G28, G29, G30
Better error timing for sending commands (less resend issues)
2017-04-11 10:41:46 -07:00
Lars Brubaker
d676e8f30e
adressing: MatterHackers/MatterControl#2000
...
Changed code to look for "T0:" rather than starts with "ok T0:
Wrote test to ensue we are parsing temps correctly
2017-03-21 14:26:54 -07:00
John Lewin
bcfd74c744
Call PortIsAvailable on PortFactory
2017-03-15 21:58:59 -07:00
John Lewin
907609b587
Design tools
2017-03-15 16:29:56 -07:00
John Lewin
ab8cb11d92
Tuning adjustments default to 1.0 on application restart
2017-03-09 12:46:06 -08:00
Lars Brubaker
5218a82783
Fixed regression where we turned off sd card printing temps.
...
Wrote regression test for cancel print code
Made the emulator able to simulate sd card files
2017-03-07 17:52:44 -08:00
John Lewin
b74883b467
Remove create/close calls, reuse portFactory instance
2017-03-02 10:32:18 -08:00
John Lewin
6043aefa30
Fix typo
2017-03-02 10:32:17 -08:00
Lars Brubaker
958780d4a6
Make sure we never try to queue a command before the queue is initialized.
2017-03-01 11:22:47 -08:00
John Lewin
410d526345
Skip USB port validation when TCP/IP printing
2017-02-24 12:01:46 -08:00
Lars Brubaker
e9fdaee59f
Ask for position after G30
2017-02-22 14:51:20 -08:00
Lars Brubaker
2420acc69b
Make sure if hardware leveling enabled we don't parse leveling data
2017-02-22 11:53:25 -08:00
John Lewin
17bea4cc20
Add missing localizations
2017-02-15 10:04:10 -08:00
Lars Brubaker
a206586736
Make sure we don't have the printer waiting for position before it is connected.
2017-02-14 11:42:48 -08:00
Lars Brubaker
2430becc9d
Make sure we get our position any time we create stream processors.
2017-02-10 14:44:07 -08:00
Lars Brubaker
990fd13a19
Un-broke print cancel
...
Only finishing gcode sets the printer to connected not canceling (it still needs to print cancel gcode if present)
2017-02-09 13:51:16 -08:00
John Lewin
538d3c480a
Refactor GCodeStream
...
- Use AppendFormat
2017-02-09 09:01:45 -08:00
John Lewin
b665091e18
Multiplier streams must acquire and track dependant settings
...
- Correct whitespace
2017-02-09 09:01:03 -08:00
Lars Brubaker
b576e1fb78
Needed to rest stream processing after a print is canceled
...
MatterHackers/MatterControl#1877
Controls: Extrude buttons twisted
2017-02-08 14:40:18 -08:00
Lars Brubaker
1f76ba1cde
Fixing code review issues
2017-02-08 10:02:39 -08:00
larsbrubaker
ac4a2ed9ce
Made sure that reset connection disconnects
...
and reconnects if auto connect
and works when not connected (like it is supposed to)
2017-02-07 18:49:06 -08:00
Lars Brubaker
6b0b8ace6e
Fixed a bug with the progress bar
2017-02-06 14:23:55 -08:00
Lars Brubaker
117c09b9f1
Cleaned up the new macro command syntax
2017-02-06 14:23:55 -08:00
Lars Brubaker
53b7576b17
Refactored the macro command language.
2017-02-06 14:23:55 -08:00
Lars Brubaker
97dffa1d53
Better images in macros
2017-02-06 14:23:55 -08:00
Lars Brubaker
8134b3f450
Fixed the Macros window to cancel on user closes with the X windows button.
...
Put cancel into max length and temp stream
Made close function take a bool if the system did it
Moved To EventHandler<> in GuiWidget
Made a ClosedEventsArgs
2017-02-03 13:06:08 -08:00
Lars Brubaker
8a9467be3a
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
2017-02-02 16:42:36 -08:00
Lars Brubaker
3edcb69140
Made load filament macro work.
2017-02-02 16:38:48 -08:00
John Lewin
83dab63579
WaitingForPosition timer should be stopped and cleared, not restarted
2017-02-02 13:37:03 -08:00
John Lewin
3aa13d82c4
Persist tuning adjustments into printer settings
2017-02-02 10:56:14 -08:00
larsbrubaker
0c9ebdf611
starting
2017-02-02 07:54:52 -08:00
Lars Brubaker
4c8971f4a7
Putting in a macro cancel button.
2017-02-01 17:49:26 -08:00
Lars Brubaker
b61f4a64a3
Cleaner code
2017-02-01 15:46:11 -08:00
Lars Brubaker
8d47359ad9
Clear user baby stepping after new print leveling.
...
settings save on change
removed redundant expand_thin_walls setting
2017-02-01 13:38:14 -08:00
John Lewin
e736d2718f
Add ExtruderStatusWidget
2017-01-23 16:28:25 -08:00
John Lewin
ac3139c704
Reuse existing MoveButton objects
...
- Alternate format for widget factory colors
- Move fixed sizing in MoveButtonWidget to more specific scope
2017-01-19 12:31:53 -08:00
John Lewin
2e8c0baaab
Prevent null reference exception
2017-01-19 12:31:53 -08:00
John Lewin
16c2230018
Initial screensaver prototype
...
- Consolidate title casing mechanism into PrintItemWrapper.GetFriendlyName
2017-01-19 12:31:53 -08:00
Lars Brubaker
84ed2ce1b2
Make sure we save baby steps any time before the 2nd layer
2017-01-17 15:04:42 -08:00
Lars Brubaker
51541abfa2
turn off debug code
2017-01-11 17:18:42 -08:00
Lars Brubaker
0cdf057cb1
Make sure we work with the new marline rc8 and resend
2017-01-11 17:08:36 -08:00
John Lewin
eaa44e5af8
Revise UI elements that reveal babystep Z values and expose easy reset
2017-01-11 07:29:00 -08:00
Lars Brubaker
174983ad7e
Merge remote-tracking branch 'origin/1.6'
...
# Conflicts:
# Submodules/agg-sharp
2017-01-10 18:49:54 -08:00