Lipu Fei
1675ad4ba5
Merge pull request #4487 from fieldOfView/fix_marlin_press_to_resume
...
Fix "press to resume" message after heating bed when usb is connected
2018-10-23 10:27:40 +02:00
fieldOfView
68c3023a46
Make sure firmware name is only requested once
2018-10-19 14:38:25 +02:00
fieldOfView
71d365c0c6
Fix case where Cura and the firmware could be waiting for eachother
2018-10-19 14:37:20 +02:00
Ghostkeeper
2eb9b111fc
Fix changing flow rate in dual extrusion
...
This potentially set the flow rate to -1, since it was changing the flow rate to the old['flowrateTwo'] which was left at -1 since initialisation because it didn't update here.
2018-10-19 09:55:23 +02:00
Ghostkeeper
9aa7b76dbe
Update change log with 3.5.1 changes
...
Too little, too late. But at least you'll be able to look back on it.
2018-10-19 07:55:39 +02:00
fieldOfView
777470db7f
Don't force sending M105 requests without OK
...
This prevents serial buffer overflow on the printer.
2018-10-18 15:47:25 +02:00
fieldOfView
f4c88aff0f
Merge branch 'master' into fix_marlin_press_to_resume
2018-10-18 15:35:57 +02:00
alekseisasin
a7be605b9d
Typing error in CI CURA-5769
2018-10-17 09:50:22 +02:00
Aleksei S
20fa7f4dd8
Display retractions lines for the loaded Gcode files
...
CURA-5769
2018-10-16 16:47:05 +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
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
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
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
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
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
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
fieldOfView
ab7fe3138d
Remove unused imports
2018-10-09 17:06:20 +02:00
fieldOfView
a36deea651
Move updateFirmware to PrinterOutputDevice...
...
along with codestyle and typing fixes
2018-10-09 16:26:45 +02:00
Lipu Fei
1951391a23
Merge remote-tracking branch 'origin/3.5'
2018-10-09 12:04:53 +02:00
alekseisasin
0b70b9a218
Merge pull request #4521 from Ultimaker/CURA-5799_fix_extruder_settings_to_curaengine
...
[3.5] CURA-5799 Fix sending extruder settings to curaengine
2018-10-09 11:53:46 +02:00
Jaime van Kessel
d98eafe041
Merge branch '3.5' of github.com:Ultimaker/Cura
2018-10-08 17:03:25 +02:00
Jaime van Kessel
9e5b72c5b6
Merge branch 'fix_unnecessary_imports' of https://github.com/fieldOfView/Cura
2018-10-08 16:41:29 +02:00
Lipu Fei
5ba60de209
Send extruder settings ordered by extruder position
...
CURA-5799
2018-10-08 16:01:51 +02:00
Ghostkeeper
314b966cc9
Improvements to translated strings
...
These strings were recently found to have been confusing to the translators. Improvements are:
- Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix.
- Remove extra spaces at the end.
- Remove Python logic from within the i18nc call, since gettext doesn't understand that.
Contributes to issue CURA-5741.
2018-10-08 15:03:21 +02:00
Lipu Fei
3965218501
Fix value templating for gcode
...
CURA-5793
Fix GcodeStartEndFormatter to take the correct default_extruder_nr
instead of always using -1.
2018-10-08 14:42:22 +02:00
alekseisasin
c947e4f432
Merge pull request #4485 from Ultimaker/CURA-5768_layer_view_skip_empty_layers
...
Don't skip empty first layers in the layer view
2018-10-08 11:56:35 +02:00
fieldOfView
cb24d58ab8
Don't flood the printer with temperature requests while says it is busy
...
Fixes #3994
2018-10-05 12:57:24 +02:00