diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index e20588afca..920a71d40f 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -90,7 +90,6 @@ class USBPrinterOutputDevice(PrinterOutputDevice): self._firmware_update_finished = False self._error_message = None - self._error_code = 0 onError = pyqtSignal() @@ -202,7 +201,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): if not programmer.isConnected(): Logger.log("e", "Unable to connect with serial. Could not update firmware") self._updateFirmwareFailedCommunicationError() - return + return self._updating_firmware = True @@ -225,19 +224,19 @@ class USBPrinterOutputDevice(PrinterOutputDevice): ## Private function which makes sure that firmware update process has failed by missing firmware def _updateFirmwareFailedMissingFirmware(self): return self._updateFirmwareFailedCommon(4) - + ## Private function which makes sure that firmware update process has failed by an IO error def _updateFirmwareFailedIOError(self): return self._updateFirmwareFailedCommon(3) - + ## Private function which makes sure that firmware update process has failed by a communication problem def _updateFirmwareFailedCommunicationError(self): return self._updateFirmwareFailedCommon(2) - + ## Private function which makes sure that firmware update process has failed by an unknown error def _updateFirmwareFailedUnknown(self): return self._updateFirmwareFailedCommon(1) - + ## Private common function which makes sure that firmware update process has completed/ended with a set progress state def _updateFirmwareFailedCommon(self, code): if not code: diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index 9ba8d0d44b..7eb03437d7 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -27,7 +27,7 @@ "default_value": true }, "machine_center_is_zero": { - "default_value": false + "default_value": true }, "machine_nozzle_size": { "default_value": 0.4 @@ -56,7 +56,7 @@ "default_value": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position" }, "machine_end_gcode": { - "default_value": "M104 S0\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" + "default_value": "M104 S0\nM140 S0 ; heated bed heater off\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" }, "layer_height": { "default_value": 0.15 @@ -65,7 +65,7 @@ "default_value": 0.8 }, "top_bottom_thickness": { - "default_value": 0.3 + "default_value": 1.2 }, "material_print_temperature": { "default_value": 215 @@ -95,5 +95,9 @@ "infill_overlap": { "default_value": 10.0 } - } -} \ No newline at end of file + }, + "machine_preferences": { + "prefered_profile": "Normal Quality", + "prefered_material": "PLA" + } +} diff --git a/resources/meshes/inventor_platform.stl b/resources/meshes/inventor_platform.stl index c83f58b66f..a55ab0705b 100644 Binary files a/resources/meshes/inventor_platform.stl and b/resources/meshes/inventor_platform.stl differ diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 001d2af8d4..33ce3cc7be 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -46,11 +46,11 @@ UM.PreferencesPage UM.Preferences.resetPreference("view/top_layer_count"); topLayerCountCheckbox.checked = boolCheck(UM.Preferences.getValue("view/top_layer_count")) - if (plugins.model.find("id", "SliceInfoPlugin") > -1) { + if (plugins.find("id", "SliceInfoPlugin") > -1) { UM.Preferences.resetPreference("info/send_slice_info") sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info")) } - if (plugins.model.find("id", "UpdateChecker") > -1) { + if (plugins.find("id", "UpdateChecker") > -1) { UM.Preferences.resetPreference("info/automatic_update_check") checkUpdatesCheckbox.checked = boolCheck(UM.Preferences.getValue("info/automatic_update_check")) } @@ -58,6 +58,9 @@ UM.PreferencesPage Column { + //: Model used to check if a plugin exists + UM.PluginsModel { id: plugins } + //: Language selection label UM.I18nCatalog{id: catalog; name:"cura"} @@ -301,7 +304,7 @@ UM.PreferencesPage } UM.TooltipArea { - visible: plugins.model.find("id", "UpdateChecker") > -1 + visible: plugins.find("id", "UpdateChecker") > -1 width: childrenRect.width height: visible ? childrenRect.height : 0 text: catalog.i18nc("@info:tooltip","Should Cura check for updates when the program is started?") @@ -316,7 +319,7 @@ UM.PreferencesPage } UM.TooltipArea { - visible: plugins.model.find("id", "SliceInfoPlugin") > -1 + visible: plugins.find("id", "SliceInfoPlugin") > -1 width: childrenRect.width height: visible ? childrenRect.height : 0 text: catalog.i18nc("@info:tooltip","Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.") @@ -329,13 +332,5 @@ UM.PreferencesPage onCheckedChanged: UM.Preferences.setValue("info/send_slice_info", checked) } } - - //: Invisible list used to check if a plugin exists - ListView - { - id: plugins - model: UM.PluginsModel { } - visible: false - } } } diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 0272e063cb..ab00a33cac 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -354,12 +354,11 @@ Item Component.onCompleted: populateExtruderModel() } - //: Invisible list used to populate the extrudelModel - ListView + //: Model used to populate the extrudelModel + Cura.ExtrudersModel { id: extruders - model: Cura.ExtrudersModel { onModelChanged: populateExtruderModel() } - visible: false + onModelChanged: populateExtruderModel() } } @@ -370,10 +369,10 @@ Item text: catalog.i18nc("@label", "Don't print support"), color: "" }) - for(var extruderNumber = 0; extruderNumber < extruders.model.rowCount() ; extruderNumber++) { + for(var extruderNumber = 0; extruderNumber < extruders.rowCount() ; extruderNumber++) { extruderModel.append({ - text: catalog.i18nc("@label", "Print using %1").arg(extruders.model.getItem(extruderNumber).name), - color: extruders.model.getItem(extruderNumber).color + text: catalog.i18nc("@label", "Print support using %1").arg(extruders.getItem(extruderNumber).name), + color: extruders.getItem(extruderNumber).color }) } }