@@ -123,7 +123,7 @@ def inclination_deg(self) -> float:
123123 return math .degrees (self .inclination ())
124124
125125 @feedback
126- def shooter_FOR_inclination (self ) -> float :
126+ def shooter_FOR_inclination_deg (self ) -> float :
127127 return math .degrees (self .inclination () - self .COM_DIFFERENCE )
128128
129129 @feedback
@@ -145,14 +145,9 @@ def at_setpoint(self) -> bool:
145145
146146 # Tilts to an angle with regards to the shooter frame of reference.
147147 # Shooter FOR takes the arm as in-line with the backplate of the shooter
148- # SHould be called with angles in the shooter FOR
148+ # Should be called with angles in the shooter FOR
149149 def tilt_to_shooter_FOR (self , pos : float ) -> None :
150- clamped_angle = clamp (
151- (pos + self .COM_DIFFERENCE ), self .MAXIMUM_DEPRESSION , self .MAXIMUM_ELEVATION
152- )
153- # If the new setpoint is within the tolerance we wouldn't move anyway
154- if abs (clamped_angle - self .desired_state .position ) > self .TOLERANCE :
155- self ._tilt_to (clamped_angle )
150+ self .tilt_to (pos + self .COM_DIFFERENCE )
156151
157152 # Tilts to an angle with respect to the COM FOR
158153 def tilt_to (self , pos : float ) -> None :
@@ -190,7 +185,7 @@ def execute(self) -> None:
190185 self .pid .calculate (self .inclination (), tracked_state .position ) + ff
191186 )
192187
193- self .wrist_ligament .setAngle (self .shooter_FOR_inclination ())
188+ self .wrist_ligament .setAngle (self .shooter_FOR_inclination_deg ())
194189
195190 self .wrist_COM_ligament .setAngle (self .inclination_deg ())
196191 # self.wrist_ligament.setAngle(math.degrees(desired_state.position))
0 commit comments