GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 00:34:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,026 Commits 291 Branches 260 Tags
Commit Graph

380 Commits

Author SHA1 Message Date
fieldOfView
dbabf3bda9 Merge branch 'master' into feature_preheat_extruder 
# Conflicts:
#	cura/PrinterOutput/ExtruderOutputModel.py
#	cura/PrinterOutput/PrinterOutputModel.py
 2018-03-15 11:21:37 +01:00
Ghostkeeper
877d061a1b
Catch FileNotFoundError when updating custom firmware 
In case there is a bug there, we won't crash the thread.
 2018-03-14 14:24:08 +01:00
Jaime van Kessel
fa9dc7a1df Fixed send custom firmware 2018-03-14 14:20:03 +01:00
Ghostkeeper
daf77517ac
Merge branch 'master' of https://github.com/slundell/Cura into slundell-master 
Conflict in USBPrinterOutputDevice was caused by us adding a try-except block around a piece of code where Slundell removed one of the lines of code.
 2018-03-14 11:35:06 +01:00
Ghostkeeper
507de9c22c
Catch timeout exceptions when printing via USB 
If the firmware froze or something...
 2018-03-07 11:30:36 +01:00
Simon Lundell
a024be78dc Reverting this commit as this was not the correct way to fix it. 
Revert "Do not send new G-CODEs when the RX buffer is filling up. This is in an attempt to fix #1777 where smoothieware based printers would halt in the middle of the print."

This reverts commit 112bb260acb8655e929cf377b18f505d62608eb1.
 2018-02-23 18:54:31 +01:00
Simon Lundell
5214ef3bde Add a retry when probing for printers on discovered ports. This is to accomodate for printers that needs a few seconds to initialize before they open the port. 2018-02-23 18:47:10 +01:00
Simon Lundell
b3f0292ce6 Cancel the print when the printer sends message (b'!!') about a fatal error. 2018-02-23 18:47:10 +01:00
Simon Lundell
b1be25e8d8 Start the device thread GCODE streaming after the main thread has sent those first few lines of codes. This fixes an issue where a race between the main thread and device thread, caused both to try to send the first lines of codes and the line numbering were then messed up. This caused the printer to 
send a resend request for a line whose number Cura did not recognize, and the printing would wait forever to start.
 2018-02-23 18:47:10 +01:00
Simon Lundell
946a09eb62 Parse heatbed temperatures even if no extruder temperature is sent. Attempts to fix bug #3332 2018-02-23 18:47:10 +01:00
Simon Lundell
d62dbe5187 Stop sending empty commands as this confuses the communication with e.g. Smoothieware. See PR #3346 and bug #1777 2018-02-23 18:47:10 +01:00
Simon Lundell
112bb260ac Do not send new G-CODEs when the RX buffer is filling up. This is in an attempt to fix #1777 where smoothieware based printers would halt in the middle of the print. 2018-02-18 11:44:04 +01:00
Lipu Fei
495fc8bbd7 WIP: Refactor BuildPlateModel and split MultiBuildPlateModel 2018-02-17 22:24:05 +01:00
ChrisTerBeke
6cd64e1ce8
Two more fixes for typo in USBPrinterOutputController 2018-01-25 22:47:48 +01:00
ChrisTerBeke
8c7f8fa1fa
Fix typo in USBOutputController 2018-01-25 22:34:28 +01:00
fieldOfView
fb2a5ea28a Refactor USBPrinterOutputController to reusable cura.PrinterOutput.GenericOutputController 2018-01-18 11:55:30 +01:00
fieldOfView
13206e1fdc Stop preheating when a print is started or the temperature is set to 0 on the printer 2018-01-18 10:16:25 +01:00
fieldOfView
3fed44bb5e Fix typo in class name 2018-01-18 00:42:41 +01:00
fieldOfView
6e0717a967 Merge branch 'master' into feature_preheat_extruder 2018-01-17 17:36:40 +01:00
Jaime van Kessel
1986677276 re-addded connection text 
CL-541
 2018-01-12 10:58:16 +01:00
fieldOfView
76fd49b185 Merge branch 'network_rewrite' into feature_preheat_extruder 2018-01-11 15:28:28 +01:00
fieldOfView
bc5b5ac283 Implement preheating hotends for USB printing 2018-01-11 15:27:38 +01:00
ChrisTerBeke
b2d3d15011 Fix conflicts 2018-01-11 09:06:59 +01:00
Lipu Fei
c8cef9583e rename scene.gcode_list to gcode_dict 
CURA-4741

