GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,259 Commits 293 Branches 266 Tags
Commit Graph

16259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
6eb8b75490 Update typing and fixed the bug it exposes. 2018-10-16 11:31:33 +02:00
Ghostkeeper
b5d8c1af6f
Merge branch 'master' into fieldOfView-feature_firmware_updater 
Conflicts:
	cura/PrinterOutput/PrinterOutputModel.py - Bunch of code that was moved.
	plugins/USBPrinting/USBPrinterOutputDevice.py - Collisions with code style fixes.
	plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml - Bunch of code that was moved.
 2018-10-15 16:52:22 +02:00
Ghostkeeper
c680050040
Merge branch 'feature_firmware_updater' of https://github.com/fieldOfView/Cura into fieldOfView-feature_firmware_updater 2018-10-15 15:41:17 +02:00
Ghostkeeper
95f89044c0
Merge branch 'CURA-5483_add_s5_to_firmware_checker' 2018-10-15 15:25:29 +02:00
Ghostkeeper
53dc28db89
Change URL of firmware update page for Ultimaker 3 and S5 
I just got word of a new page to read up about the firmware update. Apparently we now have to link to this one.

Contributes to issue CURA-5483.
 2018-10-15 15:12:42 +02:00
Ghostkeeper
56a383814b
Code style: Spaces around binary operators 
Contributes to issue CURA-5483.
 2018-10-15 14:48:18 +02:00
Ghostkeeper
f32aadf39c
Merge branch '3.5' 2018-10-15 14:00:59 +02:00
Ghostkeeper
d7a7cf3003
Correct some printers to use 1.75mm filament 
This should fix some underextrusion problems... Hmm.

Sources:
* https://alya3dp.com/pages/teknik-ozellikler
* https://www.creality3d.cn/creality-cr-10-s4-3d-printer-p00098p1.html
* https://www.creality3d.cn/creality-cr-10-s5-3d-printer-p00099p1.html
* https://3dprint.com/3643/german-repraps-neo-3d-printer-now-available-in-the-us-uk/
* https://somosmaker.com/pegasus-impresora-3d/
* http://www.3dmaker.vn/3d-printer-3dmaker-starter/?lang=en# (assuming the filaments they sell on that website are compatible)
* https://makezine.com/product-review/printrbot-play/

I could not find a source for the Deltabot, but got that information from here: https://github.com/Ultimaker/Cura/issues/4573

Contributes to issue CURA-5817.
3.5.1 		2018-10-15 14:00:47 +02:00
Ghostkeeper
02efd7a1f5
Correct some printers to use 1.75mm filament 
This should fix some underextrusion problems... Hmm.

Sources:
* https://alya3dp.com/pages/teknik-ozellikler
* https://www.creality3d.cn/creality-cr-10-s4-3d-printer-p00098p1.html
* https://www.creality3d.cn/creality-cr-10-s5-3d-printer-p00099p1.html
* https://3dprint.com/3643/german-repraps-neo-3d-printer-now-available-in-the-us-uk/
* https://somosmaker.com/pegasus-impresora-3d/
* http://www.3dmaker.vn/3d-printer-3dmaker-starter/?lang=en# (assuming the filaments they sell on that website are compatible)
* https://makezine.com/product-review/printrbot-play/

I could not find a source for the Deltabot, but got that information from here: https://github.com/Ultimaker/Cura/issues/4573

Contributes to issue CURA-5817.
 2018-10-15 13:55:47 +02:00
Jaime van Kessel
167c6fbb76 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-10-15 11:47:45 +02:00
Lipu Fei
73de720947 Change material diameter to 1.75 for monoprice machines 
CURA-5817
 2018-10-15 09:27:55 +02:00
Ghostkeeper
e747219bbe
Let Makerbot Replicator use Replicator's X3G variant 2018-10-15 01:30:36 +02:00
Remco Burema
2e3abbc904 Put the firmware-update meta-data in the 'normal' printer definitions and make the code handle that. 2018-10-13 21:55:33 +02:00
Remco Burema
931143ceaa Added FirmwareUpdateCheckerMessage, so no variables have to be hidden in the action of a plain Message. 2018-10-13 20:05:20 +02:00
Remco Burema
8c71a8855c FirmwareUpdateChecker: Remove superfluous 'version_parser' as a setting, since it broke lean principles. 2018-10-13 19:36:11 +02:00
Remco Burema
60408c14bc FirmwareUpdateChecker: Small refactors due to code review. 2018-10-13 19:21:22 +02:00
Ghostkeeper
6cf2e89f6b
Document CameraImageProvider 
Makes it easier than looking up the Qt documentation online.
 2018-10-13 16:40:26 +02:00
Ghostkeeper
1b7055f0f3
Fix spelling of error message 
Loopup -> Lookup.

Contributes to issue CURA-5483.
 2018-10-12 17:03:48 +02:00
Ghostkeeper
e3b05f0867
Code style: Spaces around binary operators 
Also removed the unused machines_json value.

Contributes to issue CURA-5483.
 2018-10-12 16:46:39 +02:00
Ghostkeeper
6ac10db582
Code style: Use double quotes for strings 
Contributes to issue CURA-5483.
 2018-10-12 15:37:43 +02:00
