Browse Source

moved posix airframe files to folder, same as in regullar init.d folder

and add some debugging info when succeeded/fail to find air-frame file
sbg
bazooka joe 4 years ago committed by Daniel Agar
parent
commit
727b0cf530
  1. 40
      ROMFS/px4fmu_common/init.d-posix/CMakeLists.txt
  2. 1
      ROMFS/px4fmu_common/init.d-posix/airframes/10016_iris
  3. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/10020_if750a
  4. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/10030_px4vision
  5. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1010_iris_opt_flow
  6. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1010_iris_opt_flow.post
  7. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1011_iris_irlock
  8. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1012_iris_rplidar
  9. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1013_iris_vision
  10. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1013_iris_vision.post
  11. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1014_solo
  12. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1015_iris_obs_avoid
  13. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1015_iris_obs_avoid.post
  14. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1016_iris_rtps
  15. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1016_iris_rtps.post
  16. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1017_iris_opt_flow_mockup
  17. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1018_iris_vision_velocity
  18. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1019_iris_dual_gps
  19. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1020_uuv_generic
  20. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1021_uuv_hippocampus
  21. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1030_plane
  22. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1031_plane_cam
  23. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1032_plane_catapult
  24. 2
      ROMFS/px4fmu_common/init.d-posix/airframes/1033_plane_lidar
  25. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1033_rascal
  26. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1034_rascal-electric
  27. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1040_standard_vtol
  28. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1041_tailsitter
  29. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1042_tiltrotor
  30. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1060_rover
  31. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1061_r1_rover
  32. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1062_tf-r1
  33. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/1070_boat
  34. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/17001_tf-g1
  35. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/2507_cloudship
  36. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/3010_quadrotor_x
  37. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/3011_hexarotor_x
  38. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/6011_typhoon_h480
  39. 0
      ROMFS/px4fmu_common/init.d-posix/airframes/6011_typhoon_h480.post
  40. 73
      ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
  41. 8
      ROMFS/px4fmu_common/init.d-posix/rcS

40
ROMFS/px4fmu_common/init.d-posix/CMakeLists.txt

@ -31,45 +31,9 @@ @@ -31,45 +31,9 @@
#
############################################################################
add_subdirectory(airframes)
px4_add_romfs_files(
10016_iris
10020_if750a
10030_px4vision
1010_iris_opt_flow
1010_iris_opt_flow.post
1011_iris_irlock
1012_iris_rplidar
1013_iris_vision
1013_iris_vision.post
1014_solo
1015_iris_obs_avoid
1015_iris_obs_avoid.post
1016_iris_rtps
1016_iris_rtps.post
1017_iris_opt_flow_mockup
1018_iris_vision_velocity
1019_iris_dual_gps
1020_uuv_generic
1021_uuv_hippocampus
1030_plane
1031_plane_cam
1032_plane_catapult
1033_plane_lidar
1033_rascal
1034_rascal-electric
1040_standard_vtol
1041_tailsitter
1042_tiltrotor
1060_rover
1061_r1_rover
1062_tf-r1
1070_boat
3010_quadrotor_x
3011_hexarotor_x
17001_tf-g1
2507_cloudship
6011_typhoon_h480
6011_typhoon_h480.post
rc.replay
rcS
)

1
ROMFS/px4fmu_common/init.d-posix/10016_iris → ROMFS/px4fmu_common/init.d-posix/airframes/10016_iris

@ -10,4 +10,3 @@ @@ -10,4 +10,3 @@
sh /etc/init.d/rc.mc_defaults
set MIXER quad_w

0
ROMFS/px4fmu_common/init.d-posix/10020_if750a → ROMFS/px4fmu_common/init.d-posix/airframes/10020_if750a

0
ROMFS/px4fmu_common/init.d-posix/10030_px4vision → ROMFS/px4fmu_common/init.d-posix/airframes/10030_px4vision

2
ROMFS/px4fmu_common/init.d-posix/1010_iris_opt_flow → ROMFS/px4fmu_common/init.d-posix/airframes/1010_iris_opt_flow

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#
sh /etc/init.d-posix/10016_iris
sh /etc/init.d-posix/airframes/10016_iris
if [ $AUTOCNF = yes ]
then

0
ROMFS/px4fmu_common/init.d-posix/1010_iris_opt_flow.post → ROMFS/px4fmu_common/init.d-posix/airframes/1010_iris_opt_flow.post

2
ROMFS/px4fmu_common/init.d-posix/1011_iris_irlock → ROMFS/px4fmu_common/init.d-posix/airframes/1011_iris_irlock

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#
sh /etc/init.d-posix/10016_iris
sh /etc/init.d-posix/airframes/10016_iris
if [ $AUTOCNF = yes ]
then

