Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b4960fab
Commit
b4960fab
authored
Apr 05, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix id screwup causing vehicle creation to break
parent
e15f496a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
Vehicle.cc
src/Vehicle/Vehicle.cc
+2
-2
Vehicle.h
src/Vehicle/Vehicle.h
+2
-0
No files found.
src/Vehicle/Vehicle.cc
View file @
b4960fab
...
...
@@ -797,10 +797,10 @@ void Vehicle::_handleDistanceSensor(mavlink_message_t& message)
if
(
!
_distanceSensorFactGroup
.
idSet
())
{
_distanceSensorFactGroup
.
setIdSet
(
true
);
_
id
=
distanceSensor
.
id
;
_
distanceSensorFactGroup
.
setId
(
distanceSensor
.
id
)
;
}
if
(
_
id
!=
distanceSensor
.
id
)
{
if
(
_
distanceSensorFactGroup
.
id
()
!=
distanceSensor
.
id
)
{
// We can only handle a single sensor reporting
return
;
}
...
...
src/Vehicle/Vehicle.h
View file @
b4960fab
...
...
@@ -71,6 +71,8 @@ public:
bool
idSet
(
void
)
{
return
_idSet
;
}
void
setIdSet
(
bool
idSet
)
{
_idSet
=
idSet
;
}
uint8_t
id
(
void
)
{
return
_id
;
}
void
setId
(
uint8_t
id
)
{
_id
=
id
;
}
static
const
char
*
_rotationNoneFactName
;
static
const
char
*
_rotationYaw45FactName
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment