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

Merge RotWing State Machine #3397

Merged
merged 5 commits into from
Oct 30, 2024
Merged

Conversation

tmldeponti
Copy link
Contributor

I have modified the new state machine by @fvantienen to be independent of guidance indi hybrid. It is then possible to also use this state machine with the oneloop controller. This allows us to merge the two state machines and have only one common shared one.

@dewagter
Copy link
Member

dewagter commented Oct 16, 2024

I agree to move some functions to maximize reusability of modules, but can you please fix the compile issue. (make tudelft and make tests)

@tmldeponti
Copy link
Contributor Author

I agree to move some functions to maximize reusability of modules, but can you please fix the compile issue. (make tudelft and make tests)

Yes I am on it! :)

@tmldeponti
Copy link
Contributor Author

I agree to move some functions to maximize reusability of modules, but can you please fix the compile issue. (make tudelft and make tests)

I fixed all errors in the test modules. As for test tudelft, the airframes with the oneloop controller will be fixed in the next PR I will open about the oneloop.

<define name="SKEW_REF_MODEL_P_GAIN" value="0.001"/> <!-- Skewing reference model proportional gain -->
<define name="SKEW_REF_MODEL_D_GAIN" value="0.003"/> <!-- Skewing reference model differential gain -->
<define name="SKEW_REF_MODEL_MAX_SPEED" value="20"/> <!-- Maximum rotational skewing speed bound for the reference model -->
<define name="ROTWING_FW_SKEW_ANGLE" value="85"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That define does not work

<define name="SKEW_REF_MODEL_P_GAIN" value="0.001"/> <!-- Skewing reference model proportional gain -->
<define name="SKEW_REF_MODEL_D_GAIN" value="0.003"/> <!-- Skewing reference model differential gain -->
<define name="SKEW_REF_MODEL_MAX_SPEED" value="20"/> <!-- Maximum rotational skewing speed bound for the reference model -->
<define name="ROTWING_FW_SKEW_ANGLE" value="85"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

<define name="SKEW_REF_MODEL_P_GAIN" value="0.001"/> <!-- Skewing reference model proportional gain -->
<define name="SKEW_REF_MODEL_D_GAIN" value="0.003"/> <!-- Skewing reference model differential gain -->
<define name="SKEW_REF_MODEL_MAX_SPEED" value="20"/> <!-- Maximum rotational skewing speed bound for the reference model -->
<define name="ROTWING_FW_SKEW_ANGLE" value="85"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

@fvantienen fvantienen merged commit 655a496 into paparazzi:master Oct 30, 2024
1 check passed
@fvantienen fvantienen deleted the oneloop_PR1 branch October 30, 2024 15:47
NoahWe pushed a commit to tudelft/paparazzi that referenced this pull request Nov 5, 2024
* first push

* starting to fix make modules

* Fixed test modules

* Update flight plan valkenburgh

* fix define
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants