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

bringing commits to main into develop #244

Merged
merged 39 commits into from
Jul 3, 2023
Merged

bringing commits to main into develop #244

merged 39 commits into from
Jul 3, 2023

Conversation

rafapalacios
Copy link
Collaborator

several commits where made directly to main and develop is now behind

sduess and others added 30 commits June 6, 2023 14:19
- add cs type to allow deflection control via external controller
- use different flap ids for right and left wing, because in the linear model they deflect in different directions 
- add hinge coord to avoid failure in linearization
- add input settings for number of control surfaces instead of getting number from number of inputted intital deflection values
- causes problem with iostream of jupyter notebook
- export simulink model to be accesible from older matlab versions too (2021a)
- also includes minor documentation adjustments
- causes error in unittest in pazy tests due to renaming and type change
- enables the matlab script execution without the need to have a Matlab desktop version (e.g. virtual machines)
Fixed some formatting errors and added further clarification to some steps.
Fixed one more typo and added further clarification about any times mentioned.
…ng code

In a previous commit, the input type of the initial cs deflection (from float back to list of floats/ints) has been changed to avoid unittest issues and the updated type makes more sense. The code for closed loop simulation has to be adjusted now as well (instead of list, only give one number to the cilent) as control surfaces are symmetric. Further, float type initial value is enforced in client script, to avoid type errors when creating binary control input message containing control surface deflections.
…ng code

In a previous commit, the input type of the initial cs deflection (from float back to list of floats/ints) has been changed to avoid unittest issues and the updated type makes more sense. The code for closed loop simulation has to be adjusted now as well (instead of list, only give one number to the cilent) as control surfaces are symmetric. Further, float type initial value is enforced in client script, to avoid type errors when creating binary control input message containing control surface deflections.

This commit also includes the removal of code giving instructions of executing the matlab script from Matlab's Desktop version. Only, Matlab's engine API for Python is recommended here as it can be run within the same document.
@rafapalacios rafapalacios requested a review from kccwing July 3, 2023 05:42
@codecov-commenter
Copy link

Codecov Report

Merging #244 (328558b) into develop (362cd33) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop     #244      +/-   ##
===========================================
- Coverage    67.20%   67.20%   -0.01%     
===========================================
  Files          156      156              
  Lines        25924    25923       -1     
===========================================
- Hits         17423    17422       -1     
  Misses        8501     8501              
Impacted Files Coverage Δ
sharpy/cases/templates/flying_wings.py 89.92% <100.00%> (-0.02%) ⬇️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Collaborator

@sduess sduess left a comment

Choose a reason for hiding this comment

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

Thanks Rafa!

@sduess sduess merged commit 6107414 into develop Jul 3, 2023
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.

4 participants