Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
On-Board Software
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Avionics
Software Development
On-Board Software
Commits
ded5b128
Commit
ded5b128
authored
3 months ago
by
Davide Basso
Browse files
Options
Downloads
Patches
Plain Diff
[Parafoil] Fix parafoil entry
parent
afaeccdc
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!102
[Parafoil] Add Parafoil On-Board-Software
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Parafoil/WindEstimation/WindEstimationData.h
+2
-2
2 additions, 2 deletions
src/Parafoil/WindEstimation/WindEstimationData.h
src/Parafoil/parafoil-entry.cpp
+6
-3
6 additions, 3 deletions
src/Parafoil/parafoil-entry.cpp
with
8 additions
and
5 deletions
src/Parafoil/WindEstimation/WindEstimationData.h
+
2
−
2
View file @
ded5b128
...
...
@@ -37,8 +37,8 @@ namespace Parafoil
struct
WindEstimationData
{
uint64_t
timestamp
=
0
;
Boardcore
::
Units
::
Speed
::
MeterPerSecond
velocityNorth
;
Boardcore
::
Units
::
Speed
::
MeterPerSecond
velocityEast
;
Boardcore
::
Units
::
Speed
::
MeterPerSecond
velocityNorth
{
0
}
;
Boardcore
::
Units
::
Speed
::
MeterPerSecond
velocityEast
{
0
}
;
bool
calibration
=
false
;
///< True if the wind estimation is in
///< calibration mode, false otherwise
...
...
This diff is collapsed.
Click to expand it.
src/Parafoil/parafoil-entry.cpp
+
6
−
3
View file @
ded5b128
...
...
@@ -86,10 +86,10 @@ using namespace Common;
int
main
()
{
miosix
::
ledOff
();
std
::
cout
<<
"Parafoil Entrypoint "
<<
"("
<<
BUILD_TYPE
<<
")"
<<
" by Skyward Experimental Rocketry"
<<
std
::
endl
;
// cppcheck-suppress unreadVariable
auto
logger
=
Logging
::
getLogger
(
"Parafoil"
);
DependencyManager
depman
{};
...
...
@@ -136,18 +136,21 @@ int main()
auto
actuators
=
new
Actuators
();
initResult
&=
depman
.
insert
(
actuators
);
std
::
cout
<<
"Injecting module dependencies"
<<
std
::
endl
;
initResult
&=
depman
.
inject
();
START_SINGLETON
(
Logger
)
{
std
::
cout
<<
"Logger Ok!
\n
"
<<
"
\t
Log number: "
<<
Logger
::
getInstance
().
getCurrentLogNumber
()
<<
std
::
endl
;
}
START_MODULE
(
flightModeManager
);
START_SINGLETON
(
EventBroker
);
START_MODULE
(
pinHandler
);
START_MODULE
(
radio
);
START_MODULE
(
nasController
);
START_MODULE
(
flightModeManager
);
START_MODULE
(
altitudeTrigger
);
START_MODULE
(
windEstimation
);
START_MODULE
(
wingController
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment