Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

magnetorquer now updates its own state NOT wheel speeds #69

Merged
merged 1 commit into from
Aug 28, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ADCS/adcs_subsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ def get_wheel_speed(self) -> tuple[float, float, float]:

def set_magnetorquer_current(self, current_x, current_y, current_z):
"""Sets the magnetorquer current in mA"""
self.wheel_speed.x = float(current_x)
self.wheel_speed.y = float(current_y)
self.wheel_speed.z = float(current_z)
self.magnetic_current.x = float(current_x)
self.magnetic_current.y = float(current_y)
self.magnetic_current.z = float(current_z)

def get_magnetorquer_current(self) -> tuple[float, float, float]:
"""Gets the wheel speeds in RPM"""
return (self.wheel_speed.x, self.wheel_speed.y, self.wheel_speed.z)
return (self.magnetic_current.x, self.magnetic_current.y, self.magnetic_current.z)

def set_current(self, currents_x, currents_y, currents_z):
"""Sets the magnetorquer currents in mA"""
Expand Down
Loading