Skip to content

Commit 2a90dc7

Browse files
committed
fixed elevators error
1 parent 5516152 commit 2a90dc7

1 file changed

Lines changed: 21 additions & 25 deletions

File tree

subsystem/elevator.py

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,8 @@ def set_position(self, height: meters) -> None:
6969
height (meters): intended elevator height in meters
7070
"""
7171
height = self.limit_height(height)
72-
self.target_height = height
7372

74-
rotations = (
75-
height * constants.elevator_gear_ratio
76-
) / constants.elevator_driver_gear_circumference
77-
self.leader_motor.set_control(self.motion_magic.with_position(rotations))
73+
self.leader_motor.set_control(self.motion_magic.with_position(height))
7874

7975
def stop(self) -> None:
8076
"""
@@ -107,23 +103,23 @@ def is_at_position(self, height: meters, tolerance: meters = config.elevator_hei
107103
"""
108104
return abs(self.get_position() - height) < tolerance
109105

110-
def update_table(self) -> None:
111-
table = ntcore.NetworkTableInstance.getDefault().getTable("Elevator")
112-
113-
table.putNumber("height", self.get_position() * meters_to_inches)
114-
table.putNumber("velocity rps", self.leader_motor.get_sensor_velocity())
115-
table.putNumber("acceleration rpss", self.leader_motor.get_sensor_acceleration())
116-
table.putNumber("target height", self.target_height * meters_to_inches)
117-
table.putNumber(
118-
"motor lead applied output", self.leader_motor.get_applied_output()
119-
)
120-
table.putNumber(
121-
"motor lead current", self.leader_motor.get_motor_current()
122-
)
123-
table.putNumber(
124-
"motor follow applied output", self.follower_motor.get_applied_output()
125-
)
126-
127-
def periodic(self):
128-
if config.NT_ELEVATOR:
129-
self.update_table()
106+
# def update_table(self) -> None:
107+
# table = ntcore.NetworkTableInstance.getDefault().getTable("Elevator")
108+
109+
# table.putNumber("height", self.get_position() * meters_to_inches)
110+
# table.putNumber("velocity rps", self.leader_motor.get_sensor_velocity())
111+
# table.putNumber("acceleration rpss", self.leader_motor.get_sensor_acceleration())
112+
# table.putNumber("target height", self.target_height * meters_to_inches)
113+
# table.putNumber(
114+
# "motor lead applied output", self.leader_motor.get_applied_output()
115+
# )
116+
# table.putNumber(
117+
# "motor lead current", self.leader_motor.get_motor_current()
118+
# )
119+
# table.putNumber(
120+
# "motor follow applied output", self.follower_motor.get_applied_output()
121+
# )
122+
123+
# def periodic(self):
124+
# if config.NT_ELEVATOR:
125+
# self.update_table()

0 commit comments

Comments
 (0)