GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-06 19:29:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,379 Commits 290 Branches 260 Tags
Commit Graph

400 Commits

Author SHA1 Message Date
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
fieldOfView
6017d9176d Remove exception logging in USBPrinterManager because it caused an error every 5 seconds. 
CURA-1198
 2016-03-17 16:59:41 +01:00
Ghostkeeper
de9a66e1f4 Merge branch '2.1' 
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
 2016-03-17 15:24:00 +01:00
Jaime van Kessel
2df91d8e0b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-17 14:44:37 +01:00
Jaime van Kessel
89256b5423 Added explicit home bed before rest of bed leveling 
CURA-1102
 2016-03-17 14:44:09 +01:00
Ghostkeeper
4507560e30
Codestyle: Whitespace around operators 
A space on both sides around binary operators. A space after the comma.

Contributes to issue CURA-1102.
 2016-03-17 11:53:11 +01:00
Jaime van Kessel
9a6615213c Bed should no longer be damaged when leveling 
CURA-1102
 2016-03-16 15:18:11 +01:00
Thomas-Karl Pietrowski
6a4e2019dc Removing unused imports 2016-03-15 12:57:03 +01:00
Thomas-Karl Pietrowski
148c13ac31 Removing unused imports, fixing a indent and adding more logging 
* Added the logging here, because it was called "except Exception as e:", so "e" seems to be something relevant.
 2016-03-15 12:55:08 +01:00
Ghostkeeper
e4effc1236 Merge pull request #665 from thopiekar/master-code-fixes 
Fixing small issues in the code
 2016-03-15 10:57:50 +01:00
Thomas-Karl Pietrowski
af280b782e Rename name to printer_name 
"name" is a built-in function
 2016-03-14 15:39:01 +01:00
Thomas-Karl Pietrowski
3b58d1e2a5 Removing unused import of "os" 2016-03-14 15:38:05 +01:00
Thomas-Karl Pietrowski
bad862e72f USBPrinting: Adding lost check for "machine_heated_bed" 2016-03-14 15:09:10 +01:00
Thomas-Karl Pietrowski
b0e4f095a6 Merge branch 'master-usb-printing' of https://github.com/thopiekar/Cura into master-usb-printing 2016-03-14 14:49:25 +01:00
Thomas-Karl Pietrowski
e7bd07740e USBPrinting: Reordering and rethinking machine detection 
* Moved all machines again to a basic dictionary
** The idea is to collect all machines at one place, which are unmodified. In case there is a printer, which is modified, it goes to a seperate dictionary.
* The if-clauses now respect this idea (hopefully)
 2016-03-14 14:43:14 +01:00
Thomas Karl Pietrowski
6775d337f5 USBPrinting: Complete the note with a link to the hex files 2016-03-14 14:23:26 +01:00
Thomas-Karl Pietrowski
9f251a43e2 Merge branch 'master-usb-printing' of https://github.com/thopiekar/Cura into master-usb-printing 2016-03-14 14:16:35 +01:00