GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-10 16:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,130 Commits 290 Branches 260 Tags
Commit Graph

366 Commits

Author SHA1 Message Date
fieldOfView
dbaa6190be Add firmware upload for umo_dual 
CURA-1774
 2016-08-15 13:43:16 +02:00
Thomas Karl Pietrowski
8179fabf1d Merge remote-tracking branch 'upstream/master' into master-CURA-2079 2016-08-14 17:43:26 +02:00
Thomas Karl Pietrowski
f915092f83 CURA-2079: Finish firmware upload process on errors 
Looking at the old code shows that the download process was never
completely finished. The according function was only return'ed, but no
signal was emitted to the window to give the user the possibility to
close it again.

Optionally, it would be useful here to pass messages to the window
dialog to inform the user about problems.

However, this code is untested because:
1. I don't know where put my printers *.hex-file, when coding here with
my editor,
2. Have no idea how to reproduce the IO errors reported at JIRA, so
fingers crossed here.

Contributes to CURA-2079
 2016-08-14 17:37:36 +02:00
fieldOfView
2a55bba840 Code-style fixes 
CURA-2079
 2016-08-11 16:58:02 +02:00
Jack Ha
48792aa8f3 Fixed firmware update screen. CURA-2079. 2016-08-10 12:57:01 +02:00
Jack Ha
9bf4dbd24f Fix wrong variable name 2016-08-10 09:44:27 +02:00
fieldOfView
e551898e04 Add a connection string to the printmonitor 
CURA-2091
 2016-08-09 18:43:09 +02:00
Jaime van Kessel
87a0543d0c Added bit more logging to USBConnection 
This should make the debugging easier out in the field.
 2016-08-09 09:37:31 +02:00
Jaime van Kessel
8eef34ac45 USB printer connection is now reset when print is completed 
CURA-1822
 2016-07-21 10:30:22 +02:00
Jaime van Kessel
33313ddb70 Fixed some imports for USB printing 2016-07-20 15:15:16 +02:00
Jaime van Kessel
3d1bbeca38 Restarting machine check properly re-enables endstop check 
CURA-1385
 2016-07-07 13:43:45 +02:00
Jaime van Kessel
d42a97f036 Fixed firmware upgrade for um2+ 
CURA-1761
 2016-07-06 13:22:09 +02:00
Jaime van Kessel
fc99cac05e Removed update firmware from extensions; This is now handled by machine actions 2016-07-05 09:39:18 +02:00
Thomas Karl Pietrowski
ec41fce7bd USBPrinting: Let's "Print via USB" 
Already made that correction in the past. When print monitor was merged it appeared again.
 2016-07-03 13:26:51 +02:00
fieldOfView
087ebc0768 Automatically show the Print Monitor when starting a print 
CURA-1036
 2016-07-01 15:06:49 +02:00
fieldOfView
6800991fa1 Fix USBPrinterOutputDevice to work with the Print Monitor 
CURA-1036
 2016-07-01 14:32:40 +02:00
Thomas Karl Pietrowski
d376719500 Better call it "Print via USB" 
I think this sounds better, because I understand "USB" as an technology. So you wouldn't say "Print with USB", but would fit if you say "Print with USB cable". So "Print via USB" should be more correct here.
 2016-06-27 09:48:16 +02:00
fieldOfView
8a206b74fd Use new-style signalemitter decorator instead of SingalEmitter subclass 
CURA-1615
 2016-06-21 16:24:07 +02:00
Ghostkeeper
e308c69c54 Merge pull request #804 from thopiekar/master-eclipse-markers 
Adding a marker for a correctly unresolved import on Linux and OSX
 2016-06-16 11:07:27 +02:00
Thomas Karl Pietrowski
7ef64cd05b Return an empty string just to be sure 2016-06-15 17:43:28 +02:00
Thomas Karl Pietrowski
6b41608db2 Correcting the last comment.. 2016-06-15 17:33:52 +02:00
Thomas Karl Pietrowski
51222325b0 Last cleanup 
Removing useless comments and replacing the log message with something
more simple.
 2016-06-15 17:29:49 +02:00
Thomas Karl Pietrowski
77961e83c2 Adding a marker for a correctly unresolved import on Linux and OSX 2016-06-15 15:05:36 +02:00
Thomas Karl Pietrowski
2e7db9b732 Adding check whether getGlobalContainerStack() returns None or not. 
If we get None here, the firmware-updater will be closed and detailed
error returned to the logs with an explanation why.
 2016-06-15 14:38:23 +02:00
