712 Commits

Author SHA1 Message Date
Ian Paschal
53e07eadd3 Allow for optional typing
Contributes to CL-1222
2019-02-08 13:03:10 +01:00
Ian Paschal
2d77792988 Add some typings
Contributes to CL-1222
2019-02-08 12:54:10 +01:00
Ghostkeeper
473633de2c
Merge branch '4.0' 2019-02-08 11:28:06 +01:00
Ghostkeeper
672271d525
Fix running automated tests on Python 3.6
This prevents the PyCapsule_GetPointer error.
2019-02-08 09:50:20 +01:00
Ian Paschal
729f4c9d52 Revert "Fix line length"
This reverts commit 19f1a2f2d047f646c227e3fbb0d74f2cb7d57abd.
2019-02-08 09:40:56 +01:00
Ian Paschal
19f1a2f2d0 Fix line length
Contributes to CL-1237
2019-02-08 09:23:38 +01:00
Ian Paschal
2b6bab9552 Re-enable firmware check
Contributes to CL-1222
2019-02-06 16:42:26 +01:00
Ian Paschal
fcb52dd1cf Show cloud flow pop-up if machine is removed from cloud
Contributes to CL-1222
2019-02-06 14:26:11 +01:00
Ian Paschal
162fdad4e4 Improve conditions for starting cloud flow
Contributes to CL-1222
2019-02-06 13:58:33 +01:00
Simon Edwards
8e569126ff Use the older but backwards compatible API for moving print jobs in the queue.
CL-1237
2019-02-06 12:19:59 +01:00
Ian Paschal
3a4fcb354a Show cloud connection flow pop-up
Contributes to CL-1222
2019-02-06 12:04:15 +01:00
Ian Paschal
b1104124f3 Add address property to ClusterUM3OutputDevice
This was necessary because it was the only way to get the address (NetworkPrinterDevice and PrinterOutputDevice returned empty strings)

Contributes to CL-1222
2019-02-06 12:01:42 +01:00
Ian Paschal
5c0c176730 Show confirmation pop-up for cloud flow
Contributes to CL-1222
2019-02-05 16:52:15 +01:00
Ian Paschal
70c384bd4e Finish adding cloud flow checks
Contributes to CL-1222
2019-02-05 16:51:47 +01:00
Ian Paschal
b29f3d3bd0 Improve comment
Contributes to CL-1222
2019-02-05 16:50:50 +01:00
Ian Paschal
c41e81a6b9 Set required firmware version for cloud to 5.2.0
Contributes to CL-1222
2019-02-05 16:50:36 +01:00
Ian Paschal
d022672bcf Add signal to CloudOutputDeviceManager for added cloud device
Contributes to CL-1222
2019-02-05 16:49:54 +01:00
Ian Paschal
9c82cfd6fa Comment out firmware check for dev purposes
Contributes to CL-1222
2019-02-04 16:52:01 +01:00
Ian Paschal
4c1131a7b4 Remove some redundant calls
Contributes to CL-1222
2019-02-04 16:11:48 +01:00
Ian Paschal
f2ddb2808f Add firmware check
Contributes to CL-1222
2019-02-04 16:02:38 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0' 2019-02-04 13:06:32 +01:00
Ghostkeeper
7d871e5a18
Update text for pre-login screen
This is a new text that we got from marketing.
2019-02-04 13:06:06 +01:00
Ian Paschal
66ed42838f Stop using depreciated API call 2019-02-04 11:53:24 +01:00
Ian Paschal
2a3a1d6e35 Move cloud flow checks back to UM3OutputDevice
Contributes to CL-1222
2019-02-04 11:51:27 +01:00
Ian Paschal
1244e30500 Add cloud-flow-is-possible checking
Contributes to CL-1222
2019-02-01 15:50:49 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +01:00
Lipu Fei
c73747ad44 Merge remote-tracking branch 'origin/4.0' 2019-01-31 14:22:59 +01:00
ChrisTerBeke
b884e46187
Ensure Cura stores the cloud connection type in the stack file 2019-01-30 22:02:13 +01:00
Ghostkeeper
232498980c
Merge branch '4.0'
Conflicts:
	cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
	plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.
2019-01-28 16:45:45 +01:00
Ghostkeeper
25b18dee7a
Fix type errors
Nothing really changed but it should be more type-safe now for the messages it creates and the build plate temperature.
2019-01-28 16:14:01 +01:00
Jaime van Kessel
3774fdbd02 Refactored the "connection_type" metadata entry so it can support multiple types.
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
2019-01-28 14:29:41 +01:00
Ian Paschal
f5379dda55 Fix improperly removed method 2019-01-23 14:48:38 +01:00
ChrisTerBeke
92eb361ba1 Make cloud API error a generic message to not scare the user 2019-01-23 09:37:32 +01:00
ChrisTerBeke
a702661b5d Decrease the API call intervals to get quicker UI updates 2019-01-15 14:17:38 +01:00
ChrisTerBeke
b7fb969524 Fixes for review 2019-01-15 09:37:38 +01:00
Daniel Schiavini
77c30c891f Fix tests 2019-01-15 08:20:39 +01:00
ChrisTerBeke
f478653c37 Uncomment code that was needed for testing 2019-01-14 14:56:14 +01:00
ChrisTerBeke
7bf319dfd1 Better fix for circular dependency 2019-01-14 14:17:36 +01:00
ChrisTerBeke
cd19eec98a Remove weird argument for timer 2019-01-14 11:06:16 +01:00
ChrisTerBeke
402097f4d0 Fix imports 2019-01-14 10:57:50 +01:00
ChrisTerBeke
1e2a8aa23e revert to prevent circular dependency 2019-01-14 10:52:50 +01:00
ChrisTerBeke
81abc84741 Fix typing of CloudOutputDevice in controller 2019-01-14 10:41:10 +01:00
ChrisTerBeke
7bbd43928a Fix more review comments 2019-01-11 16:38:25 +01:00
ChrisTerBeke
3c10cca0de Fixed all codestyle and nitpicks from review 2019-01-11 16:33:49 +01:00
ChrisTerBeke
e465bd771a Use toolpath instead of mesh, some review fixes 2019-01-11 16:18:47 +01:00
ChrisTerBeke
d8b5f75e2a Solve some review comments 2019-01-11 16:14:55 +01:00
ChrisTerBeke
32ad50864e
Merge pull request #5029 from Ultimaker/STAR-347_update_cura_connect_models
Star-347: Update Cura Connect models
2019-01-10 17:46:26 +01:00
ChrisTerBeke
36191fbe0f Fix typevar typing issue 2019-01-10 15:36:12 +01:00
ChrisTerBeke
56f0a341bc Fix merge conflicts 2019-01-10 15:17:53 +01:00
ChrisTerBeke
b8da720c1d Move translations in-line 2019-01-08 13:10:42 +01:00