Merge branch 'master' of github.com:Ultimaker/Cura

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2019 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 from time import time
+import os
 from typing import List, Optional, cast
 
 from PyQt5.QtCore import QObject, QUrl, pyqtProperty, pyqtSignal, pyqtSlot
@@ -191,8 +192,9 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
     def _onPrintJobCreated(self, job: ExportFileJob) -> None:
         output = job.getOutput()
         self._tool_path = output  # store the tool path to prevent re-uploading when printing the same file again
+        file_name = job.getFileName()
         request = CloudPrintJobUploadRequest(
-            job_name=job.getFileName(),
+            job_name=os.path.splitext(file_name)[0],
             file_size=len(output),
             content_type=job.getMimeType(),
         )

resources/definitions/flyingbear_ghost_4s.def.json

@@ -0,0 +1,54 @@
+{
+	"name": "Flying Bear Ghost 4S",
+	"version": 2,
+	"inherits": "flyingbear_base",   
+	"metadata": {
+		"visible": true,
+		"author": "oducceu",
+
+		"platform": "flyingbear_platform.obj",
+		"platform_texture": "flyingbear_platform.png",
+
+		"quality_definition": "flyingbear_base"
+
+	},
+
+	"overrides": {
+		"machine_name": 		{ "default_value": "Flying Bear Ghost 4S" },
+		"machine_width": 		{ "default_value": 255 },
+		"machine_depth": 		{ "default_value": 210 },
+		"machine_height": 		{ "default_value": 210 },
+
+		"machine_steps_per_mm_x": 	{ "default_value": 80 },
+		"machine_steps_per_mm_y": 	{ "default_value": 80 },
+		"machine_steps_per_mm_z": 	{ "default_value": 400 },
+		"machine_steps_per_mm_e": 	{ "default_value": 400 },
+
+		"machine_max_feedrate_x": 	{ "value": 200 },
+		"machine_max_feedrate_y": 	{ "value": 200 },
+		"machine_max_feedrate_z": 	{ "value": 20 },
+		"machine_max_feedrate_e": 	{ "value": 70 },
+
+		"acceleration_enabled": 	{ "value": false },
+		"jerk_enabled": 		{ "value": false },
+
+		"machine_max_acceleration_x": 	{ "value": 1000 },
+		"machine_max_acceleration_y": 	{ "value": 1000 },
+		"machine_max_acceleration_z": 	{ "value": 100 },
+		"machine_max_acceleration_e": 	{ "value": 1000 },
+		"machine_acceleration": 	{ "value": 1000 },
+
+		"machine_max_jerk_xy": 		{ "value": 20 },
+		"machine_max_jerk_z": 		{ "value": 0.4 },
+		"machine_max_jerk_e": 		{ "value": 5.0 },
+
+		"acceleration_print": 		{ "value": 1000 },
+		"acceleration_travel": 		{ "value": 1000 },
+		"acceleration_travel_layer_0": 	{ "value": "acceleration_travel" },
+		"acceleration_roofing": 	{ "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
+
+		"jerk_print": 			{ "value": 20 },
+		"jerk_travel": 			{ "value": "jerk_print" },
+		"jerk_travel_layer_0": 		{ "value": "jerk_travel" }
+   }
+}

resources/extruders/flyingbear_base_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "flyingbear_base",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+        
+    }
+}

resources/meshes/flyingbear_platform.obj

