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

28 Commits

Author SHA1 Message Date
fieldOfView
fc6e92e10f Fix uploading custom firmware on windows 
The simple string replacement left an extraneous "/" in front of the path, which Windows can't handle. QUrl.toLocalFile() does a proper conversion.

CURA-955
 2016-09-06 13:07:15 +02:00
fieldOfView
edd9643703 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-06 10:56:38 +02:00
Jaime van Kessel
6db03538a1 Removed capital letter 
CURA-955
 2016-09-06 09:23:20 +02:00
Jaime van Kessel
71e6733c8e Firmware update logging now uses correct path 
CURA-955
 2016-09-06 09:08:46 +02:00
fieldOfView
fcf89b79c6 Update wording of error messages 2016-09-06 08:55:32 +02:00
Jaime van Kessel
66f773434f UpgradeFirmwareAction now supports custom firmware uploading 
CURA-955
 2016-09-05 15:42:09 +02:00
Thomas Karl Pietrowski
c174ce4396 CURA-2079: Rework on adding detailed error messages to firmware updater 2016-08-17 22:34:04 +02:00
Thomas Karl Pietrowski
e72a10c97a CURA-2079: Using errorCode (WIP) 
Sadly I don't see any reason why errorCode doesn't get updated in QML.
self._errorCode is accessible, but changes to it don't take any effect.
 2016-08-17 01:09:07 +02:00
fieldOfView
dbaa6190be Add firmware upload for umo_dual 
CURA-1774
 2016-08-15 13:43:16 +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
Jack Ha
48792aa8f3 Fixed firmware update screen. CURA-2079. 2016-08-10 12:57:01 +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
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
Jaime van Kessel
232e447a74 Added bq firmware (which caused merge issue) 2016-04-18 15:48:20 +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
b31106a666 Added missing (renamed) file 
CURA-1339
 2016-04-18 11:45:14 +02:00