Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
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
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
f831cc6c
Commit
f831cc6c
authored
9 years ago
by
jgoppert
Committed by
Lorenz Meier
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Don't kill if jmavsim not found.
parent
a23ba97f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Tools/sitl_run.sh
+6
-1
6 additions, 1 deletion
Tools/sitl_run.sh
with
6 additions
and
1 deletion
Tools/sitl_run.sh
+
6
−
1
View file @
f831cc6c
...
...
@@ -20,7 +20,12 @@ fi
# kill process names that might stil
# be running from last time
pkill mainapp
kill
-9
`
jps |
grep
Simulator |
cut
-d
" "
-f1
`
jmavsim_pid
=
`
jps |
grep
Simulator |
cut
-d
" "
-f1
`
echo
jmavsim_pid
=
\"
${
jmavsim_pid
}
\"
if
[
-n
"
$jmavsim_pid
"
]
then
kill
$jmavsim_pid
fi
cp
Tools/posix_lldbinit
$build_path
/src/firmware/posix/.lldbinit
cp
Tools/posix.gdbinit
$build_path
/src/firmware/posix/.gdbinit
...
...
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