@@ -0,0 +1,110 @@
+# WaveFront *.obj file (generated by CINEMA 4D)
+
+v -136.15419006347656 -105 -6.8942437171936
+v -136.15419006347656 -105 -1.10575640201569
+v 136.15419006347656 -105 -1.10575640201569
+v 136.15419006347656 -105 -6.8942437171936
+v -137.5 -103.67865753173828 -6.8942437171936
+v -137.5 103.67865753173828 -6.8942437171936
+v -137.5 103.67865753173828 -1.10575640201569
+v -137.5 -103.67865753173828 -1.10575640201569
+v -136.15419006347656 -103.67865753173828 0
+v -136.15419006347656 103.67865753173828 0
+v 136.15419006347656 103.67865753173828 0
+v 136.15419006347656 -103.67865753173828 0
+v -136.15419006347656 105 -1.10575640201569
+v -136.15419006347656 105 -6.8942437171936
+v 136.15419006347656 105 -6.8942437171936
+v 136.15419006347656 105 -1.10575640201569
+v 137.5 -103.67865753173828 -1.10575640201569
+v 137.5 103.67865753173828 -1.10575640201569
+v 137.5 103.67865753173828 -6.8942437171936
+v 137.5 -103.67865753173828 -6.8942437171936
+v 136.15419006347656 -103.67865753173828 -8
+v 136.15419006347656 103.67865753173828 -8
+v -136.15419006347656 103.67865753173828 -8
+v -136.15419006347656 -103.67865753173828 -8
+# 24 vertices
+
+vn 0 0 1
+vn 1 0 0
+vn 0.27744194865227 0.61657708883286 -0.73678940534592
+vn 0.42486584186554 0.43098142743111 -0.7960804104805
+vn 0.60886806249619 0.28306290507317 -0.74105000495911
+vn 0 0 0
+vn -1 0 0
+vn 0 1 0
+vn 0 -1 0
+vn -0.60886812210083 0.28306290507317 0.74104994535446
+vn -0.42486593127251 0.43098148703575 0.79608035087585
+vn -0.42486596107483 -0.43098145723343 0.79608029127121
+vn -0.60886812210083 -0.28306293487549 0.74104994535446
+vn -0.27744197845459 0.6165771484375 0.73678934574127
+vn 0.27744141221046 0.61657696962357 0.73678976297379
+vn 0.42486551403999 0.43098136782646 0.79608064889908
+vn 0.60886812210083 -0.28306290507317 0.74104994535446
+vn 0.42486593127251 -0.43098148703575 0.79608035087585
+vn 0.60886752605438 0.28306278586388 0.74105048179626
+vn 0.27744197845459 -0.6165771484375 0.73678934574127
+vn -0.27744200825691 -0.6165771484375 0.73678940534592
+vn 0.70059055089951 0.71356350183487 0
+vn 0.42486587166786 -0.43098139762878 -0.7960804104805
+vn 0.60886806249619 -0.28306287527084 -0.74105000495911
+vn 0.70059055089951 -0.71356350183487 0
+vn -0.27744194865227 0.61657708883286 -0.73678940534592
+vn -0.42486587166786 0.43098139762878 -0.7960804104805
+vn -0.60886806249619 -0.28306290507317 -0.74105000495911
+vn -0.42486584186554 -0.43098142743111 -0.7960804104805
+vn -0.60886806249619 0.28306287527084 -0.74105000495911
+vn -0.27744194865227 -0.61657708883286 -0.73678940534592
+vn 0.27744194865227 -0.61657708883286 -0.73678940534592
+vn -0.70059055089951 0.71356350183487 0
+vn -0.70059055089951 -0.71356350183487 0
+# 34 normals
+
+vt 0.00542090367526 0.00542092323303 0
+vt 0.00542090367526 0.99457907676697 0
+vt 0.99457907676697 0.99457907676697 0
+vt 0.99457907676697 0.00542092323303 0
+vt 0.12081129848957 0.89372777938843 0
+vt 0.12081129848957 0.97731846570969 0
+vt 0.12039698660374 0.97785115242004 0
+vt 0.12039699405432 0.97731846570969 0
+vt 0.03615518659353 0.89372777938843 0
+vt 0.03615518659353 0.97731846570969 0
+vt 0.03656949847937 0.97785115242004 0
+vt 0.03656949847937 0.89319515228271 0
+vt 0.12039698660374 0.89319515228271 0
+vt 0.03656949847937 0.97731846570969 0
+vt 0.03656949847937 0.89372777938843 0
+vt 0.12039699405432 0.89372777938843 0
+# 16 texture coordinates
+
+o Cube
+usemtl Mat
+f 12/4/1 11/3/1 10/2/1 9/1/1
+f 20/5/2 19/6/2 18/6/2 17/5/2
+f 19/6/5 22/8/4 15/7/3
+f 8/9/7 7/10/7 6/10/7 5/9/7
+f 16/7/8 15/7/8 14/11/8 13/11/8
+f 4/13/9 3/13/9 2/12/9 1/12/9
+f 8/9/13 9/15/12 10/14/11 7/10/10
+f 11/8/16 16/7/15 13/11/14 10/14/11
+f 18/6/19 11/8/16 12/16/18 17/5/17
+f 9/15/12 2/12/21 3/13/20 12/16/18
+f 16/7/22 18/6/22 19/6/22 15/7/22
+f 20/5/24 21/16/23 22/8/4 19/6/5
+f 4/13/25 20/5/25 17/5/25 3/13/25
+f 23/14/27 14/11/26 15/7/3 22/8/4
+f 6/10/30 23/14/27 24/15/29 5/9/28
+f 21/16/23 4/13/32 1/12/31 24/15/29
+f 14/11/33 6/10/33 7/10/33 13/11/33
+f 2/12/34 8/9/34 5/9/34 1/12/34
+f 5/9/28 24/15/29 1/12/31
+f 9/15/12 8/9/13 2/12/21
+f 17/5/17 12/16/18 3/13/20
+f 21/16/23 20/5/24 4/13/32
+f 14/11/26 23/14/27 6/10/30
+f 10/14/11 13/11/14 7/10/10
+f 18/6/19 16/7/15 11/8/16
+

resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Super Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = super
+material = generic_abs
+variant = 0.25mm Nozzle
+
+[values]
+wall_thickness = =line_width*6

resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Ultra Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = ultra
+material = generic_abs
+variant = 0.25mm Nozzle
+
+[values]
+wall_thickness = =line_width*6

resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Dynamic Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = adaptive
+material = generic_abs
+variant = 0.4mm Nozzle
+
+[values]
+wall_thickness = =line_width*4

resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Low Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = low
+material = generic_abs
+variant = 0.4mm Nozzle
+
+[values]
+wall_thickness = =line_width*4