Commit graph

3150 commits

Author SHA1 Message Date
Jaime van Kessel
e6c8a11017 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-13 14:16:59 +01:00
Jaime van Kessel
e8c5f81c79 Merge branch 'feature_preheat_bed' of github.com:Ultimaker/Cura 2017-02-13 14:16:50 +01:00
Jaime van Kessel
cc396d5357 Fixed target temp never updating 2017-02-13 14:16:22 +01:00
Ghostkeeper
a3af887d3f
Add support for WSH USB driver when not filtering USB-only
This support was included when filtering for USB only, but not the case when we are not filtering. I don't like this bit of code much since we should just define a list of paths to check and iterate over it, so that we can re-use the data and prevent syncing mistakes like this.
2017-02-13 13:46:30 +01:00
Jaime van Kessel
f62030dae5 setTargetBed temperature now directly sets target temp
This is instead of sending /bed/temperature a json which contains target & temp as keyvalue.
2017-02-13 13:30:51 +01:00
Jaime van Kessel
6deaf5bd65 Failure logging for network printing is now more explicit (also prints what the operation was) 2017-02-13 13:28:32 +01:00
Jaime van Kessel
8d7b813318 All good 20x http replies are now accepted 2017-02-13 13:26:36 +01:00
Jack Ha
488b952815 Fix 4.1 shader for line types. CURA-3273 2017-02-13 13:21:30 +01:00
Jaime van Kessel
ce5f435be9 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-13 11:07:25 +01:00
Jaime van Kessel
c18fb02f82 Removed unneeded (and somewhat expensive) checks
CURA-3311
2017-02-13 11:06:21 +01:00
Jack Ha
7000717f6e Fixed warning non-NOTIFYable properties, added signals for propertiesChanged. CURA-3273 2017-02-13 09:58:33 +01:00
Torsten Blindert
2fca555ea6 FEATURE: Support wsh usb driver 2017-02-11 16:34:49 +01:00
Jaime van Kessel
7838888d5c Merge branch '2.4' of github.com:Ultimaker/Cura 2017-02-10 16:43:08 +01:00
Jaime van Kessel
185f5fe1c4 Added a clarification to the changelog regarding the inital print temperature 2017-02-10 16:41:49 +01:00
Jaime van Kessel
5e3782e6c3 Added more authentication logging to network printing 2017-02-10 15:44:45 +01:00
Jaime van Kessel
5e5cc723d7 Calling the stop of USBPrinterOutput device no longer joins the thread.
This caused quite a bit of delay on the application closing down (up to 5 seconds!)
2017-02-10 15:03:34 +01:00
Jaime van Kessel
6e7c4711e3 When creating XML profiles, directly set the name
The setName function is intended if the user changes the name (as by means of the edit material menu).
For deserializing this simply gives too much overhead
2017-02-10 14:58:22 +01:00
Jaime van Kessel
f4d4fb9001 Material values are now also lazy loaded
CURA-3311
2017-02-10 14:50:16 +01:00
Jaime van Kessel
bda818b104 MetaData of material profile is now set in one batch instead of multiple calls
CURA-3311
2017-02-10 14:15:35 +01:00
Jaime van Kessel
fce9df756c Fixed pause slicing not working when moving an object
CURA-3361
2017-02-10 11:43:38 +01:00
Jaime van Kessel
28a3858bc2 Fixed small isue where no type was found in zeroconf object 2017-02-10 11:30:50 +01:00
Ghostkeeper
0c9b9a3033
Add fallback name property in PrinterOutputDevice
It'll call this property, which gives an empty string, if the device doesn't implement giving a name.

Contributes to issue CURA-3161.
2017-02-09 17:34:51 +01:00
Jack Ha
655b3aa9cf Removed .gitignore from PauseBackendPlugin. CURA-3361 2017-02-09 17:20:49 +01:00
Jack Ha
3d1e5a84fc Added PauseBackendPlugin, added to changelog. CURA-3361 2017-02-09 17:19:59 +01:00
Jack Ha
c2bf88751e Enable functions pauseSlicing and continueSlicing in combination with BlockSlicingDecorator. CURA-3361 2017-02-09 16:06:36 +01:00
Jack Ha
30af908e29 Fixed GCodeReader. CURA-3273 2017-02-09 15:27:53 +01:00
Ghostkeeper
27c30006da
Give no address instead of a wrong address if unknown
Contributes to issue CURA-3161.
2017-02-09 10:33:14 +01:00
Jack Ha
81e575da31 Added comment. CURA-3273 2017-02-08 13:39:19 +01:00
Jack Ha
811f40d294 Renamed lightDir to light_dir. CURA-3273 2017-02-08 13:34:54 +01:00
Jack Ha
0d444298bc Added myEmitVertex function in layers3d.shader. CURA-3273 2017-02-08 13:29:24 +01:00
Jack Ha
8e80593232 Added comment. CURA-3273 2017-02-08 13:03:48 +01:00
Ghostkeeper
1395735ece
No longer mention printer name in status
The printer name is displayed right above it, so mentioning the name again is double.

