GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-09 03:12:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,027 Commits 295 Branches 268 Tags
Commit Graph

107 Commits

Author SHA1 Message Date
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
Jaime van Kessel
339ee12f90 Not being able to find firmware no longer blocks GUI 
Cura-440
 2016-02-29 13:57:40 +01:00
Ghostkeeper
b9bc14ea09 Make progress bar determinate when at 100% 
This gives the user a better indication that the firmware update is done. The progress bar is still sorta disfunctional, but hey even disabled people are people.

Contributes to issue CURA-440.
 2016-02-23 17:27:17 +01:00
Ghostkeeper
abed3d8c7d Make firmware update loading bar indeterminate 
There is no real progress to report, so it's actually indeterminate.

Contributes to issue CURA-440.
 2016-02-23 17:27:17 +01:00
Ghostkeeper
c41b9fb09a UMO firmware update to detect heated bed 
It detects it by virtue of whether the user indicated that the printer has a heated bed during the add printer wizard.

Contributes to issue CURA-440.
 2016-02-23 17:27:17 +01:00
Arjen Hiemstra
e6ef4405c3 Replace a bunch of Theme property accessors with getThing calls 2016-02-23 12:24:26 +01:00
Ghostkeeper
9379b0a97b Update translation from machine name to hex file 
There was an incongruence in the translation from the machine name to hex file. Sometimes the machine name was wrong. Sometimes the hex file was wrong.

Contributes to issue CURA-440.
 2016-02-12 17:09:42 +01:00
Tamara Hogenhout
c48051e39d marked the string as translatable 
Contributes to #CURA-526
 2016-01-18 12:19:59 +01:00
Arjen Hiemstra
949fd199a8 Fix the last code style issue 2015-11-30 11:56:08 +01:00
daid
743b403b29 Whole bunch of um-pep8 style fixes. 2015-11-27 13:50:44 +01:00
Arjen Hiemstra
751f58fb02 Merge branch '15.10' 
* 15.10: (39 commits)
  Remove unused import in StartSliceJob
  conforming to code style
  fix typo's..
  Adjust initial view to be slightly from the side
  uses a different method to check whether a machine name excists
  Sets the languageComboBox to the default language
  Remove per-group settings for now
  Make sure to send all settings when an object overrides the profile
  Properly emit writeStarted in RemovableDriveOutputDevice
  Add xy_offset setting to list of settings that trigger a disallowed area update
  Properly trigger a reslice when the active instance is changed
  Wizardpages without hack
  Only hides the window when there are no more pages
  Only add layer data node after all processing
  Also account for "xy_offset" setting for the disallowed areas
  JSON: workaround for stutter in spiralize vase: set travel speed to printing speed
  Adds a color for the error-messages
  Shows an error message when a user tries to add a printer with a name that already excists.
  JSON: support bottom stair step height defaults changed so that the bottom distance to the model isn't violated too much
  Try to use Protobuf CPP implementation if it is available
  ...
 2015-11-13 11:31:29 +01:00
Arjen Hiemstra
a1087150ef Properly clean up printer connections that are no longer available. 
Contributes to CURA-274
 2015-10-30 13:46:58 +01:00
Arjen Hiemstra
67e00221eb Display a message that there are no connected printers when trying to update firmware 
Contributes to CURA-274
 2015-10-30 13:46:58 +01:00
Arjen Hiemstra
37c977cea6 Properly end firmware update procedure and catch errors during firmware update 
Contributes to CURA-274
 2015-10-30 13:46:58 +01:00
Arjen Hiemstra
9626a604c2 Do not inherit BaseException, but use Exception 
As indicated by Python docs, custom exceptions should use Exception as
base.

Contributes to CURA-274
 2015-10-30 13:46:58 +01:00
daid
d5d88e2300 Fix a few more style violations in the avr_isp code. 2015-10-28 15:51:06 +01:00
daid
a4a0dfdf89 Fix code style violations in the avr_isp 2015-10-28 15:05:07 +01:00
Arjen Hiemstra
936c2f9365 Merge branch '15.10' 
* 15.10:
  Remove full screen from menu and disable the shortcut key
  Properly default infill_sparse_thickness to layer_height`
  Changes the color of the 'C' in one iconfile
  moves the changelog from on-startup to the extensions menu
  Fix firmware update to properly report progress
  Use a decorator to track Z offset
  Remove infill_sparse_combine setting
  Update for BQ printers profiles
  Bump version
  Properly position groups and nodes once ungrouped
 2015-10-27 14:24:25 +01:00
Arjen Hiemstra
e7e833bfcf Fix firmware update to properly report progress 
CURA-274 #Ready-for-Review
 2015-10-26 13:00:10 +01:00
Ghostkeeper
da1d59ff98 Merge branch 15.10 into master 
Where automatic merging failed, the version of 15.10 was used.
 2015-10-16 16:56:59 +02:00
Tamara Hogenhout
ed693d57a9 Fixes that the firmware update kan be called from the add machine -> add UMO wizard 
fixes #CURA-256
 2015-10-14 16:03:29 +02:00
Tamara Hogenhout
861b535f9d Implementing missing functionalities on the addmachine -> add original wizard 
contributes to #CURA-256
 2015-10-14 11:53:53 +02:00
mpbomil
31a3124e45 Typo's in PrinterConnection.py 
Some of the "threading.Thread.daemon"s have typo's.
 2015-10-13 13:54:28 +02:00
Arjen Hiemstra
5b2cdb8012 Update RemovableDrive and USB output devices to use the new file_name parameter 
Contributes to CURA-183
 2015-09-23 18:21:04 +02:00
Jaime van Kessel
635ec0b683 Added more logging to usb printing 2015-09-23 11:04:41 +02:00
Jaime van Kessel
9380dacbed Small fix to USB printing which should fix the issues for printrbots 2015-09-18 15:24:21 +02:00
Arjen Hiemstra
6eeb4c9e75 Make sure we have a catalog to read translations from 2015-09-18 12:15:21 +02:00
Jaime van Kessel
51415a0c53 Updated logging & resuffled auto baud list to improve speed 2015-09-17 11:08:25 +02:00
Jaime van Kessel
4808f52f59 Fixed heatup bed command in checking wizard 2015-09-17 10:43:56 +02:00
Jaime van Kessel
998ebce608 Fixed USB manager so correct firmware filename is generated 2015-09-14 16:11:06 +02:00
Jaime van Kessel
f272820100 Fixed paths for firmware 2015-09-10 11:24:47 +02:00
Tamara Hogenhout
ef93524d78 adds/adapts translation context markers 
last nesscessary changes for internationalisation -> Cura

Contributes to: issue CURA-116
 2015-09-09 15:25:39 +02:00
Tamara Hogenhout
4a9bf2b4d6 adds/adapts translation context markers 
all nescessary in folder: Cura/plugins

Contributes to: issue CURA-116
 2015-09-08 15:26:49 +02:00