GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-13 07:41:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
121 Commits 295 Branches 268 Tags
Commit Graph

121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
676182cd54 Fixed authentication timeout 
CURA-1916
 2016-07-15 10:52:31 +02:00
Jaime van Kessel
ee59da0704 Merge branch 'feature_material_hotend_change' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-07-06 13:39:32 +02:00
awhiemstra
4fec82fab7 Fix CMakeLists to include the discovery action 
Also remove a no-longer existing file
 2016-07-05 10:31:15 +02:00
fieldOfView
fe4ed3dad8 Use jobname instead of "test" placeholder 
CURA-49
 2016-07-04 18:18:42 +02:00
fieldOfView
5b686f0a50 Reinitialise material and hotend lists to new number of extruders 
CURA-491
 2016-07-04 14:26:54 +02:00
fieldOfView
051419577e Forward hotend and material data to PrinterOutputDevice 
CURA-491
 2016-07-04 11:58:31 +02:00
fieldOfView
f3c1f947d4 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-07-01 15:07:28 +02:00
fieldOfView
ea3a039bdd Automatically show the Print Monitor when starting a print 
CURA-1036
 2016-07-01 15:07:17 +02:00
Jaime van Kessel
462bc4aef5 Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-06-30 14:57:27 +02:00
Jaime van Kessel
bfc7a7e3c9 Multipart data objects used for posting new materials are now deleted upon completion 
CURA-344
 2016-06-30 14:56:36 +02:00
Jaime van Kessel
ca79e398c8 All known materials are now send upon connection 
Due to garbage collection issues, the (multi) part requests are now cached.
CURA-334
 2016-06-30 14:25:54 +02:00
fieldOfView
f2187e4f6a Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-06-30 09:54:28 +02:00
fieldOfView
79ee928883 Change progress to percentages 
CURA-1036
 2016-06-30 09:54:08 +02:00
Jaime van Kessel
a4117bd3be Display data is reset upon job completion 2016-06-30 09:52:48 +02:00
Jaime van Kessel
b9f73a8eef Hiding messages is now only done when there are messages 
CURA-49
 2016-06-30 09:35:57 +02:00
Jaime van Kessel
12dcc43bac Added messages upon succesfull & not sucessfull pairing 
CURA-49
 2016-06-29 13:45:29 +02:00
Jaime van Kessel
57ea4f0dc8 Updated auth timeout to 5 min 2016-06-29 13:33:31 +02:00
Jaime van Kessel
58c3f5dc89 Closing the networkprinteroutput device now hides all it's messages 
CURA-49
 2016-06-29 13:31:42 +02:00
Jaime van Kessel
5597f6dcf2 Authentication is now saved with machine-instance 
CURA-49
 2016-06-29 13:19:05 +02:00
Jaime van Kessel
ebda94b7dc Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-06-29 12:12:29 +02:00
Jaime van Kessel
368d4e9ea2 Updated documentation 
CURA-49
 2016-06-29 12:12:12 +02:00
Tim Kuipers
acd3274ca4 Update README.md 2016-06-29 12:07:25 +02:00
Jaime van Kessel
dd92ac7c5f Username & cura version are now sent in the auth request 
CURA-49
 2016-06-29 12:06:36 +02:00
Jaime van Kessel
4b6993bf7b Message is now shown when trying to print without authentication 
CURA-49
 2016-06-29 12:00:28 +02:00
Jaime van Kessel
bb72e298bf Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-06-29 11:54:19 +02:00
Jaime van Kessel
054f7aaa83 If authentication is recieved, it's now also correctly validated 
CURA-49
 2016-06-29 11:53:56 +02:00
Tim Kuipers
c3ecacf6c0 Update README.md 2016-06-29 11:40:32 +02:00
Tim Kuipers
a90be88a04 Update README.md 2016-06-29 11:34:02 +02:00
Tim Kuipers
cba3727373 Update README.md 2016-06-29 11:24:25 +02:00
Jaime van Kessel
3a767c72f0 Authentication can now timeout and be denied from printer side 
CURA-49
 2016-06-29 10:55:45 +02:00
Jaime van Kessel
c8ba60fad4 Authentication message is now shown when authenticating 
CURA-49
 2016-06-29 10:18:02 +02:00
Jaime van Kessel
c13a6966d0 Handle authentication denied messages 
CURA-49
 2016-06-28 17:01:33 +02:00
Jaime van Kessel
6244d74c1d Code cleanup 2016-06-28 16:45:02 +02:00
Jaime van Kessel
15e11e1cad Added basic authentication for UM3 
Note that the authentication is not saved at the moment, so this step needs to be repeated on every boot

CURA-49
 2016-06-28 16:37:37 +02:00
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 53c1c738d539b85256e670d80443cfcb1a82c74f.
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