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

138 Commits

Author SHA1 Message Date
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
Thomas-Karl Pietrowski
4d0a2094a1 USBPrinting: Reordering printers in dictionaries 2016-03-14 14:13:26 +01:00
Thomas-Karl Pietrowski
b3f721cfa0 USBPrinting: Using the correct dictionary 
(Dirty coding does not make any sense..)
 2016-03-14 14:02:56 +01:00
Thomas Karl Pietrowski
8422356dc9 USBPrinting: Correcting typo 2016-03-14 13:57:27 +01:00
Thomas Karl Pietrowski
eed5f88b13 USBPrinting: Adding a short instruction 
Just added a short instruction where to find the id of the machine, just to make it easier for the vendor to fill in the correct values.
 2016-03-14 13:56:27 +01:00
Thomas-Karl Pietrowski
a1e673dc64 USBPrinting: Correcting indents 2016-03-14 13:34:49 +01:00
Thomas-Karl Pietrowski
a2915ddc80 USBPrinting: Correcting machine_with_heated_bed dictionary again (oops) 2016-03-14 10:16:53 +01:00
Thomas-Karl Pietrowski
d968d3e2b2 USBPrinting: Correcting machine_with_heated_bed dictionary 2016-03-14 10:14:12 +01:00
Thomas-Karl Pietrowski
29ea25d0b3 USBPrinting: Huge clean up in _getDefaultFirmwareName 
* Moving TODO on top of if clauses
* Moving all machine types and hex-file names into dictionaries
* Adding error messages for unknown printers
 2016-03-14 10:04:30 +01:00
Thomas-Karl Pietrowski
97a7cee3e2 USBPrinting: Using platform.system() for platform check 
As platform is already imported here, usig platform for the check is much easier.
 2016-03-14 09:42:57 +01:00
Thomas-Karl Pietrowski
8bbbb480a4 USBPrinting: Moving baudrate and correcting indent 
Moves the baudrate into the if clause, which looks at least for me better and just found a wrong indent
 2016-03-14 09:38:55 +01:00
Ghostkeeper
3690eafb72 Add filter_by_machine parameter to USBPrinting 
This was an oversight. When the filter_by_machine feature was added, we didn't think of the USB printing output device. The feature has no meaning here, since USB printing only supports g-code. Just ignore it.
 2016-03-10 10:46:54 +01:00
Jaime van Kessel
339ee12f90 Not being able to find firmware no longer blocks GUI 
Cura-440
 2016-02-29 13:57:40 +01:00