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

298 Commits

Author SHA1 Message Date
Jack Ha
b2b9de7960 CURA-5396 added timeout options for auto detecting baud rate over USB serial 2018-06-07 13:50:40 +02:00
Lipu Fei
f395f1eebc
Merge branch 'master' into WIP_improve_initialization 2018-05-28 13:37:26 +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
Diego Prado Gesto
5704a7b184 Merge branch 'master' into WIP_improve_initialization 
Conflicts:
	cura/AutoSave.py
	cura/BuildVolume.py
	cura/CuraApplication.py

Contributes to CURA-5164
 2018-05-25 09:40:42 +02:00
ChrisTerBeke
fd2e692440 Merge branch '3.3' 2018-05-24 14:33:55 +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
ChrisTerBeke
0e0492327c
Fix missing argument in application stopped signal callback 2018-05-11 18:15:50 +02:00
Lipu Fei
051dd7a6e9 WIP: Make application initialization and start up more clear 
- Create SingleInstance class to handling single instance stuff.
 - Instead of calling getInstance() everywhere, initialize each object
   explicitly in order when application starts and getInstance()s do not
   create instances any more and they merely return the created
   instances.
 - Only set initial values in construtor functions __init__(). Move the
   initialization of context-aware (i.e. things that depend on other
   things) to separate functions.
 - Split application creation and initialziation into several steps and
   them should be called explicitly in the correct order.
 2018-05-04 09:57:02 +02:00
Fredrik Öhrn
33e35e114e Only open USB ports if the printer understands gcode. 2018-04-21 08:09:05 +02:00
Lipu Fei
db5c18295b Merge remote-tracking branch 'origin/3.3' 2018-04-19 09:20:22 +02:00
Lipu Fei
340916179a Small typo fixes for preheat timeout 
CURA-5227
 2018-04-18 12:00:50 +02:00
fieldOfView
bc84c1f6e6 Prevent preheat timeout from occurring during a print 2018-04-04 13:47:40 +02:00
fieldOfView
08d4200f92 Prevent sending next command before an "ok" is received 2018-03-30 14:07:53 +02:00
fieldOfView
c101fe005f Fix getting multiple extruder temperatures from USB printer 2018-03-29 18:28:15 +02:00
Jack Ha
54c85fd0ea CURA-4844 fix some typos 2018-03-29 13:25:26 +02:00
Aleksei S
290adbd906 Fix: bed leveling for UM+ 
CURA-4844
 2018-03-29 11:53:31 +02:00
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