85 Commits

Author SHA1 Message Date
alekseisasin
7c637029b6 Merge pull request #2334 from fieldOfView/feature_target_hotend_temperature
Show target hotend temperatures
2017-08-31 13:46:55 +02:00
Jaime van Kessel
053fdd679d Don't send duplicated materials to printer
CURA-4199
2017-08-30 15:52:31 +02:00
fieldOfView
85b20ab16b Get UM3 target hotend temperatures 2017-08-29 11:05:36 +02:00
Jaime van Kessel
a8a475a1a7 Only stop the camera if the timer is actually running
CURA-4081
2017-07-24 17:18:04 +02:00
Lipu Fei
3d378ebc5f Merge remote-tracking branch 'upstream/CURA-4057' 2017-07-21 14:14:27 +02:00
Jaime van Kessel
4d0c46508a Fixed incorrect naming of printcores in error messages
CURA-3734
2017-07-20 15:17:46 +02:00
Jaime van Kessel
6e55bf2d8f If output device has a contorl item, that one is used.
If a printerOutput device does not define anything, the fallback is used.

CURA-4057
2017-07-20 13:30:57 +02:00
Jaime van Kessel
289c9ed8ee Network printing now sees empty state as idle 2017-07-05 11:00:00 +02:00
Ghostkeeper
2a593e316b
Close camera upon disconnecting instead of relying on Uranium to do that
Uranium shouldn't know about no camera.
2017-06-28 11:51:12 +02:00
Jaime van Kessel
ca922e9e9d The monitor item is now actually used to display information on monitor page
The UM3 now provides camera image in this way

CURA-3826
2017-05-29 13:47:41 +02:00
Jaime van Kessel
f9f0fa852f Added RunTime exception catching for image_reply
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
2017-05-22 14:48:42 +02:00
Mark
04611b06af Fix two spelling errors
TRI-1450
2017-05-10 20:14:03 +02:00
daid
50acaaf91f Some minor changes on review. 2017-04-20 09:35:48 +02:00
daid
26a2fb80dc Only update the target bed temperature, without submitting it to the printer. To prevent race conditions. 2017-04-19 15:01:47 +02:00
Jaime van Kessel
f5785662f2 Fixed another broken logging 2017-04-10 13:19:05 +02:00
Jaime van Kessel
abe70c3a92 Fixed broken logging 2017-04-10 13:12:14 +02:00
Jack Ha
cebe52b1fe Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-06 14:08:00 +02:00
Jack Ha
88a8ed9752 Merge branch '2.5' 2017-04-06 14:07:50 +02:00
Jack Ha
f04981b08c Fixed wifi missing some lines. CURA-3664 2017-04-06 14:06:38 +02:00
Jaime van Kessel
953d59788e Only try to close connection when there is a connection to close
CURA-3603
2017-04-06 13:57:39 +02:00
Lipu Fei
c5bf107be6 Merge branch '2.5' 2017-03-31 12:12:29 +02:00
Lipu Fei
08071c3aa5 Fix batched GCode compression
CURA-3604
2017-03-31 12:11:11 +02:00
Lipu Fei
74e9ee0ab7 Fix batched gcode compression for "print over network"
CURA-3604
2017-03-30 19:00:41 +02:00
Jaime van Kessel
dbfa5873ce Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-30 17:03:01 +02:00
Jaime van Kessel
06fff748e3 Decreased the size of the batches to send, as it froze the interface too much. 2017-03-30 16:59:35 +02:00
Jaime van Kessel
7ae8d96775 Simply reset the authentication when requesting a new one.
Only changing the state caused a whole lot of issues.
2017-03-30 16:47:08 +02:00
Jack Ha
3135dc7d77 Solved MC 2017-03-30 16:20:08 +02:00
Lipu Fei
bfd77f915d Compress gcode lines in batch
CURA-3604
2017-03-30 16:09:17 +02:00
Lipu Fei
c785e84b86 Check len(materialLengths) before using
CURA-3604
2017-03-30 16:09:16 +02:00
Jaime van Kessel
f7bbb243b8 Moved authentication request state change 2017-03-30 11:02:56 +02:00
Ghostkeeper
f62488fd11
Catch JSONDecodeErrors on decoding messages from the network
The network can corrupt packages or the printer can only send partial messages. Cura shouldn't break on that. It's just a warning. This warning says more than the original stack trace does, because the stack trace only said like 'unexpected comma there and there' while this message actually says what message contained the error.
2017-03-29 10:34:27 +02:00
Jaime van Kessel
38a07d75c7 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-28 13:16:00 +02:00
Jaime van Kessel
db1fb8e692 Moved authentication request state change 2017-03-28 13:14:47 +02:00
Tim Kuipers
7a67ab4e66 Merge branch '2.5' 2017-03-28 12:55:18 +02:00
Jaime van Kessel
910ff7acea No longer check printer state when no material lengths are known
This fixes issues with g-code from g-code reader not having material lengths set.

