GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-22 04:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,784 Commits 290 Branches 262 Tags
Commit Graph

7768 Commits

Author SHA1 Message Date
Nino van Hooff
f3c66c3189 Refactor CloudApiClient (and ToolpathUploader) to use HttpRequestManager 
Has the benefit of a more unified Http request management + timeouts

CURA-7290
 2020-05-15 11:28:17 +02:00
Ghostkeeper
5a8d411c35
Fix upgrading quality-changes profiles per extruder 
These have a slightly different syntax apparently.
I thought I tested this before. But apparently not well enough.

Contributes to issue CURA-7433.
 2020-05-14 16:44:48 +02:00
Nino van Hooff
15f813a4ff Add a sync timeout to CloudOutputDeviceManager 
Fixes an issue where printer syncing breaks when switching networks etc.

CURA-7290
 2020-05-14 15:47:45 +02:00
Nino van Hooff
a3f968188f Add timeout to CloudPackageChecker request 
Prevents it from getting stuck in the SYNCING state

CURA-7290
 2020-05-14 15:14:51 +02:00
fieldOfView
321693d410 Add upgrade script to update instances of removed scripts to unified script 2020-05-14 11:38:30 +02:00
fieldOfView
172e6a0759 Merge branch 'master' into feature_unify_pause_at_height 
# Conflicts:
#	plugins/PostProcessingPlugin/scripts/BQ_PauseAtHeight.py
 2020-05-14 08:45:38 +02:00
Alexander Gee
d7c373b720 Extract method 2020-05-13 23:55:12 -05:00
Alexander Gee
0daccce7b1 Incorperate percentage and time remaining scripts 2020-05-13 23:36:49 -05:00
Alexander Gee
83e259cd93 Rename to DisplayProgressOnLCD 2020-05-13 23:35:39 -05:00
Ghostkeeper
1111041a5b
Merge branch 'CURA-7433_deltacomb_move_upgrades' 2020-05-13 17:27:16 +02:00
Ghostkeeper
984836c1af
Code style: Spaces around binary operators 
Contributes to issue CURA-7433.
 2020-05-13 17:25:09 +02:00
Remco Burema
3af8c20ccf
Deltacomb upgrade: Fix deepcopy not working for ConfigParser. 
No idea why it worked on ghostkeepers' system. It isn't supposed to: https://bugs.python.org/issue16058
CURA-7433
 2020-05-12 18:42:06 +02:00
Remco Burema
44900fad5a
Deltacomb upgrade: Fix leftover issues from last master-merge. 
CURA-7433
 2020-05-12 18:39:27 +02:00
Remco Burema
ac429d496a
Merge https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master 2020-05-12 16:41:05 +02:00
Nino van Hooff
fbc0be30ec Fix typing issue in CloudPackageChecker 
CURA-7290
 2020-05-12 15:40:53 +02:00
Nino van Hooff
b40b8e8489 Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync 
# Conflicts:
#	cura/API/Account.py
 2020-05-12 14:59:01 +02:00
Ghostkeeper
89fc4c94bf
Add version upgrade for changed Redo Layer parameter of Pause script 
This was changed from a number of layers to just a boolean for 1 or 0 layers.

Contributes to issue CURA-7413.
 2020-05-11 18:50:49 +02:00
Ghostkeeper
aff28d821f
Also reset extrusion for Griffin printers 
The rest may not be necessary but the G92 is crucial if redo layer is activated.

Contributes to issue CURA-7413.
 2020-05-11 18:35:27 +02:00
Ghostkeeper
05b0bf5988
Turn 'Redo Layers' into a boolean for at most 1 layer 
We've deemed it irresponsible to redo multiple layers. This will dig the nozzle back down into the layers that were printed before the pause.

This doesn't include a version upgrade yet.

Contributes to issue CURA-7413.
 2020-05-11 18:34:41 +02:00
Ghostkeeper
1946615fff
Fix asynchronous bug if job gets cancelled 
If the print job happens to get cancelled right after checking if the index is correct, but before actually reading the line, it would get an IndexError when trying to read the line since cancelling the job clears the _gcode list.
This prevents that asynchronous issue by using the internal check in the list access to check that, and just uses an exception to check whether it's reached the end.

Fixes Sentry issue CURA-QC.
 2020-05-11 17:36:24 +02:00
Konstantinos Karmas
ff8e037f4c
Merge pull request #7704 from Ultimaker/CURA-7429_fix_image_reader_peak_height 
CURA-7429_fix_image_reader_peak_height
 2020-05-11 13:58:11 +02:00
Konstantinos Karmas
6ea37603f2
Merge pull request #7715 from Ultimaker/CURA-7420_fix_version_upgrader 
New version upgrade for 4.7
 2020-05-11 11:07:44 +02:00
Konstantinos Karmas
0bcb3348da
Merge pull request #7707 from Ultimaker/CURA-7245_fix_bundled_package_sync 
CURA-7245_fix_bundled_package_sync
 2020-05-11 09:49:19 +02:00
