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

179 Commits

Author SHA1 Message Date
Nino van Hooff
49b93db6df Use plugin Id instead of __file__ for USBPrinting 
CURA-6255
 2019-12-24 14:51:50 +01:00
Jaime van Kessel
c2e6116983
Add names to all the threads 2019-11-01 16:20:42 +01:00
Ghostkeeper
c875252b53
Fix some mistakes indicated by PyCharm's linting 2019-10-15 15:27:58 +02:00
Lipu Fei
4b8a216771 Fix typing 2019-07-22 09:34:00 +02:00
Ghostkeeper
cc9609738c
Show a message when trying to print via USB while already printing 
Otherwise the button does nothing and gives no feedback of why it does nothing.

Fixes #6026.
 2019-07-18 11:55:26 +02:00
Ghostkeeper
f334fa8578
Spelling of log entries and code style 2019-07-18 11:49:18 +02:00
Jaime van Kessel
49a9561625 Added exception handling for serial write 2019-04-08 17:43:03 +02:00
Jaime van Kessel
cbfe10a748 Prevent a zeroDivision error from crashing the usb printing 
This fixes #5592
 2019-04-08 13:36:48 +02:00
Lipu Fei
4a171eebf6 Move models around again 
- Move machine related models to cura.Machines.Models
 - Move printer device related models to cura.PrinterOutput.Models
 - Other UI/GUI related modules in cura.UI
 2019-03-26 08:29:22 +01:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Lipu Fei
6a8db55112 Move PrinterOutputModel into cura.UI module 2019-03-20 09:43:10 +01:00
Lipu Fei
2b39d6422c Move PrinterOutputDevice into cura.PrinterOutput module 2019-03-20 09:43:09 +01:00
Lipu Fei
e30104ff7f Move PrintJobOutputModel into cura.UI module 2019-03-20 09:27:23 +01:00
Ghostkeeper
2d9910d3f0
Fix post-processing scripts when printing via USB 
The g-code writer processes the post-processing scripts properly, so get the g-code from that plug-in.
 2019-03-11 11:59:23 +01:00
Andrew
70e640be22
Change regexp for greater compatibility 
Change regexp in bed_temperature_matches  and extruder_temperature_matches for greater compatibility with different printers.
 2019-03-08 11:25:49 +06:00
Andrew
e56a97bfa2
monitor does not show "Build Plate" 
bed_temperature_matches : error in temperature search expression
 2019-03-06 17:28:22 +06:00
Lipu Fei
efa26c8323 Merge remote-tracking branch 'origin/4.0' 2019-02-01 11:08:33 +01:00
Jaime van Kessel
9a3d9dd2c1 Ensure that writeStarted is called when attempting to print via USB 2019-01-31 17:42:20 +01:00
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