feat: Prototype flag, spring re-parameter
This commit is contained in:
parent
539a5d1229
commit
dcb3c31c1d
|
@ -39,10 +39,12 @@ class Target:
|
||||||
def __init__(self,
|
def __init__(self,
|
||||||
method,
|
method,
|
||||||
name: str,
|
name: str,
|
||||||
|
prototype: bool = False,
|
||||||
kind: TargetKind = TargetKind.STL,
|
kind: TargetKind = TargetKind.STL,
|
||||||
**kwargs):
|
**kwargs):
|
||||||
self._method = method
|
self._method = method
|
||||||
self.name = name
|
self.name = name
|
||||||
|
self.prototype = prototype
|
||||||
self.kind = kind
|
self.kind = kind
|
||||||
self.kwargs = kwargs
|
self.kwargs = kwargs
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
|
|
|
@ -103,6 +103,8 @@ class Parameters(Model):
|
||||||
track_disk_height=5.0,
|
track_disk_height=5.0,
|
||||||
rider_disk_height=7.0,
|
rider_disk_height=7.0,
|
||||||
radius_axle=8.0,
|
radius_axle=8.0,
|
||||||
|
radius_spring=9 + 1.2 * 2,
|
||||||
|
spring_thickness=1.3,
|
||||||
))
|
))
|
||||||
|
|
||||||
# Two holes on each side (top and bottom) are used to attach the shoulder
|
# Two holes on each side (top and bottom) are used to attach the shoulder
|
||||||
|
@ -149,8 +151,8 @@ class Parameters(Model):
|
||||||
@target(name="trident/handle-insertion")
|
@target(name="trident/handle-insertion")
|
||||||
def handle_insertion(self):
|
def handle_insertion(self):
|
||||||
return self.trident_handle.insertion()
|
return self.trident_handle.insertion()
|
||||||
@target(name="trident/proto-handle-terminal-connector")
|
@target(name="trident/proto-handle-connector", prototype=True)
|
||||||
def handle_experimental_connector(self):
|
def proto_handle_connector(self):
|
||||||
return self.trident_handle.one_side_connector(height=15)
|
return self.trident_handle.one_side_connector(height=15)
|
||||||
@target(name="trident/handle-terminal-connector")
|
@target(name="trident/handle-terminal-connector")
|
||||||
def handle_terminal_connector(self):
|
def handle_terminal_connector(self):
|
||||||
|
@ -305,7 +307,7 @@ class Parameters(Model):
|
||||||
#def joining_plate(self) -> Cq.Workplane:
|
#def joining_plate(self) -> Cq.Workplane:
|
||||||
# return self.wing_joining_plate.plate()
|
# return self.wing_joining_plate.plate()
|
||||||
|
|
||||||
@target(name="wing_root")
|
@target(name="wing/root")
|
||||||
def wing_root(self) -> Cq.Assembly:
|
def wing_root(self) -> Cq.Assembly:
|
||||||
"""
|
"""
|
||||||
Generate the wing root which contains a Hirth joint at its base and a
|
Generate the wing root which contains a Hirth joint at its base and a
|
||||||
|
@ -320,7 +322,14 @@ class Parameters(Model):
|
||||||
conn_thickness=self.wing_s0_thickness,
|
conn_thickness=self.wing_s0_thickness,
|
||||||
)
|
)
|
||||||
|
|
||||||
@target(name="shoulder_joint_parent")
|
@target(name="wing/proto-shoulder-joint-parent", prototype=True)
|
||||||
|
def proto_shoulder_joint_parent(self):
|
||||||
|
return self.shoulder_torsion_joint.track()
|
||||||
|
@target(name="wing/proto-shoulder-joint-child", prototype=True)
|
||||||
|
def proto_shoulder_joint_child(self):
|
||||||
|
return self.shoulder_torsion_joint.rider()
|
||||||
|
|
||||||
|
@target(name="wing/shoulder_joint_parent")
|
||||||
def shoulder_joint_parent(self) -> Cq.Workplane:
|
def shoulder_joint_parent(self) -> Cq.Workplane:
|
||||||
joint = self.shoulder_torsion_joint
|
joint = self.shoulder_torsion_joint
|
||||||
# Thickness of the lip connecting this joint to the wing root
|
# Thickness of the lip connecting this joint to the wing root
|
||||||
|
@ -365,7 +374,7 @@ class Parameters(Model):
|
||||||
joint = self.shoulder_torsion_joint
|
joint = self.shoulder_torsion_joint
|
||||||
return self.wing_profile.shoulder_height - 2 * joint.total_height + 2 * joint.rider_disk_height
|
return self.wing_profile.shoulder_height - 2 * joint.total_height + 2 * joint.rider_disk_height
|
||||||
|
|
||||||
@target(name="shoulder_joint_child")
|
@target(name="wing/shoulder_joint_child")
|
||||||
def shoulder_joint_child(self) -> Cq.Assembly:
|
def shoulder_joint_child(self) -> Cq.Assembly:
|
||||||
"""
|
"""
|
||||||
Creates the top/bottom shoulder child joint
|
Creates the top/bottom shoulder child joint
|
||||||
|
|
Loading…
Reference in New Issue