Alexander Gee
34f4417e16 Add PostProcessingPlugin script DisplayPercentCompleteOnLCD 2020-05-08 19:22:40 -05:00
Nino van Hooff
a09cd0e63e Convert doxygen to rst for Prepare, Preview, RemovableOutputDevice 2020-05-08 17:37:49 +02:00
Nino van Hooff
a4fe3d7685 Convert doxygen to rst for POS, MonitorStage, PostProcessing 2020-05-08 16:28:07 +02:00
Nino van Hooff
553b09b6cf Convert doxygen to rst for GcodeWriter, LegacyProfileReader, 
MachineSettingsAction, ModelChecker
 2020-05-08 16:20:55 +02:00
Nino van Hooff
40327c4259 Convert doxygen to rst for GcodeReader, GcodeGzReader/Writer, 
GCodeProfileReader
 2020-05-08 15:58:51 +02:00
Nino van Hooff
6ca9b4678e Convert doxygen to rst for Firmware update plugins 2020-05-08 15:46:02 +02:00
Nino van Hooff
54d2fe95d1 Convert doxygen to rst for CuraProfileReader/Writer 2020-05-08 15:43:12 +02:00
Nino van Hooff
176919eee0 Merge branch 'master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	plugins/CuraEngineBackend/CuraEngineBackend.py
#	plugins/CuraEngineBackend/StartSliceJob.py
 2020-05-08 15:31:23 +02:00
Nino van Hooff
797d6ed438 Convert doxygen to rst for CuraEngineBackend 2020-05-08 15:23:51 +02:00
Nino van Hooff
8f3827d5ae Convert doxygen to rst for 3MFReader/Writer and AMFReader 2020-05-08 15:14:39 +02:00
Nino van Hooff
1ae050bbc5 Expose Account.SyncState as an Enum to QML 
Provides a single source of truth

CURA-7290
 2020-05-08 11:09:48 +02:00
Ghostkeeper
c3c144345b
Add version upgrade to halve the maximum deviation once again 
As explained in the comment. We reverted a change in 4.6, so we must unrevert it in master again.

Contributes to issue CURA-7420.
 2020-05-08 09:30:54 +02:00
Ghostkeeper
b02354b209
Merge branch '4.6' 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
 2020-05-08 09:10:02 +02:00
Remco Burema
23cdf871c1
Add comments: Why a matrix4x4 and not a sampler1d? 
part of CURA-7426
 2020-05-07 18:55:55 +02:00
Nino van Hooff
5a3bcb6161 Fix image reader peak height 
CURA-7429
 2020-05-07 14:29:30 +02:00
Kostas Karmas
6ffd250965 Format spacing 
CURA-7426
 2020-05-07 14:10:45 +02:00
Remco Burema
99e99e4650
Layerview can now deal with visibility extruder nrs. 4+ 
part of CURA-7426
 2020-05-06 18:03:32 +02:00
Nino van Hooff
9b79b70f2b Merge branch 'CURA-7290_auto_sync_packages' into CURA-7290_manual_account_sync 
# Conflicts:
#	cura/API/Account.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
 2020-05-06 16:03:37 +02:00
Nino van Hooff
3ac0e7bed9 Consider all packages when calculating account discrepancies 
Not just the user-subscribed ones

CURA-7245
 2020-05-06 16:01:36 +02:00
Nino van Hooff
bfae7e9fb1 Replace some hard-coded sync states 
CURA-7290
 2020-05-06 12:54:07 +02:00
Remco Burema
2687578a86
Merge pull request #7624 from Ultimaker/CURA-7022_Add_cloud_printer_within_add_a_connected_printer 
Cura 7022 add cloud printer within add a connected printer
 2020-05-06 11:13:27 +02:00
Nino van Hooff
5b245434d0 Add _last_check_packages type hint 
CURA-7290
 2020-05-04 17:32:54 +02:00
Nino van Hooff
eac884fcd2 Convert SYNC_STATES to Enum 
CURA-7290
 2020-05-04 17:26:38 +02:00
Nino van Hooff
88ff68e40c Also check for package updates automatically 
Moves the 30-second sync timer from CloudOutputDeviceManager to
Account and subscribes CloudPackageChecker to the timer.

CURA-7290
 2020-05-04 16:56:09 +02:00
Nino van Hooff
eeea1692fd Register CloudPackageChecker as Account sync service 
CURA-7290
 2020-05-04 14:08:36 +02:00
Nino van Hooff
049c1946d4 Create Account sync state interface to allow for multiple sync services 
Needed to add the package sync

CURA-7290
 2020-05-04 13:52:40 +02:00
Kostas Karmas
69f23eca94 Double the maximum deviation again in the versionUpgrade460to462 
CURA-7421
 2020-05-04 13:22:22 +02:00