3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 09:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3709 commits 302 branches 270 tags 770 MiB
Commit graph

882 commits

Author SHA1 Message Date
fieldOfView
a78e1a62d4 Fix ctypes imports in WindowsRemovableDrivePlugin 
See 9684ca80d7
 2016-03-17 20:34:18 +01: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
Jaime van Kessel
7c22fe1eb5 Removable drive plugin is now forced to use machine preference for output type 
Fixes CURA-1165
 2016-03-15 16:43:14 +01:00
Jaime van Kessel
4fb9a6a699 Per object settings now also uses visible depth 
CURA-1160
 2016-03-15 16:15:13 +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
Thomas-Karl Pietrowski
8197e84927 Using PyDev compatible tag 2016-03-15 12:54:41 +01:00
Thomas-Karl Pietrowski
9684ca80d7 Removing unused imports, reorder them and replace windll with ctypes.windll (the same) 2016-03-15 12:53:29 +01:00
Jaime van Kessel
b863d239b0 Added more logging to engine connection 
Should make it easier to debug future issues. CURA-1133
 2016-03-15 12:53:22 +01:00
Thomas-Karl Pietrowski
6cd1171051 Removing unused imports 2016-03-15 12:53:07 +01:00
Thomas-Karl Pietrowski
0b93328aeb Using PyDev compatible tags 2016-03-15 12:52:29 +01:00
Thomas-Karl Pietrowski
e99099fd89 Cleanup in plugins/ImageReader/ImageReader.py 
* Removing unused import
* Marking two variables as @UnusedVariable
* Replacing i with _ in for-loop
 2016-03-15 12:50:46 +01:00
Thomas-Karl Pietrowski
c986fa0268 Removing unused imports 2016-03-15 12:50:29 +01:00
Thomas-Karl Pietrowski
5d00c3120d Use save variable names here 2016-03-15 12:35:33 +01:00
Thomas-Karl Pietrowski
8b95865843 Import of Logger missing here 2016-03-15 12:34:43 +01:00
Thomas-Karl Pietrowski
74627345a2 Corrections in plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py 
* Remove unused import
* Replace dict with dictionary in comment
* Use object_position instead of i
* Use current_object instead of object which is a built-in class
 2016-03-15 12:32:40 +01:00
Thomas-Karl Pietrowski
d1f5985fee Removing unused imports 2016-03-15 12:25:51 +01:00
Thomas-Karl Pietrowski
0081c44ba7 Marking unused variable 
Maybe work in progress here...
 2016-03-15 12:25:10 +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
7bc99c8c19 Removing unneeded imports and marking unused variable 
Not sure whether there is a WIP on the unused variable
 2016-03-14 17:18:45 +01:00
Thomas-Karl Pietrowski
6993e9e695 Renaming locals to copied_locals 
"locals" is something that comes with Python. Better renaming it.
 2016-03-14 17:16:23 +01:00
Thomas-Karl Pietrowski
429e54bc8a Removing unused import 2016-03-14 17:15:57 +01:00
Thomas-Karl Pietrowski
5a5664e164 RemovableDriveOutputDevice: Use device.getId() 
Should fix unmounting on OSX. Found this solution in Linux*.py.

Untested and fingers crossed...
 2016-03-14 17:07:02 +01:00
Thomas-Karl Pietrowski
3b8000035d Remove unneeded imports 2016-03-14 17:06:44 +01:00
Thomas-Karl Pietrowski
19ccfdfbd7 RemovableDriveOutputDevice: Same for OSX 
See 0b0bc80805
 2016-03-14 17:04:51 +01:00
Thomas-Karl Pietrowski
0b0bc80805 RemovableDriveOutputDevice: Making output of uname command useful 2016-03-14 17:03:08 +01:00
Thomas-Karl Pietrowski
2a104bc6da Remove unused imports and replace object with entry 
"object" is also a built-in function of python
 2016-03-14 15:47:17 +01:00
Thomas-Karl Pietrowski
cbc7f0c1de Remove unneeded line 
This variable gets redefined later...
 2016-03-14 15:45:02 +01:00
Thomas-Karl Pietrowski
27da5c56c0 Marking unused variable 2016-03-14 15:43:57 +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