CURA-3604
2017-03-28 11:59:07 +02:00
Jaime van Kessel
4b7b8600ec Shortened the logging of the auth key. Turned out it was extremely long 2017-03-24 11:22:57 +01:00
Jaime van Kessel
adab4a1110 Added "blurred" auth key logging.
The getSafeaAuthKey prints a key of the same length, but only the last 5 chars are real. The rest is blurred out with *
THis is a bit like how most payment services hide your credit card number.
2017-03-24 11:04:08 +01:00
Jaime van Kessel
e620d8fd9a Added extra logging to authentication loading to indicate difference between no auth at all or (some) loaded auth 2017-03-17 10:30:04 +01:00
Jaime van Kessel
7993d9e95e Added **kwargs option to request write
CURA-3496
2017-03-14 13:30:47 +01:00
Jaime van Kessel
c06ffe6cae Moved auth state changed check to first thing set auth checks
This should contribute to the windows authentication issues.
Most windows devices seemed to get all the auth state messages twice.
2017-03-07 11:55:29 +01:00
Jaime van Kessel
6dcd3b44b6 Removed uneeded debug code
The method is always put, so no need to log it.
2017-03-07 11:44:40 +01:00
Jaime van Kessel
85d979cf50 Removed unneeded check from network printing.
We used to not have a printer_state so this check was needed.
2017-03-07 11:41:18 +01:00
Jaime van Kessel
356d4f9288 Heated bed timeout time now hides correctly if time ran out
CURA-3360
2017-03-06 14:41:33 +01:00
Ghostkeeper
7bb486a34b
Don't process status updates of pre-heating while request is going on
There was the problem that you'd click on pre-heat, so locally it would display the time-out. Then a package came in with the out-dated print status saying that the printer is not pre-heating, so the pre-heat was cancelled on Cura's side. Then the next status update came in saying that the pre-heat is now busy, so the pre-heat is resumed on Cura's side. So the button was flicking back and forth once after pressing. This commit makes Cura ignore any status updates that come while the put-request is still going on, because they may be outdated. It'll appear nicer to the user, mostly.

Contributes to issue CURA-3360.
2017-02-24 17:44:37 +01:00
Ghostkeeper
39920c95f3
Interpret cancelling pre-heat properly
If someone on a different computer cancels the pre-heat, this is now correctly updated locally.

Contributes to issue CURA-3360.
2017-02-24 17:14:54 +01:00
Ghostkeeper
d60014fa30
Sync remaining pre-heat time with printer
If multiple instances of Cura are running or Cura is restarted, it now properly syncs the remaining pre-heat time with the printer, so that all instances display the proper time.
There's still a bug in here that pressing cancel has no effect the first time since the remaining pre-heat time is updated immediately from the printer before the command to cancel got through remotely. I'll see what I can do to amend that. Also, cancelling is not yet synced.

Contributes to issue CURA-3360.
2017-02-24 14:53:00 +01:00
Ghostkeeper
d2fa6dbae2
Notify to update remaining time when it drastically changes
When the time passes normally it doesn't trigger this signal but just go on counting, but when the pre-heat starts or cancels it updates via this signal. This is handy for the future, when we want to update the remaining time from the printer information. However for now it is also nice because we can make the pre-heat timer dependent on this signal so we know when to have it running. This fixes the problem that the pre-heat seems to have been cancelled in the GUI when you switch away the tab, because the timer running is now dependent on the property rather than always false.

Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
3cc11ecae5
Log when pre-heating or cancelling pre-heat
To help debugging and because it's a user interaction.

Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
75a50b73c2
Move pre-heat timer into PrinterOutputDevice
If it's held inside the device that has two advantages: It's being held per-device, so switching connection doesn't stop the timer. And also, the logic is no longer in the GUI.

Contributes to issue CURA-3161.
2017-02-16 12:58:32 +01:00
Jaime van Kessel
b34bb26a1a Fixed broken getInstance caused by refactor 2017-02-15 13:51:53 +01:00