specify bot id type

Ultimaker · Nov 27, 2023 · a9dcfaa · a9dcfaa
1 parent ae047d2
commit a9dcfaa
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 14 deletions.
diff --git a/cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py b/cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py
@@ -19,7 +19,7 @@ def __init__(self):
                 "definition": "text",
                 "version": "text",
                 "setting_version": "text",
-                "bot_id": "text",
+                "bot_extruder_id": "text",
             },
         ))
         self._container_type = InstanceContainer
diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py
@@ -144,7 +144,7 @@ def _getMeta(self, root_nodes: List[SceneNode]) -> Dict[str, any]:
 
         meta = dict()
 
-        meta["bot_type"] = global_stack.definition.getMetaDataEntry("bot_id")
+        meta["bot_type"] = global_stack.definition.getMetaDataEntry("bot_machine_id")
 
         bounds: Optional[AxisAlignedBox] = None
         for node in nodes:
@@ -186,7 +186,7 @@ def _getMeta(self, root_nodes: List[SceneNode]) -> Dict[str, any]:
 
         meta["uuid"] = print_information.slice_uuid
 
-        materials = [extruder.material.getMetaData().get("bot_id") for extruder in extruders]
+        materials = [extruder.material.getMetaData().get("bot_material_id") for extruder in extruders]
 
         meta["material"] = materials[0]
         meta["materials"] = materials
@@ -198,7 +198,7 @@ def _getMeta(self, root_nodes: List[SceneNode]) -> Dict[str, any]:
 
         meta["model_counts"] = [{"count": 1, "name": node.getName()} for node in nodes]
 
-        tool_types = [extruder.variant.getMetaDataEntry("bot_id") for extruder in extruders]
+        tool_types = [extruder.variant.getMetaDataEntry("bot_extruder_id") for extruder in extruders]
         meta["tool_type"] = tool_types[0]
         meta["tool_types"] = tool_types
 

diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json
@@ -9,7 +9,7 @@
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-makerbot",
         "platform": "ultimaker_method_platform.stl",
-        "bot_id": "lava_f",
+        "bot_machine_id": "lava_f",
         "exclude_materials": [
             "dsm_",
             "Essentium_",

diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json
@@ -9,7 +9,7 @@
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-makerbot",
         "platform": "ultimaker_method_xl_platform.stl",
-        "bot_id": "magma_10",
+        "bot_machine_id": "magma_10",
         "has_machine_materials": true,
         "has_machine_quality": true,
         "has_materials": true,

diff --git a/resources/variants/ultimaker_methodx_1C.inst.cfg b/resources/variants/ultimaker_methodx_1C.inst.cfg
@@ -4,7 +4,7 @@ name = 1C
 version = 4
 
 [metadata]
-bot_id = mk14_c
+bot_extruder_id = mk14_c
 hardware_type = nozzle
 setting_version = 22
 type = variant

diff --git a/resources/variants/ultimaker_methodx_1XA.inst.cfg b/resources/variants/ultimaker_methodx_1XA.inst.cfg
@@ -4,7 +4,7 @@ name = 1XA
 version = 4
 
 [metadata]
-bot_id = mk14_hot
+bot_extruder_id = mk14_hot
 hardware_type = nozzle
 setting_version = 22
 type = variant

diff --git a/resources/variants/ultimaker_methodx_2XA.inst.cfg b/resources/variants/ultimaker_methodx_2XA.inst.cfg
@@ -4,7 +4,7 @@ name = 2XA
 version = 4
 
 [metadata]
-bot_id = mk14_hot_s
+bot_extruder_id = mk14_hot_s
 hardware_type = nozzle
 setting_version = 22
 type = variant

diff --git a/resources/variants/ultimaker_methodx_LABS.inst.cfg b/resources/variants/ultimaker_methodx_LABS.inst.cfg
@@ -4,7 +4,7 @@ name = LABS
 version = 4
 
 [metadata]
-bot_id = mk14_e
+bot_extruder_id = mk14_e
 hardware_type = nozzle
 setting_version = 22
 type = variant

diff --git a/resources/variants/ultimaker_methodxl_1C.inst.cfg b/resources/variants/ultimaker_methodxl_1C.inst.cfg
@@ -4,7 +4,7 @@ name = 1C
 version = 4
 
 [metadata]
-bot_id = mk14_c
+bot_extruder_id = mk14_c
 hardware_type = nozzle
 setting_version = 22
 type = variant

diff --git a/resources/variants/ultimaker_methodxl_1XA.inst.cfg b/resources/variants/ultimaker_methodxl_1XA.inst.cfg
@@ -4,7 +4,7 @@ name = 1XA
 version = 4
 
 [metadata]
-bot_id = mk14_hot
+bot_extruder_id = mk14_hot
 hardware_type = nozzle
 setting_version = 22
 type = variant

diff --git a/resources/variants/ultimaker_methodxl_2XA.inst.cfg b/resources/variants/ultimaker_methodxl_2XA.inst.cfg
@@ -4,7 +4,7 @@ name = 2XA
 version = 4
 
 [metadata]
-bot_id = mk14_hot_s
+bot_extruder_id = mk14_hot_s
 hardware_type = nozzle
 setting_version = 22
 type = variant

diff --git a/resources/variants/ultimaker_methodxl_LABS.inst.cfg b/resources/variants/ultimaker_methodxl_LABS.inst.cfg
@@ -4,7 +4,7 @@ name = LABS
 version = 4
 
 [metadata]
-bot_id = mk14_e
+bot_extruder_id = mk14_e
 hardware_type = nozzle
 setting_version = 22
 type = variant