Commit graph

187 commits

Author SHA1 Message Date
Jaime van Kessel
bc50f0fa7c Only close connection if it's open when re-checking connections 2016-06-28 15:00:35 +02:00
Jaime van Kessel
4c7d235a0d Fixed mistake with updating linked key 2016-06-28 14:50:55 +02:00
Jaime van Kessel
e53ff78704 Revert "Fix error"
This reverts commit 53c1c738d5.
The code was intentional. The fix actually caused issues, as it sent data it got from the server back again
2016-06-28 13:56:11 +02:00
Jaime van Kessel
ab934d356b Expanded logging 2016-06-28 13:46:20 +02:00
Jaime van Kessel
5e51d4d998 Minor refactor to make code more readable
CURA-336
2016-06-28 12:59:37 +02:00
Jaime van Kessel
804ff66c9a Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-06-28 11:53:11 +02:00
Jaime van Kessel
2711a9bc95 Changed name of plugin to better describe what it's doing
CURA-49
2016-06-28 11:52:55 +02:00
Jaime van Kessel
76dfb5e718 Renamed generic key to um_network_key
CURA-49
2016-06-28 11:48:54 +02:00
fieldOfView
b8fddf6527 Tweak codestyle and styling
CURA-336
2016-06-27 17:49:47 +02:00
Aldo Hoeben
f55cdbb8eb Merge pull request #1 from Ultimaker/feature_autostart_discovery
Automatically start discovery
2016-06-27 17:44:14 +02:00
fieldOfView
53c1c738d5 Fix error
CURA-49
2016-06-27 16:51:29 +02:00
fieldOfView
8deb0dc274 Make machine action button translatable
CURA-336
2016-06-27 15:49:29 +02:00
fieldOfView
7af7748fff Make machine action button translatable
CURA-336
2016-06-27 14:40:07 +02:00
fieldOfView
0860fc6cf5 Automatically start discovery
CURA-336
2016-06-27 10:32:56 +02:00
fieldOfView
b48f4ff8a2 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-06-27 09:58:57 +02:00
fieldOfView
260694f233 Code style, typos and minute style tweak
CURA-336
2016-06-27 09:58:40 +02:00
Jaime van Kessel
07c25edb0f Removed unused code 2016-06-24 13:47:52 +02:00
Jaime van Kessel
d6aacf24b9 Added JobName to network output device
CURA-1036
2016-06-23 17:07:20 +02:00
Jaime van Kessel
a1c9f055c8 UI updates
CURA-336
2016-06-23 16:24:17 +02:00
Jaime van Kessel
a61ac82433 Linking a key to a printer now re-checks connection
CURA-336
2016-06-23 16:20:20 +02:00
Jaime van Kessel
bb9d3a47ef Printer can now actually be linked
CURA-336
2016-06-23 16:15:56 +02:00
Jaime van Kessel
3b51c31772 Meta data of the printer is now also visible
CURA-336
2016-06-23 15:46:12 +02:00
Jaime van Kessel
01eb65f303 Removed accidental profile_reader stuff 2016-06-23 15:02:45 +02:00
Jaime van Kessel
e94f94767e Updated UX of detected printers
CURA-336
2016-06-23 14:39:50 +02:00
Jaime van Kessel
0cee5b78df Print discovery now lists all found human readable names
CURA-336
2016-06-23 14:25:46 +02:00
Jaime van Kessel
16fcf2208b Refactoring & exposing of properties
CURA-336
2016-06-23 14:19:56 +02:00
Jaime van Kessel
9a4fc0345c All found devices are now listed in the discover action
CURA-336
2016-06-23 14:17:50 +02:00
Jaime van Kessel
f199d490bb Action now has a list of found UM3 keys
CURA-336
2016-06-23 14:04:50 +02:00
Jaime van Kessel
d7bb807e2b Added stub QML page for discovery action
CURA-336
2016-06-23 13:35:25 +02:00
Jaime van Kessel
bca613b47e Added label
CURA-1385
2016-06-20 13:43:43 +02:00
Jaime van Kessel
f8cac56370 Added DiscoverUM3 machine action stub
CURA-1385
2016-06-17 15:46:18 +02:00
Jaime van Kessel
be779cb92a Improved logging when put operation failed
CURA-1036
2016-06-17 13:00:05 +02:00
Jaime van Kessel
0b9af6055c Decreased sample time for print information
CURA-1036
2016-06-17 11:34:54 +02:00
Jaime van Kessel
44c2a09118 Added stubs for checking if a print is at all possible
CURA-1036
2016-06-17 11:34:28 +02:00
Jaime van Kessel
a36157c538 Jobstate is reset when there is no print job
CURA-1036
2016-06-17 11:18:10 +02:00
Jaime van Kessel
9dbdd7fe7a Added changing printjob state
This also adds the bits required to actually do a put request

CURA-1036
2016-06-16 15:35:40 +02:00
Jaime van Kessel
c6b88118dc Jobstate is now also tracked 2016-06-16 11:43:53 +02:00
Jaime van Kessel
bb1fead4c6 Moved camera to own timer, so grabbing can be in a different frequency
CURA-336 and CURA-1036
2016-06-16 09:40:48 +02:00
Jaime van Kessel
354d2bc109 Camera image now works with a image provider
CURA-1036 and CURA-338
2016-06-16 09:36:19 +02:00
Jaime van Kessel
df94373664 TimeTotal and timeSpent are now set
CURA-1068
2016-06-15 16:46:41 +02:00
Jaime van Kessel
99a30573ce Store current temp in bed_temperature instead of dict with target & current
CURA-1036
2016-06-15 16:28:05 +02:00
Jaime van Kessel
61565561ff Temperatures for both extruders are now correctly retrieved
CURA-1036
2016-06-15 15:05:28 +02:00
Jaime van Kessel
7d258485c8 Small fixes so switching printers correctly connects / disconnects output devices
CURA-1036
2016-06-15 14:17:59 +02:00
Jaime van Kessel
ac4dbe2304 Decreased the progress added when 0 was returned
Turned out that by adding 0.1, it started at 10%
2016-06-14 16:01:06 +02:00
Jaime van Kessel
cadf5d85b7 Camera image is now also retrieved
CURA-338
2016-06-14 13:46:04 +02:00
Jaime van Kessel
1220d32ca5 No longer possible to send print_jobs when print just started
CURA-49
2016-06-14 13:23:05 +02:00
Jaime van Kessel
1acf155e19 We don't depend on requests lib anymore
Intead we use qt network stuff for everything.
CURA-49
2016-06-14 11:49:28 +02:00
Jaime van Kessel
486fc7f176 When no globalcontainer is set, no check to connect is performed
CURA-49
2016-06-14 09:46:01 +02:00
Jaime van Kessel
bd413b9a2b Added signalemitter
CURA-49
2016-06-14 09:42:53 +02:00
Jaime van Kessel
025bdba516 Changes to make the network plugin play well with setting_rework
CURA-49
2016-06-13 13:34:22 +02:00