Contributes to issue CURA-3161.
2017-02-08 12:53:54 +01:00
Jack Ha
cc950732b6 Added comment. CURA-3273 2017-02-08 11:57:59 +01:00
Jack Ha
47ab49795f Added comments, changed small layout and id thing. CURA-3273 2017-02-08 11:48:00 +01:00
Ghostkeeper
da4574cb32
Use fallback without time-out if preheating bed on old firmware
It manually sets the temperature just like what happens when you print via USB.

Contributes to issue CURA-3161.
2017-02-08 11:38:03 +01:00
Ghostkeeper
28e488dad7
Fix setting target bed temperature
The previous implementation just emitted the signal twice, once in setTargetBedTemperature and once in _setTargetBedTemperature. I've made the private one actually set the temperature.

Contributes to issue CURA-3161.
2017-02-08 11:37:04 +01:00
Jack Ha
50ba236e66 Removed unused option in LayerPolygon, added comments 2017-02-08 11:24:41 +01:00
Jack Ha
6c19bc1c16 Only show legend in color: line_type 2017-02-08 11:08:59 +01:00
Jack Ha
1d6ef4bc3c Default color if no material color is available. CURA-3273 2017-02-08 10:40:17 +01:00
Arjen Hiemstra
74bef2ff95 Fix OpenGL 2.0 fallback shader for Layer View 2017-02-07 17:34:02 +01:00
Ghostkeeper
7cf81412ae
Implement bed pre-heating via USB
It just calls the bed heating command without implementing the time-out. Implementing the time-out is impossible via just g-code.

Contributes to issue CURA-3161.
2017-02-07 17:26:44 +01:00
Ghostkeeper
9354a80504
Document no longer that pre-heating defaults to 15m
Because that was removed.

Contributes to issue CURA-3161.
2017-02-07 17:17:45 +01:00
Ghostkeeper
4ccadc6208
Round pre-heat temperature and duration to integer but allow floats
We want to allow floats in the interface since the interface needs to be agnostic of what device it is connected to. But the UM3 API only allows integers, so we still need to round it to the nearest integer.

Contributes to issue CURA-3161.
2017-02-07 16:57:20 +01:00
Ghostkeeper
785f10966e
Don't send a time-out for preheat if timeout is 0
The printer doesn't accept 0.

Contributes to issue CURA-3161.
2017-02-07 16:48:27 +01:00
Ghostkeeper
1a902b21bb
Store default pre-heat time in central location
Its default is 900s or 15 minutes. QML now requests the time-out time and sends it on to the printer.

Contributes to issue CURA-3161.
2017-02-07 16:29:41 +01:00
Ghostkeeper
d751285713
Provide pre-heat command with integer parameters
The firmware only accepts integers, apparently.

Contributes to issue CURA-3161.
2017-02-07 14:44:28 +01:00
Jack Ha
4057996e23 Made layers.shader compatibility shader compatible. CURA-3273 2017-02-07 14:28:22 +01:00
Ghostkeeper
b27a9e6535
Implement tracking target bed temperature
I had already assumed it was tracking this but apparently it wasn't. This works though.

Contributes to issue CURA-3161.
2017-02-07 13:52:44 +01:00
Ghostkeeper
3618ae0d4f
Properly float-format input of preheatBed
It rounds to 3 digits. The specification of the feature in the API doesn't mention how detailed the temperature and duration can go, but thousands seems more than enough. This also eliminates pesky problems with the JSON brackets in the format function.

Contributes to issue CURA-3161.
2017-02-07 13:35:09 +01:00
Ghostkeeper
559b40867e
Call pre-heat if pre-heat button is pressed
Contributes to issue CURA-3161.
2017-02-07 13:29:57 +01:00