2
ROMFS/px4fmu_common/init.d-posix/1012_iris_rplidar → ROMFS/px4fmu_common/init.d-posix/airframes/1012_iris_rplidar

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#
sh /etc/init.d-posix/10016_iris
sh /etc/init.d-posix/airframes/10016_iris
if [ $AUTOCNF = yes ]
then

2
ROMFS/px4fmu_common/init.d-posix/1013_iris_vision → ROMFS/px4fmu_common/init.d-posix/airframes/1013_iris_vision

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#
sh /etc/init.d-posix/10016_iris
sh /etc/init.d-posix/airframes/10016_iris
if [ $AUTOCNF = yes ]
then

0
ROMFS/px4fmu_common/init.d-posix/1013_iris_vision.post → ROMFS/px4fmu_common/init.d-posix/airframes/1013_iris_vision.post

0
ROMFS/px4fmu_common/init.d-posix/1014_solo → ROMFS/px4fmu_common/init.d-posix/airframes/1014_solo

2
ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid → ROMFS/px4fmu_common/init.d-posix/airframes/1015_iris_obs_avoid

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#
sh /etc/init.d-posix/10016_iris
sh /etc/init.d-posix/airframes/10016_iris
if [ $AUTOCNF = yes ]
then

0
ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid.post → ROMFS/px4fmu_common/init.d-posix/airframes/1015_iris_obs_avoid.post

2
ROMFS/px4fmu_common/init.d-posix/1016_iris_rtps → ROMFS/px4fmu_common/init.d-posix/airframes/1016_iris_rtps

@ -5,4 +5,4 @@ @@ -5,4 +5,4 @@
# @type Quadrotor Wide
#
sh /etc/init.d-posix/10016_iris
sh /etc/init.d-posix/airframes/10016_iris

0
ROMFS/px4fmu_common/init.d-posix/1016_iris_rtps.post → ROMFS/px4fmu_common/init.d-posix/airframes/1016_iris_rtps.post

2
ROMFS/px4fmu_common/init.d-posix/1017_iris_opt_flow_mockup → ROMFS/px4fmu_common/init.d-posix/airframes/1017_iris_opt_flow_mockup

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#
sh /etc/init.d-posix/10016_iris
sh /etc/init.d-posix/airframes/10016_iris
if [ $AUTOCNF = yes ]
then

2
ROMFS/px4fmu_common/init.d-posix/1018_iris_vision_velocity → ROMFS/px4fmu_common/init.d-posix/airframes/1018_iris_vision_velocity

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#
sh /etc/init.d-posix/10016_iris
sh /etc/init.d-posix/airframes/10016_iris
if [ $AUTOCNF = yes ]
then

2
ROMFS/px4fmu_common/init.d-posix/1019_iris_dual_gps → ROMFS/px4fmu_common/init.d-posix/airframes/1019_iris_dual_gps

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#
sh /etc/init.d-posix/10016_iris
sh /etc/init.d-posix/airframes/10016_iris
if [ $AUTOCNF = yes ]
then

0
ROMFS/px4fmu_common/init.d-posix/1020_uuv_generic → ROMFS/px4fmu_common/init.d-posix/airframes/1020_uuv_generic

0
ROMFS/px4fmu_common/init.d-posix/1021_uuv_hippocampus → ROMFS/px4fmu_common/init.d-posix/airframes/1021_uuv_hippocampus

0
ROMFS/px4fmu_common/init.d-posix/1030_plane → ROMFS/px4fmu_common/init.d-posix/airframes/1030_plane

2
ROMFS/px4fmu_common/init.d-posix/1031_plane_cam → ROMFS/px4fmu_common/init.d-posix/airframes/1031_plane_cam

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
# @name Plane SITL with camera
#
sh /etc/init.d-posix/1030_plane
sh /etc/init.d-posix/airframes/1030_plane
if [ $AUTOCNF = yes ]
then

2
ROMFS/px4fmu_common/init.d-posix/1032_plane_catapult → ROMFS/px4fmu_common/init.d-posix/airframes/1032_plane_catapult

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
# @name Plane SITL with catapult
#
sh /etc/init.d-posix/1030_plane
sh /etc/init.d-posix/airframes/1030_plane
if [ $AUTOCNF = yes ]
then

2
ROMFS/px4fmu_common/init.d-posix/1033_plane_lidar → ROMFS/px4fmu_common/init.d-posix/airframes/1033_plane_lidar

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
# @name Plane SITL with downward facing LIDAR.
#
sh /etc/init.d-posix/1030_plane
sh /etc/init.d-posix/airframes/1030_plane
if [ $AUTOCNF = yes ]
then

0
ROMFS/px4fmu_common/init.d-posix/1033_rascal → ROMFS/px4fmu_common/init.d-posix/airframes/1033_rascal

0
ROMFS/px4fmu_common/init.d-posix/1034_rascal-electric → ROMFS/px4fmu_common/init.d-posix/airframes/1034_rascal-electric

