diff --git a/3mf/arm/Arm_Base_Bottom_[x2].3mf b/3mf/arm/Arm_Base_Bottom_[x2]_0834add.3mf similarity index 99% rename from 3mf/arm/Arm_Base_Bottom_[x2].3mf rename to 3mf/arm/Arm_Base_Bottom_[x2]_0834add.3mf index 5229be7..0824f27 100644 Binary files a/3mf/arm/Arm_Base_Bottom_[x2].3mf and b/3mf/arm/Arm_Base_Bottom_[x2]_0834add.3mf differ diff --git a/3mf/base/Base_Joint_Bottom_Left_[x1].3mf b/3mf/base/Base_Joint_Bottom_Left_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Base_Joint_Bottom_Left_[x1].3mf rename to 3mf/base/Base_Joint_Bottom_Left_[x1]_0834add.3mf index 6c0ab07..bc61d63 100644 Binary files a/3mf/base/Base_Joint_Bottom_Left_[x1].3mf and b/3mf/base/Base_Joint_Bottom_Left_[x1]_0834add.3mf differ diff --git a/3mf/base/Base_Joint_Bottom_Right_[x1].3mf b/3mf/base/Base_Joint_Bottom_Right_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Base_Joint_Bottom_Right_[x1].3mf rename to 3mf/base/Base_Joint_Bottom_Right_[x1]_0834add.3mf index 134f4cd..b305a6e 100644 Binary files a/3mf/base/Base_Joint_Bottom_Right_[x1].3mf and b/3mf/base/Base_Joint_Bottom_Right_[x1]_0834add.3mf differ diff --git a/3mf/base/Base_Joint_Tip_Bottom_[x1].3mf b/3mf/base/Base_Joint_Tip_Bottom_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Base_Joint_Tip_Bottom_[x1].3mf rename to 3mf/base/Base_Joint_Tip_Bottom_[x1]_0834add.3mf index 4075ebd..a5ff5ee 100644 Binary files a/3mf/base/Base_Joint_Tip_Bottom_[x1].3mf and b/3mf/base/Base_Joint_Tip_Bottom_[x1]_0834add.3mf differ diff --git a/3mf/base/Base_Joint_Tip_Top_[x1].3mf b/3mf/base/Base_Joint_Tip_Top_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Base_Joint_Tip_Top_[x1].3mf rename to 3mf/base/Base_Joint_Tip_Top_[x1]_0834add.3mf index ec95124..9ba609a 100644 Binary files a/3mf/base/Base_Joint_Tip_Top_[x1].3mf and b/3mf/base/Base_Joint_Tip_Top_[x1]_0834add.3mf differ diff --git a/3mf/base/Base_Joint_Top_Left_[x1].3mf b/3mf/base/Base_Joint_Top_Left_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Base_Joint_Top_Left_[x1].3mf rename to 3mf/base/Base_Joint_Top_Left_[x1]_0834add.3mf index fc3e607..5ddcd58 100644 Binary files a/3mf/base/Base_Joint_Top_Left_[x1].3mf and b/3mf/base/Base_Joint_Top_Left_[x1]_0834add.3mf differ diff --git a/3mf/base/Base_Joint_Top_Right_[x1].3mf b/3mf/base/Base_Joint_Top_Right_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Base_Joint_Top_Right_[x1].3mf rename to 3mf/base/Base_Joint_Top_Right_[x1]_0834add.3mf index f8a281f..ff051de 100644 Binary files a/3mf/base/Base_Joint_Top_Right_[x1].3mf and b/3mf/base/Base_Joint_Top_Right_[x1]_0834add.3mf differ diff --git a/3mf/base/Base_Motor_Mount_[x1].3mf b/3mf/base/Base_Motor_Mount_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Base_Motor_Mount_[x1].3mf rename to 3mf/base/Base_Motor_Mount_[x1]_0834add.3mf index 446001d..9924b01 100644 Binary files a/3mf/base/Base_Motor_Mount_[x1].3mf and b/3mf/base/Base_Motor_Mount_[x1]_0834add.3mf differ diff --git a/3mf/base/Base_Panel_Blank_[x4].3mf b/3mf/base/Base_Panel_Blank_[x4]_0834add.3mf similarity index 96% rename from 3mf/base/Base_Panel_Blank_[x4].3mf rename to 3mf/base/Base_Panel_Blank_[x4]_0834add.3mf index 3b7a73b..0879f53 100644 Binary files a/3mf/base/Base_Panel_Blank_[x4].3mf and b/3mf/base/Base_Panel_Blank_[x4]_0834add.3mf differ diff --git a/3mf/base/Base_Panel_Bottom_[x1].3mf b/3mf/base/Base_Panel_Bottom_[x1]_0834add.3mf similarity index 98% rename from 3mf/base/Base_Panel_Bottom_[x1].3mf rename to 3mf/base/Base_Panel_Bottom_[x1]_0834add.3mf index 380aeed..f721237 100644 Binary files a/3mf/base/Base_Panel_Bottom_[x1].3mf and b/3mf/base/Base_Panel_Bottom_[x1]_0834add.3mf differ diff --git a/3mf/base/Base_Panel_Fan&Switch_[x1].3mf b/3mf/base/Base_Panel_Fan&Switch_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Base_Panel_Fan&Switch_[x1].3mf rename to 3mf/base/Base_Panel_Fan&Switch_[x1]_0834add.3mf index ca45a61..bd95ceb 100644 Binary files a/3mf/base/Base_Panel_Fan&Switch_[x1].3mf and b/3mf/base/Base_Panel_Fan&Switch_[x1]_0834add.3mf differ diff --git a/3mf/base/Base_Panel_Fan_[x1].3mf b/3mf/base/Base_Panel_Fan_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Base_Panel_Fan_[x1].3mf rename to 3mf/base/Base_Panel_Fan_[x1]_0834add.3mf index 4f2a0b2..52a8124 100644 Binary files a/3mf/base/Base_Panel_Fan_[x1].3mf and b/3mf/base/Base_Panel_Fan_[x1]_0834add.3mf differ diff --git a/3mf/base/Base_Panel_Top_[x1].3mf b/3mf/base/Base_Panel_Top_[x1]_0834add.3mf similarity index 98% rename from 3mf/base/Base_Panel_Top_[x1].3mf rename to 3mf/base/Base_Panel_Top_[x1]_0834add.3mf index 9f862bc..62ed5d1 100644 Binary files a/3mf/base/Base_Panel_Top_[x1].3mf and b/3mf/base/Base_Panel_Top_[x1]_0834add.3mf differ diff --git a/3mf/base/Electronics_Cover_Connectors_Module_[x1].3mf b/3mf/base/Electronics_Cover_Connectors_Module_[x1]_0834add.3mf similarity index 98% rename from 3mf/base/Electronics_Cover_Connectors_Module_[x1].3mf rename to 3mf/base/Electronics_Cover_Connectors_Module_[x1]_0834add.3mf index dbfc389..72c4f5f 100644 Binary files a/3mf/base/Electronics_Cover_Connectors_Module_[x1].3mf and b/3mf/base/Electronics_Cover_Connectors_Module_[x1]_0834add.3mf differ diff --git a/3mf/base/Electronics_Cover_Display_Module_Hinge_Lock_[x1].3mf b/3mf/base/Electronics_Cover_Display_Module_Hinge_Lock_[x1]_0834add.3mf similarity index 97% rename from 3mf/base/Electronics_Cover_Display_Module_Hinge_Lock_[x1].3mf rename to 3mf/base/Electronics_Cover_Display_Module_Hinge_Lock_[x1]_0834add.3mf index ab57c59..a8ad2fc 100644 Binary files a/3mf/base/Electronics_Cover_Display_Module_Hinge_Lock_[x1].3mf and b/3mf/base/Electronics_Cover_Display_Module_Hinge_Lock_[x1]_0834add.3mf differ diff --git a/3mf/base/Electronics_Cover_Display_Module_Hinge_[x1].3mf b/3mf/base/Electronics_Cover_Display_Module_Hinge_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Electronics_Cover_Display_Module_Hinge_[x1].3mf rename to 3mf/base/Electronics_Cover_Display_Module_Hinge_[x1]_0834add.3mf index 8eeda9c..85b5a68 100644 Binary files a/3mf/base/Electronics_Cover_Display_Module_Hinge_[x1].3mf and b/3mf/base/Electronics_Cover_Display_Module_Hinge_[x1]_0834add.3mf differ diff --git a/3mf/base/Electronics_Cover_Display_Module_Panel_[x1].3mf b/3mf/base/Electronics_Cover_Display_Module_Panel_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Electronics_Cover_Display_Module_Panel_[x1].3mf rename to 3mf/base/Electronics_Cover_Display_Module_Panel_[x1]_0834add.3mf index e0755e9..9de76bb 100644 Binary files a/3mf/base/Electronics_Cover_Display_Module_Panel_[x1].3mf and b/3mf/base/Electronics_Cover_Display_Module_Panel_[x1]_0834add.3mf differ diff --git a/3mf/base/Electronics_DIN_Rail_Holder_[x6].3mf b/3mf/base/Electronics_DIN_Rail_Holder_[x6]_0834add.3mf similarity index 97% rename from 3mf/base/Electronics_DIN_Rail_Holder_[x6].3mf rename to 3mf/base/Electronics_DIN_Rail_Holder_[x6]_0834add.3mf index f2aaaee..9439e9f 100644 Binary files a/3mf/base/Electronics_DIN_Rail_Holder_[x6].3mf and b/3mf/base/Electronics_DIN_Rail_Holder_[x6]_0834add.3mf differ diff --git a/3mf/base/Electronics_Display_Back_[x1].3mf b/3mf/base/Electronics_Display_Back_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Electronics_Display_Back_[x1].3mf rename to 3mf/base/Electronics_Display_Back_[x1]_0834add.3mf index 6422d05..9b18bec 100644 Binary files a/3mf/base/Electronics_Display_Back_[x1].3mf and b/3mf/base/Electronics_Display_Back_[x1]_0834add.3mf differ diff --git a/3mf/base/Electronics_Display_Frame_[x1].3mf b/3mf/base/Electronics_Display_Frame_[x1]_0834add.3mf similarity index 98% rename from 3mf/base/Electronics_Display_Frame_[x1].3mf rename to 3mf/base/Electronics_Display_Frame_[x1]_0834add.3mf index 82d768b..03d7373 100644 Binary files a/3mf/base/Electronics_Display_Frame_[x1].3mf and b/3mf/base/Electronics_Display_Frame_[x1]_0834add.3mf differ diff --git a/3mf/base/Electronics_Main_Board_Mount_[x1].3mf b/3mf/base/Electronics_Main_Board_Mount_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Electronics_Main_Board_Mount_[x1].3mf rename to 3mf/base/Electronics_Main_Board_Mount_[x1]_0834add.3mf index 5755659..7718130 100644 Binary files a/3mf/base/Electronics_Main_Board_Mount_[x1].3mf and b/3mf/base/Electronics_Main_Board_Mount_[x1]_0834add.3mf differ diff --git a/3mf/base/Electronics_Main_Board_RPI_Mount_[1].3mf b/3mf/base/Electronics_Main_Board_RPI_Mount_[1]_0834add.3mf similarity index 99% rename from 3mf/base/Electronics_Main_Board_RPI_Mount_[1].3mf rename to 3mf/base/Electronics_Main_Board_RPI_Mount_[1]_0834add.3mf index 5010098..367cb66 100644 Binary files a/3mf/base/Electronics_Main_Board_RPI_Mount_[1].3mf and b/3mf/base/Electronics_Main_Board_RPI_Mount_[1]_0834add.3mf differ diff --git a/3mf/base/Electronics_PSU_Mount_Bottom_[x1].3mf b/3mf/base/Electronics_PSU_Mount_Bottom_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Electronics_PSU_Mount_Bottom_[x1].3mf rename to 3mf/base/Electronics_PSU_Mount_Bottom_[x1]_0834add.3mf index 8dc1f63..6e6e3d0 100644 Binary files a/3mf/base/Electronics_PSU_Mount_Bottom_[x1].3mf and b/3mf/base/Electronics_PSU_Mount_Bottom_[x1]_0834add.3mf differ diff --git a/3mf/base/Electronics_PSU_Mount_Top_[x1].3mf b/3mf/base/Electronics_PSU_Mount_Top_[x1]_0834add.3mf similarity index 98% rename from 3mf/base/Electronics_PSU_Mount_Top_[x1].3mf rename to 3mf/base/Electronics_PSU_Mount_Top_[x1]_0834add.3mf index 3c50169..1eff78b 100644 Binary files a/3mf/base/Electronics_PSU_Mount_Top_[x1].3mf and b/3mf/base/Electronics_PSU_Mount_Top_[x1]_0834add.3mf differ diff --git a/3mf/base/Frame_Bearing_Holder_[x1].3mf b/3mf/base/Frame_Bearing_Holder_[x1]_0834add.3mf similarity index 98% rename from 3mf/base/Frame_Bearing_Holder_[x1].3mf rename to 3mf/base/Frame_Bearing_Holder_[x1]_0834add.3mf index e6706ed..f9c37d0 100644 Binary files a/3mf/base/Frame_Bearing_Holder_[x1].3mf and b/3mf/base/Frame_Bearing_Holder_[x1]_0834add.3mf differ diff --git a/3mf/base/Frame_Handle_[x1].3mf b/3mf/base/Frame_Handle_[x1]_0834add.3mf similarity index 99% rename from 3mf/base/Frame_Handle_[x1].3mf rename to 3mf/base/Frame_Handle_[x1]_0834add.3mf index 677a6b5..131c7cd 100644 Binary files a/3mf/base/Frame_Handle_[x1].3mf and b/3mf/base/Frame_Handle_[x1]_0834add.3mf differ diff --git a/3mf/base/Frame_Plate_Clamp_[x4].3mf b/3mf/base/Frame_Plate_Clamp_[x4]_0834add.3mf similarity index 97% rename from 3mf/base/Frame_Plate_Clamp_[x4].3mf rename to 3mf/base/Frame_Plate_Clamp_[x4]_0834add.3mf index d278c34..2d6270d 100644 Binary files a/3mf/base/Frame_Plate_Clamp_[x4].3mf and b/3mf/base/Frame_Plate_Clamp_[x4]_0834add.3mf differ diff --git a/scripts/generate_3mf_files.py b/scripts/generate_3mf_files.py index f90eecb..926edc2 100755 --- a/scripts/generate_3mf_files.py +++ b/scripts/generate_3mf_files.py @@ -1,6 +1,7 @@ #!/usr/bin/freecadcmd import os +import subprocess import FreeCAD as App # type: ignore import Mesh # type: ignore @@ -13,6 +14,9 @@ project_root = os.path.abspath( printed_cad_dir = os.path.join(project_root, "cad", "printed") printed_3mf_dir = os.path.join(project_root, "3mf") +# Get the short hash of the current Git commit +git_short_hash = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('ascii').strip() + # Create the 3mf directory if it doesn't exist os.makedirs(printed_3mf_dir, exist_ok=True) @@ -41,7 +45,7 @@ for root, dirs, files in os.walk(printed_cad_dir): output_path = os.path.join( printed_3mf_dir, os.path.relpath(root, printed_cad_dir), - f"{obj.Label}.3mf", + f"{obj.Label}_{git_short_hash}.3mf", ) # Create the output directory if it doesn't already exist os.makedirs(os.path.dirname(output_path), exist_ok=True)