Ghostkeeper
9e4fcd820e
Update outputDevice when the global container changed 
And directly link the active printer name to it, so that that also gets updated. With the property var it just gets evaluated upon creating the rectangle.

Contributes to issue CURA-5749.
 2018-10-12 14:56:27 +02:00
Ghostkeeper
99fc372b32
Update printer information when switching global container stacks 
This was just evaluated once during the creating of a USB connection. But you can switch out the printer without breaking/making a USB connection, so in that case we have to update it here.

Contributes to issue CURA-5749.
 2018-10-12 14:55:13 +02:00
Ghostkeeper
287689a073
Don't cache the automatic firmware name 
The QML property was not updated when you change the printer. By not caching it, it gets the current printer's firmware file upon clicking the button. Simple and effective, and not that tough on computational power that it needs caching.

Contributes to issue CURA-5749.
 2018-10-12 13:25:34 +02:00
Ghostkeeper
85b835118d
Log which firmware file you're about to upload 
Kind of critical information, really.

Contributes to issue CURA-5749.
 2018-10-12 13:24:09 +02:00
Ghostkeeper
3c626453a6
Fix spelling 2018-10-12 11:28:30 +02:00
Tim Kuipers
ad80ea6dd4 fix: limit to extruder of top/bottom polygon connector 2018-10-12 11:16:24 +02:00
Ghostkeeper
f7bef851db
Remove code duplication for recreate network timer 2018-10-12 11:09:46 +02:00
Remco Burema
69cef98c30 FirmwareUpdateChecker: Small fixes (typing and lowercase input). 2018-10-12 10:11:46 +02:00
Remco Burema
f2b50c748c Fix typing in the FirmwareUpdateChecker plugin. 2018-10-11 21:54:27 +02:00
fieldOfView
6a50487bf0 Catch the one that got away 2018-10-11 19:16:10 +02:00
Remco Burema
839016d2f3 Merge branch 'master' into CURA-5483_add_s5_to_firmware_checker 2018-10-11 18:25:40 +02:00
Remco Burema
4ecac6e27f Set the right firmware-download-URL in the actual update-firmware-message. 2018-10-11 18:24:07 +02:00
Remco Burema
472d012c08 Move firmware-update-checker json-parsing to its own class (also don't repeat parsing each time). 2018-10-11 17:52:06 +02:00
Remco Burema
6c2791f382 Parse the firmware-update-check lookup-tables from a (new) .json instead of hardcoded. 2018-10-11 17:16:01 +02:00
Ghostkeeper
7c6970bec3
Merge branch 'feature_firmware_updater' of https://github.com/fieldOfView/Cura into fieldOfView-feature_firmware_updater 2018-10-11 16:42:11 +02:00
Remco Burema
12999f48c8 FirmwareUpdateCheckerJob: Move introduced hardcoded values to static variables. 2018-10-11 15:27:04 +02:00
Remco Burema
d8ed3d6074 Check the whole list for firmware-updates instead of just the first added container. 2018-10-11 14:56:07 +02:00
Remco Burema
487ef52c66 Warn on error and continue on encountering 'future-proof' (now) or old (later) version-URLs. 2018-10-10 17:09:54 +02:00
Remco Burema
0ac4f8f521
Merge pull request #4531 from Ultimaker/normal_quality_ender_3 
[3.5] Use 0.1 layer height as normal for Ender 3
 2018-10-10 16:37:16 +02:00
Remco Burema
10b5584ca6 [CURA-5483] Support more than just the UM3(E) for the firmware-update-check (add S5 only for now). 2018-10-10 16:24:13 +02:00
Ghostkeeper
4c6744b6fc
Code style: Space around binary operators 
I just looked for lines with interpolation = None because I was looking for another possible bug, but fixing this in the meanwhile too.
 2018-10-10 14:28:50 +02:00
Ghostkeeper
b37252f124
Minor code style fixes 
Contributes to issue CURA-5734.
 2018-10-10 14:18:37 +02:00
Jaime van Kessel
e3861b0d90 Add few more elide properties to ensure text doesnt' overlap 2018-10-10 12:48:22 +02:00
Lipu Fei
cc34e14215 Use ElideRight for long script names 
CURA-5683
 2018-10-10 11:52:16 +02:00
Lipu Fei
01d95f51c8 Fix prime blob enabled for S5 
Still need that enabled = true...
 2018-10-10 09:34:30 +02:00
Lipu Fei
4c98ffdffa
Merge pull request #4532 from Ultimaker/M&P-Setting-Optimization 
Fixed prim blob visibility
 2018-10-10 09:32:44 +02:00
Lipu Fei
6d852228e3
Update ultimaker_s5.def.json 2018-10-10 09:29:42 +02:00
THeijmans
d3101b2fd9 Fixed prim blob visibility 
Changed the wrong prime_blob setting, now it should be visible but disabled.
 2018-10-10 09:26:16 +02:00
Lipu Fei
382adf57df Use 0.1 layer height as normal for Ender 3 2018-10-10 07:55:49 +02:00
fieldOfView
ab7fe3138d Remove unused imports 2018-10-09 17:06:20 +02:00