0
ROMFS/px4fmu_common/init.d-posix/1040_standard_vtol → ROMFS/px4fmu_common/init.d-posix/airframes/1040_standard_vtol

0
ROMFS/px4fmu_common/init.d-posix/1041_tailsitter → ROMFS/px4fmu_common/init.d-posix/airframes/1041_tailsitter

0
ROMFS/px4fmu_common/init.d-posix/1042_tiltrotor → ROMFS/px4fmu_common/init.d-posix/airframes/1042_tiltrotor

0
ROMFS/px4fmu_common/init.d-posix/1060_rover → ROMFS/px4fmu_common/init.d-posix/airframes/1060_rover

0
ROMFS/px4fmu_common/init.d-posix/1061_r1_rover → ROMFS/px4fmu_common/init.d-posix/airframes/1061_r1_rover

0
ROMFS/px4fmu_common/init.d-posix/1062_tf-r1 → ROMFS/px4fmu_common/init.d-posix/airframes/1062_tf-r1

0
ROMFS/px4fmu_common/init.d-posix/1070_boat → ROMFS/px4fmu_common/init.d-posix/airframes/1070_boat

0
ROMFS/px4fmu_common/init.d-posix/17001_tf-g1 → ROMFS/px4fmu_common/init.d-posix/airframes/17001_tf-g1

0
ROMFS/px4fmu_common/init.d-posix/2507_cloudship → ROMFS/px4fmu_common/init.d-posix/airframes/2507_cloudship

0
ROMFS/px4fmu_common/init.d-posix/3010_quadrotor_x → ROMFS/px4fmu_common/init.d-posix/airframes/3010_quadrotor_x

0
ROMFS/px4fmu_common/init.d-posix/3011_hexarotor_x → ROMFS/px4fmu_common/init.d-posix/airframes/3011_hexarotor_x

0
ROMFS/px4fmu_common/init.d-posix/6011_typhoon_h480 → ROMFS/px4fmu_common/init.d-posix/airframes/6011_typhoon_h480

0
ROMFS/px4fmu_common/init.d-posix/6011_typhoon_h480.post → ROMFS/px4fmu_common/init.d-posix/airframes/6011_typhoon_h480.post

73
ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt

@ -0,0 +1,73 @@ @@ -0,0 +1,73 @@
############################################################################
#
# Copyright (c) 2020 PX4 Development Team. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name PX4 nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
px4_add_romfs_files(
10016_iris
10020_if750a
10030_px4vision
1010_iris_opt_flow
1010_iris_opt_flow.post
1011_iris_irlock
1012_iris_rplidar
1013_iris_vision
1013_iris_vision.post
1014_solo
1015_iris_obs_avoid
1015_iris_obs_avoid.post
1016_iris_rtps
1016_iris_rtps.post
1017_iris_opt_flow_mockup
1018_iris_vision_velocity
1019_iris_dual_gps
1020_uuv_generic
1021_uuv_hippocampus
1030_plane
1031_plane_cam
1032_plane_catapult
1033_plane_lidar
1033_rascal
1034_rascal-electric
1040_standard_vtol
1041_tailsitter
1042_tiltrotor
1060_rover
1061_r1_rover
1062_tf-r1
1070_boat
3010_quadrotor_x
3011_hexarotor_x
17001_tf-g1
2507_cloudship
6011_typhoon_h480
6011_typhoon_h480.post
)

8
ROMFS/px4fmu_common/init.d-posix/rcS

@ -44,10 +44,12 @@ else @@ -44,10 +44,12 @@ else
# Find the matching Autostart ID (file name has the form: [0-9]+_${PX4_SIM_MODEL})
# TODO: unify with rc.autostart generation
# shellcheck disable=SC2012
REQUESTED_AUTOSTART=$(ls "$SCRIPT_DIR" | sed -n 's/^\([0-9][0-9]*\)_'${PX4_SIM_MODEL}'$/\1/p')
REQUESTED_AUTOSTART=$(ls "$SCRIPT_DIR/airframes" | sed -n 's/^\([0-9][0-9]*\)_'${PX4_SIM_MODEL}'$/\1/p')
if [ -z "$REQUESTED_AUTOSTART" ]; then
echo "Error: Unknown model '$PX4_SIM_MODEL'"
echo "Error: Unknown model $PX4_SIM_MODEL (not found by name on $SCRIPT_DIR/airframes)"
exit 1
else
echo "Info: found model autostart file as SYS_AUTOSTART=$REQUESTED_AUTOSTART"
fi
fi
@ -195,7 +197,7 @@ fi @@ -195,7 +197,7 @@ fi
# Autostart ID
autostart_file=''
for f in etc/init.d-posix/"$(param show -q SYS_AUTOSTART)"_*
for f in etc/init.d-posix/airframes/"$(param show -q SYS_AUTOSTART)"_*
do
filename=$(basename "$f")
case "$filename" in

Loading…
Cancel
Save