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
3f18a336
Commit
3f18a336
authored
10 months ago
by
Niccolò Betto
Committed by
Davide Mor
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
[Payload][Radio] Move fmm_state to flight_tm
parent
7be3a0b8
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!81
[Payload] Payload OBSW
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/boards/Payload/Radio/MessageHandler.cpp
+4
-3
4 additions, 3 deletions
src/boards/Payload/Radio/MessageHandler.cpp
with
4 additions
and
3 deletions
src/boards/Payload/Radio/MessageHandler.cpp
+
4
−
3
View file @
3f18a336
...
@@ -460,6 +460,7 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
...
@@ -460,6 +460,7 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
auto
*
sensors
=
parent
.
getModule
<
Sensors
>
();
auto
*
sensors
=
parent
.
getModule
<
Sensors
>
();
auto
*
nas
=
parent
.
getModule
<
NASController
>
();
auto
*
nas
=
parent
.
getModule
<
NASController
>
();
auto
*
wes
=
parent
.
getModule
<
WindEstimation
>
();
auto
*
wes
=
parent
.
getModule
<
WindEstimation
>
();
auto
*
fmm
=
parent
.
getModule
<
FlightModeManager
>
();
auto
imu
=
sensors
->
getLSM6DSRXLastSample
();
auto
imu
=
sensors
->
getLSM6DSRXLastSample
();
auto
mag
=
sensors
->
getLIS2MDLLastSample
();
auto
mag
=
sensors
->
getLIS2MDLLastSample
();
...
@@ -517,6 +518,9 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
...
@@ -517,6 +518,9 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
tm
.
cam_battery_voltage
=
sensors
->
getCamBatteryVoltage
().
batVoltage
;
tm
.
cam_battery_voltage
=
sensors
->
getCamBatteryVoltage
().
batVoltage
;
tm
.
temperature
=
pressDigi
.
temperature
;
tm
.
temperature
=
pressDigi
.
temperature
;
// State machines
tm
.
fmm_state
=
static_cast
<
uint8_t
>
(
fmm
->
getState
());
mavlink_msg_payload_flight_tm_encode
(
config
::
Mavlink
::
SYSTEM_ID
,
mavlink_msg_payload_flight_tm_encode
(
config
::
Mavlink
::
SYSTEM_ID
,
config
::
Mavlink
::
COMPONENT_ID
,
config
::
Mavlink
::
COMPONENT_ID
,
&
msg
,
&
tm
);
&
msg
,
&
tm
);
...
@@ -529,7 +533,6 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
...
@@ -529,7 +533,6 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
mavlink_message_t
msg
;
mavlink_message_t
msg
;
mavlink_payload_stats_tm_t
tm
;
mavlink_payload_stats_tm_t
tm
;
auto
*
fmm
=
parent
.
getModule
<
FlightModeManager
>
();
auto
*
nas
=
parent
.
getModule
<
NASController
>
();
auto
*
nas
=
parent
.
getModule
<
NASController
>
();
auto
*
pinHandler
=
parent
.
getModule
<
PinHandler
>
();
auto
*
pinHandler
=
parent
.
getModule
<
PinHandler
>
();
auto
&
logger
=
Logger
::
getInstance
();
auto
&
logger
=
Logger
::
getInstance
();
...
@@ -592,8 +595,6 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
...
@@ -592,8 +595,6 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
tm
.
log_good
=
(
loggerStats
.
lastWriteError
==
0
);
tm
.
log_good
=
(
loggerStats
.
lastWriteError
==
0
);
tm
.
log_number
=
loggerStats
.
logNumber
;
tm
.
log_number
=
loggerStats
.
logNumber
;
// State machines
tm
.
fmm_state
=
static_cast
<
uint8_t
>
(
fmm
->
getState
());
tm
.
nas_state
=
static_cast
<
uint8_t
>
(
nas
->
getState
());
tm
.
nas_state
=
static_cast
<
uint8_t
>
(
nas
->
getState
());
tm
.
wes_state
=
255
;
// TODO
tm
.
wes_state
=
255
;
// TODO
...
...
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