With the multi build plate feature, scene.gcode_list is now a dict which
stores a list of gcode for a build plate, so it makes more sense to have
it renamed to "gcode_dict" because it's not a list.
 2018-01-08 16:18:41 +01:00
Jaime van Kessel
99de75a3fd Fixed connection label state 
CL-541
 2018-01-08 13:44:20 +01:00
Jaime van Kessel
2ca06f383e USB printers also get their name set 
CL-541
 2018-01-08 09:41:18 +01:00
Jaime van Kessel
79add4ffd8 Added typing 
CL-541
 2017-12-19 16:15:48 +01:00
Jaime van Kessel
b4c83814d9 Clean up unused imports 
CL-541
 2017-12-19 16:03:48 +01:00
Jaime van Kessel
32cbd27b70 Fixed the firmware update for USB print 
CL-541
 2017-12-19 15:59:21 +01:00
Jaime van Kessel
a35f665201 Fixed crash if the firmware was in the list, but not found. 
CL-541
 2017-12-19 10:45:38 +01:00
Jaime van Kessel
1ae881caee USB device is first added and then trying to connect. 
This is to ensure that USB printers work without autodetect
 2017-12-15 16:03:58 +01:00
Jaime van Kessel
bd4797404d Changed showMonitorStage to setActiveStage 
CL-541
 2017-12-15 15:46:15 +01:00
Jaime van Kessel
0ac48817b2 Added abort, start & pause 
USL-541
 2017-12-15 15:00:10 +01:00
Jaime van Kessel
6bdce54e1d Enable progress bar for USB printing 
CL-541
 2017-12-15 14:47:06 +01:00
Jaime van Kessel
a6deddb6ae Added controller for USB printer 
CL-541
 2017-12-15 14:30:01 +01:00
Jaime van Kessel
e2845a224c No longer start print if it's already started 
CL-541
 2017-12-15 14:01:58 +01:00
Jaime van Kessel
aef54f99db If a print is completed, it's now also updated in UI 
CL-541
 2017-12-15 13:43:19 +01:00
Jaime van Kessel
d3d9a6e1bb Starting a print with USB printer now works with reworked printeroutputmodel 
CL-541
 2017-12-15 13:25:35 +01:00
Jaime van Kessel
d3b9ac0d45 Also start reworking the USBPrint. 
It's also time for some much needed code cleaning in that bit. The auto-detect is moved to it's own job,
which should make it a whole lot easier to disable it all together.

CL-541
 2017-12-14 17:37:57 +01:00
ChrisTerBeke
9bf954643c Use new method of setting active stage when needing to switch to monitor 2017-12-07 11:56:52 +01:00
ChrisTerBeke
867836bd76
Merge pull request #2773 from fieldOfView/fix_usb_target_temperatures 
Show USB target temperatures, (estimated) time and jobname
 2017-12-01 15:29:37 +01:00
Ghostkeeper
2236e0016d
Merge branch '3.1' 2017-12-01 14:41:41 +01:00
Diego Prado Gesto
e7ac2e37b4 Fix an error when closing USB connection. This error raised several 
times in the crash reports in the stats.
 2017-12-01 13:17:36 +01:00
ChrisTerBeke
1d68bcc218 Cleanup usb printer output device manager qml component creation - CURA-4568 2017-11-28 14:31:21 +01:00
Jaime van Kessel
0613b1e4b7 Creating components is now done with the prefab function 
CURA-4568
 2017-11-27 13:00:49 +01:00
fieldOfView
2d2b943d07 Fix getting temperatures 2017-11-13 10:44:49 +01:00
fieldOfView
e0c37cc56e Add elapsed time and total time 2017-11-12 20:59:31 +01:00
fieldOfView
698f42b837 Set job name when starting a print and clear it after printing 2017-11-12 17:55:25 +01:00
fieldOfView
826f438c72 Get target temperatures from M105 responses 
Contributes to #2760
 2017-11-12 15:30:55 +01:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"" 
This reverts commit e07e7bc9e714843cf853f0a255ee5a8432696886.

Contributes to issue CURA-4414.
 2017-10-05 10:58:49 +02:00