Skip to content

Commit 7e3b91f

Browse files
committed
fix
1 parent 8348b60 commit 7e3b91f

File tree

5 files changed

+48
-14
lines changed

5 files changed

+48
-14
lines changed

src/sauvc_missions/configs/missions/blue_bowl.yaml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ states:
5252
pitch: 0.0
5353
duration: 100.0
5454
centering_rate: 0.5
55-
DISABLE_OBJECT_DETECTION:
56-
action:
57-
type: EnableObjectDetection
58-
camera_topic: /stingray/topics/camera/front
59-
enable: false
55+
# DISABLE_OBJECT_DETECTION:
56+
# action:
57+
# type: EnableObjectDetection
58+
# camera_topic: /stingray/topics/camera/front
59+
# enable: false
6060
# определенное количество времени движения до тазика
6161
# необходимо подобрать благоприятную скорость, время движения, глубину
6262
MOVE_TO_BOWL:
@@ -69,10 +69,26 @@ states:
6969
pitch: 0.0
7070
yaw: 0.0
7171
duration: 5.0
72+
DEV:
73+
action:
74+
type: SetDeviceValue
75+
device: 0
76+
value: 1
77+
MOVE_BACK:
78+
action:
79+
type: Twist
80+
surge: -50.0
81+
sway: 0.0
82+
depth: 1.0
83+
roll: 0.0
84+
pitch: 0.0
85+
yaw: 0.0
86+
duration: 5.0
7287
transitions:
7388
- { trigger: ok, source: ENABLE_OBJECT_DETECTION, dest: SEARCH_MAT }
7489
- { trigger: ok, source: SEARCH_MAT, dest: CENTERING_MAT }
7590
- { trigger: ok, source: CENTERING_MAT, dest: CENTERING_BLUE_BOWL }
76-
- { trigger: ok, source: CENTERING_BLUE_BOWL, dest: DISABLE_OBJECT_DETECTION }
77-
- { trigger: ok, source: DISABLE_OBJECT_DETECTION, dest: MOVE_TO_BOWL }
78-
- { trigger: ok, source: MOVE_TO_BOWL, dest: OK }
91+
- { trigger: ok, source: CENTERING_BLUE_BOWL, dest: MOVE_TO_BOWL }
92+
- { trigger: ok, source: MOVE_TO_BOWL, dest: DEV }
93+
- { trigger: ok, source: DEV, dest: MOVE_BACK }
94+
- { trigger: ok, source: MOVE_BACK, dest: OK }
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
initial: DEV
2+
states:
3+
DEV:
4+
action:
5+
type: SetDeviceValue
6+
device: 0
7+
value: 1
8+
transitions:
9+
- { trigger: ok, source: DEV, dest: IDLE }

src/sauvc_missions/configs/missions/gate.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ states:
2020
type: BboxCenteringTwist
2121
bbox_name: gate
2222
bbox_topic: /stingray/topics/camera/front/bbox_array
23-
distance_threshold: 2.5
23+
distance_threshold: 3.0
2424
lost_threshold: 10000
2525
avoid_bbox_name_array: [orange_flare, red_flare]
26-
avoid_distance_threshold: 3
27-
avoid_horizontal_threshold: 2.0
28-
surge: 30.0
26+
avoid_distance_threshold: 1.5
27+
avoid_horizontal_threshold: 0.5
28+
surge: 40.0
2929
sway: 20.0
3030
depth: 1.5
3131
roll: 0.0
@@ -41,7 +41,7 @@ states:
4141
roll: 0.0
4242
pitch: 0.0
4343
yaw: 0.0
44-
duration: 5.0
44+
duration: 8.0
4545
transitions:
4646
- { trigger: ok, source: ENABLE_OBJECT_DETECTION, dest: SUBMERGE }
4747
- { trigger: ok, source: SUBMERGE, dest: MOVE_CENTERING_GATE }
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
initial: DEV
2+
ok_state_package_name: stingray_missions
3+
failed_state_package_name: stingray_missions
4+
missions:
5+
DEV:
6+
config_name: dev
7+
package_name: sauvc_missions
8+
transitions:
9+
- { source: DEV, outcome: OK, dest: OK }

0 commit comments

Comments
 (0)