Skip to content

Commit 7c00d8a

Browse files
Merge branch 'main' into comp-2025
2 parents d93b46d + 4e89f7f commit 7c00d8a

4 files changed

Lines changed: 6 additions & 28 deletions

File tree

playstreams.sh

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/config/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ const CONFIG_FILE: &str = "config.toml";
2121
const CONTROL_BOARD_PATH: &str = "/dev/ttyACM0";
2222
const CONTROL_BOARD_BACKUP_PATH: &str = "/dev/ttyACM3";
2323
const MEB_PATH: &str = "/dev/ttyACM2";
24-
const FRONT_CAM: &str = "/dev/video1";
25-
const BOTTOM_CAM: &str = "/dev/video0";
24+
const FRONT_CAM: &str = "/dev/video0";
25+
const BOTTOM_CAM: &str = "/dev/video1";
2626

2727
#[derive(Debug, Serialize, Deserialize)]
2828
pub struct Config {

src/missions/coinflip.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ pub fn coinflip<
119119
const TRUE_COUNT: u32 = 4;
120120
const DELAY_TIME: f32 = 3.0;
121121

122-
const DEPTH: f32 = -1.25;
122+
const DEPTH: f32 = -1.6;
123123
const ALIGN_X_SPEED: f32 = 0.0;
124124
const ALIGN_Y_SPEED: f32 = 0.0;
125125
const ALIGN_YAW_SPEED: f32 = -3.0;

src/missions/gate.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ pub fn gate_run_coinflip<
585585
ActionChain::new(
586586
Stability2Movement::new(
587587
context,
588-
Stability2Pos::new(0.0, 1.0, 0.0, 0.0, None, depth),
588+
Stability2Pos::new(0.0, 0.5, 0.0, 0.0, None, depth),
589589
),
590590
OutputType::<()>::default()
591591
),
@@ -598,7 +598,7 @@ pub fn gate_run_coinflip<
598598
ActionChain::new(
599599
Stability2Movement::new(
600600
context,
601-
Stability2Pos::new(0.0, 1.0, 0.0, 0.0, None, depth),
601+
Stability2Pos::new(0.0, 0.5, 0.0, 0.0, None, depth),
602602
),
603603
OutputType::<()>::default()
604604
),
@@ -617,7 +617,7 @@ pub fn gate_run_coinflip<
617617
ActionChain::new(
618618
Stability2Movement::new(
619619
context,
620-
Stability2Pos::new(0.0, 0.5, 0.0, 0.0, None, depth),
620+
Stability2Pos::new(0.0, 0.0, 0.0, 0.0, None, depth),
621621
),
622622
OutputType::<()>::default()
623623
),

0 commit comments

Comments
 (0)