Skip to content

Commit

Permalink
SPOT 4.1.0 Pre-Release.3 Hotfix.1
Browse files Browse the repository at this point in the history
# General Information

This is a **hotfix** for **SPOT 4.1.0 Pre-Release.3**. This is a very small fix to try and better handle the angle wrapping problems, as well as a regression fix for the simulated control mixer which adds back the thruster saturation calculation.

# Changes

- **Change 1:** In the default LQR and PD controllers, the angular error is corrected to the equation below, which should eliminate when platforms try to complete a full rotation to reach the same attitude.

  \[
  \theta_{e} = \mod{((\theta_{current} - \theta_{target} + \pi,~2\pi) - \pi,~ 2\pi)}
  \]

- **Change 2:** In the previous pre-release version, the saturation block for the thrusters was removed, but this has been added back in to improve the simulations when compared to experiments.
  • Loading branch information
TheElectricDream committed Jan 23, 2025
1 parent 7517dd2 commit 14c175d
Show file tree
Hide file tree
Showing 11 changed files with 3 additions and 58 deletions.
Binary file not shown.
Binary file removed PhaseSpace_Server/.vs/StreamData/v17/.suo
Binary file not shown.
Binary file removed PhaseSpace_Server/.vs/StreamData/v17/Browse.VC.db
Binary file not shown.
Binary file removed PhaseSpace_Server/.vs/StreamData/v17/Solution.VC.db
Binary file not shown.
Binary file not shown.
55 changes: 0 additions & 55 deletions PhaseSpace_Server/.vscode/settings.json

This file was deleted.

6 changes: 3 additions & 3 deletions Setup_Experiment.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
if isempty(expName)==1
fprintf("No name entered...\n");
else
copyfile([cd '\Template_Files\'],...
[cd '\Projects\' expName{1,1}]);
copyfile([cd filesep 'Template_Files' filesep],...
[cd filesep 'Projects' filesep expName{1,1}]);

cd([cd '\Projects\' expName{1,1}]);
cd([cd filesep 'Projects' filesep expName{1,1}]);

movefile('Template_v4_1_0_2024b_Jetson.slx',[expName{1,1} '.slx']);
end
Expand Down
Binary file modified Template_Files/Resources/SPOTGUI_DEFAULT.mat
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified Template_Files/Template_v4_1_0_2024b_Jetson.slx
Binary file not shown.

0 comments on commit 14c175d

Please sign in to comment.