Merge pull request #227 from SpectralVectors/master

G43, AB Axes reference fixes
pppalain · Dec 29, 2024 · 2562883 · 2562883
2 parents 2dc6970 + 1ba88f3
commit 2562883
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/scripts/addons/cam/blender_manifest.toml b/scripts/addons/cam/blender_manifest.toml
@@ -22,6 +22,20 @@ copyright = [
 ]
 
 wheels = [
+  #   # llvmlite
+  # "./wheels/llvmlite-0.43.0-cp311-cp311-macosx_10_9_x86_64.whl",
+  # "./wheels/llvmlite-0.43.0-cp311-cp311-macosx_11_0_arm64.whl",
+  # "./wheels/llvmlite-0.43.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl",
+  # "./wheels/llvmlite-0.43.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
+  # "./wheels/llvmlite-0.43.0-cp311-cp311-win_amd64.whl",
+
+  #   # numba
+  # "./wheels/numba-0.60.0-cp311-cp311-macosx_10_9_x86_64.whl",
+  # "./wheels/numba-0.60.0-cp311-cp311-macosx_11_0_arm64.whl",
+  # "./wheels/numba-0.60.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl",
+  # "./wheels/numba-0.60.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl",
+  # "./wheels/numba-0.60.0-cp311-cp311-win_amd64.whl",
+
     # opencamlib
   "./wheels/opencamlib-2023.1.11-cp311-cp311-macosx_10_9_x86_64.whl",
   "./wheels/opencamlib-2023.1.11-cp311-cp311-macosx_11_0_arm64.whl",

diff --git a/scripts/addons/cam/properties/operation_props.py b/scripts/addons/cam/properties/operation_props.py
@@ -407,9 +407,11 @@ class CAM_OPERATION_Properties(PropertyGroup):
     cutter_tip_angle: FloatProperty(
         name="Cutter V-carve Angle",
         description="Cutter V-carve angle",
+        default=pi / 3,
         min=0.0,
-        max=180.0,
-        default=60.0,
+        max=pi,
+        subtype="ANGLE",
+        unit="ROTATION",
         precision=PRECISION,
         update=update_offset_image,
     )

diff --git a/scripts/addons/cam/ui/panels/machine_panel.py b/scripts/addons/cam/ui/panels/machine_panel.py
@@ -108,7 +108,7 @@ def draw(self, context):
                     subheader.prop(self.machine, "output_tool_change")
                     if subpanel:
                         subpanel.enabled = self.machine.output_tool_change
-                        subpanel.prop(self.machine, "output_g43_on_tool_change")
+                        subpanel.prop(self.machine, "output_G43_on_tool_change")
 
                 # Block Numbers
                 if self.level >= 2:

diff --git a/scripts/addons/cam/ui/panels/op_properties_panel.py b/scripts/addons/cam/ui/panels/op_properties_panel.py
@@ -216,20 +216,20 @@ def draw(self, context):
                 header.label(text="A & B Axes")
                 if panel:
                     subheader, subpanel = panel.panel("a_axis", default_closed=True)
-                    subheader.prop(self.op, "enable_A", text="A Axis")
+                    subheader.prop(self.op, "enable_a_axis", text="A Axis")
                     if subpanel:
                         subpanel.enabled = self.op.enable_a_axis
                         col = subpanel.column(align=True)
                         row = col.row()
                         row.use_property_split = True
                         row.prop(self.op, "rotation_a")
-                        col.prop(self.op, "A_along_x")
+                        col.prop(self.op, "a_along_x")
                         if self.op.a_along_x:
                             col.label(text="Ⓐ || Ⓧ  -  Ⓑ || Ⓨ")
                         else:
                             col.label(text="Ⓐ || Ⓨ  -  Ⓑ || Ⓧ")
                     subheader, subpanel = panel.panel("b_axis", default_closed=True)
-                    subheader.prop(self.op, "enable_B", text="B Axis")
+                    subheader.prop(self.op, "enable_b_axis", text="B Axis")
                     if subpanel:
                         subpanel.enabled = self.op.enable_b_axis
                         col = subpanel.column(align=True)