Thomas Karl Pietrowski
a7fc3258a7 Only use Application.[...].getGlobalContainerStack() to get all values 2016-06-15 11:16:13 +02:00
Thomas Karl Pietrowski
5128ea41c4 Getting "machine_heated_bed" (hopefully) correctly + little fix 2016-06-15 10:57:58 +02:00
Thomas Karl Pietrowski
9e6f5a4a68 CURA-1615 - Updating for API 3 
This updates the firmware updater to use the new MachineManagerModel

Additionally renamed "machine_type" to "machine_id", which makes it more
selfexplaining, when reading the code.

My printers firmware is not available here and has no heated bed, so
please test this commit!
 2016-06-15 10:04:47 +02:00
fieldOfView
33c4e86163 Change abbreviation of "seconds" to IEEE-recommended "s" (instead of "sec") 2016-06-13 16:14:16 +02:00
Jaime van Kessel
232e447a74 Added bq firmware (which caused merge issue) 2016-04-18 15:48:20 +02:00
Jaime van Kessel
6abeac5c44 Added comment about us violating the API 
CURA-1339
 2016-04-18 15:26:24 +02:00
Jaime van Kessel
2c489ed054 Connection state signal is now connected before connect is called 
CURA-1339
 2016-04-18 15:05:21 +02:00
Jaime van Kessel
8a47903374 Changed namespace of usbprintermanager (QML) to Cura from UM 
CURA-1339
 2016-04-18 15:03:13 +02:00
Jaime van Kessel
fb52d39936 Changed enum values to lowerCamelCase 
CURA-1339
 2016-04-18 14:43:04 +02:00
Jaime van Kessel
0939262ffe Removed stray debug code 
CURA-1339
 2016-04-18 11:47:23 +02:00
Jaime van Kessel
b31106a666 Added missing (renamed) file 
CURA-1339
 2016-04-18 11:45:14 +02:00
Jaime van Kessel
6b7fb894f8 Added moveHead to usb printing 
And ensured that wizard page uses correct version again

CURA-1339
 2016-04-14 14:21:22 +02:00
Jaime van Kessel
fc88844cf8 Added relative move option 
CURA-1339
 2016-04-14 14:05:36 +02:00
Jaime van Kessel
4b5c118ed2 Refactoring & documentation 
CURA-1339
 2016-04-14 13:55:33 +02:00
Jaime van Kessel
8c971d217d Fixed typo in command for setting nozzle temp 
CURA-1339
 2016-04-14 13:22:48 +02:00
Jaime van Kessel
92c0c4b637 Remove unusde code 
CURA-1339
 2016-04-14 13:18:05 +02:00
Jaime van Kessel
34b76f3c1e Implemented _setTargetHotendTemp 
CURA-1339
 2016-04-14 13:04:16 +02:00
Jaime van Kessel
0c09df71d9 wizard now sets Target temperature 
CURA-1339
 2016-04-14 11:09:30 +02:00
Jaime van Kessel
58b216828a Added handling for when connection was never correctly added to list 
CURA-1339
 2016-04-14 11:06:11 +02:00
Jaime van Kessel
4f3489233c Added home head & bed implementations 
CURA-1339
 2016-04-14 11:02:43 +02:00
Jaime van Kessel
5f2e0ceec8 Fixes so the QML displays right temperatures again 
CURA-1339
 2016-04-14 11:02:16 +02:00
Jaime van Kessel
0a46567c17 USB printing now uses printeroutputdevice for temperatures 
CURA-1339
 2016-04-13 16:57:08 +02:00
Jaime van Kessel
0cd1031ec7 Changed USB printing to reflect changes in output device API 
CURA-1339
 2016-04-13 15:15:37 +02:00
Jaime van Kessel
63eb1793ad Renaming USBPrinterConnection 
CURA-1339
 2016-04-12 15:15:02 +02:00
ckielstra
4c233e75f4 Spelling 2016-04-08 11:06:24 +02:00
fieldOfView
27e3f8b33f Fix color of some texts on Linux with dark theme 
Use Label{} instead of Text{}

CURA-1143
 2016-04-07 18:57:11 +02:00