GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 13:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,243 Commits 287 Branches 260 Tags
Commit Graph

161 Commits

Author SHA1 Message Date
Ghostkeeper
33abbd4c89
Merge branch '4.0' 2019-01-25 12:03:38 +01:00
Ghostkeeper
91dc3713ae
Initialise idle count properly 
This is a field so it should always get initialised in the __init__ function.

Fixes #5218.
 2019-01-25 12:03:21 +01:00
susisstrolch
6600cea632 Add missing baudrate to USB connection. 
Extend the baudrate list by 500.000bd to also detect Vertex Delta 3D (K8800). Fixes #4952
 2018-12-18 16:51:16 +01:00
Jaime van Kessel
84a7f2e5a2 Fix review comments 
CURA-6011
 2018-12-18 09:40:08 +01:00
Lipu Fei
6bf39a32a9 Rename Enum names to camal cases 
CURA-6011
 2018-12-14 09:56:10 +01:00
Aleksei S
973970a895 Every print ouput device should define its connection type(usb, network, cluster and etc) 
CURA-6011
 2018-12-13 16:00:12 +01:00
Jaime van Kessel
6d4a460e58 Move USB sidebar into the main view of the monitorstage 
CURA-5943
 2018-11-30 13:53:53 +01: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
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
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
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
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
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
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
fieldOfView
61ffdf23d7 Fix MYPY/typing errors 2018-10-03 20:24:32 +02:00
fieldOfView
c4919d65f4 Merge branch 'master' into feature_firmware_updater 2018-10-03 14:02:24 +02:00
fieldOfView
9af71f2888 Fix incorrect typing and issues caused by typing 2018-09-28 13:40:39 +02:00
fieldOfView
b73a71746e Fix missing imports 2018-09-28 13:06:36 +02:00
fieldOfView
6be6d6cfc3 Fixed missing typing import 2018-09-28 12:49:53 +02:00
fieldOfView
a573a598b0 Add typing and appease MYPY 2018-09-28 12:40:44 +02:00
fieldOfView
7c23a4e187 Merge branch 'master' into feature_firmware_updater 2018-09-28 11:32:28 +02:00
fieldOfView
9c865e80d1 Remove debug print 2018-09-14 19:15:23 +02:00
fieldOfView
6bf91d2b3a Fix updating temperature while preheating bed or extruder 
While preheating the bed/extruder with M190 or M109, the firmware keeps outputting temperature lines, but these do not contain "ok" because no new command was acknowledged.

Fixes #3741
 2018-09-14 13:59:05 +02:00
Ghostkeeper
1136033f97
Remove superfluous check for 'ok T:' 
This check is never hit because if there is 'ok T:' in the bytes array then it will have hit the first check for 'ok ' and 'T:'.
 2018-09-03 10:50:07 +02:00
fieldOfView
43b4ca3044 Fix code-style 2018-09-02 18:02:33 +02:00
fieldOfView
5d52239201 Code style 2018-08-24 09:09:49 +02:00
fieldOfView
4bea1410b8 Allow printer output devices to set their ability to update firmware 2018-08-22 14:37:48 +02:00
alekseisasin
c190c8d05a
Merge pull request #3999 from fieldOfView/fix_firmware_upload 
Fix firmware upload on Windows
 2018-08-10 11:39:53 +02:00
fieldOfView
3ac5342dfc Separate firmware updater from USBPrinterOutputDevice 2018-08-02 11:11:22 +02:00
fieldOfView
171220205c Merge branch 'fix_firmware_upload' into feature_firmware_updater 2018-08-01 11:25:42 +02:00
fieldOfView
846c55a99d Simplify detection of url-encoded filepatch 2018-07-31 09:47:18 +02:00
Lipu Fei
006c778d3e
Merge pull request #3855 from jorgegarciadev/master 
Fix for detecting USB connection to Malyan M200 and Monoprice Mini
 2018-07-24 17:00:43 +02:00
fieldOfView
65ada30c9c Fix flashing "default" firmware 
The url is not QUrl encoded if the "default" firmware is flashed
 2018-07-17 09:01:06 +02:00
Lipu Fei
49bd249819 Update text for USB printing exit confirmation 
CURA-5384
 2018-07-13 11:10:15 +02:00
Lipu Fei
c0b7e40b0d Add on-exit callback management and check for active USB printing 
CURA-5384
 2018-07-13 09:16:11 +02:00
Lipu Fei
ac3d3bc5c0 Revert "Added signal to prevent window closing if USB printer is printing" 
This reverts commit 596a7b7169b9c7e41cd4751f99eea656f67ed2b7.
 2018-07-13 08:08:56 +02:00
Aleksei S
596a7b7169 Added signal to prevent window closing if USB printer is printing 
CURA-5384
 2018-07-11 13:23:30 +02:00
Ghostkeeper
f59f23c027
Fix sending print job name via USB 2018-07-09 11:41:02 +02:00
fieldOfView
7e90546163 Fix firmware upload on Windows... 
by correctly creating a local path from a url-encoded path

Fixes #3731 and #3987
 2018-06-29 10:34:15 +02:00
Ghostkeeper
79c6b2dad8
Use CuraApplication instead of Application 
Because UM.Application doesn't have any getPrintJobInformation function or anything like that.

Contributes to issue CURA-5330.
 2018-06-15 16:55:30 +02:00
Diego Prado Gesto
a184fad8ee CURA-5330 Add typing to the USBPrinting plugin 2018-06-14 15:57:30 +02:00
Jorge García
4bd87e2164
Fix for showing temperatures for Malyan M200 and Monoprice Mini 2018-05-26 13:15:36 +02:00
Ghostkeeper
0d55b8b440
Resume after pausing without waiting for next ok 
Previously the resume only worked because in the message receiving loop it would no longer ignore the next 'ok'. It doesn't actually send a message that would trigger an 'ok'. This only worked because we are polling every 2 seconds for the nozzle temperature which also happens to trigger an 'ok' response, which we interpret as a go-ahead for being able to send the next g-code line.
Now it's no longer dependent on the fact that we happen to also poll the temperatures, so the code is more stable. And it also resumes immediately instead of waiting for up to 2 seconds.
 2018-05-25 12:04:00 +02:00
Ghostkeeper
7c0eb43a23
Fix unpausing after cancelling a print 
The variable name is self._paused, not self._is_paused. This was doing nothing at all.
 2018-05-25 11:44:37 +02:00
Ian Paschal
26e32dc08a Added missing colon 2018-05-24 11:46:46 +02:00
ChrisTerBeke
c491cb4707
Merge pull request #3597 from fieldOfView/fix_multiextruder_usb_temperatures 
[3.3] Fix getting multiple extruder temperatures from USB printer
 2018-05-24 10:52:30 +02:00
Lipu Fei
db5c18295b Merge remote-tracking branch 'origin/3.3' 2018-04-19 09:20:22 +02:00