Skip to content
This repository has been archived by the owner on Dec 3, 2019. It is now read-only.

Commit

Permalink
Auto changes
Browse files Browse the repository at this point in the history
  • Loading branch information
adein committed Mar 4, 2016
1 parent 5208c6c commit 63e68f0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/commands/drive_encoder_counts.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ def execute(self):
distance_left = self._target_position - current
# Determine direction using target and current encoder values
if (distance_left) >= 0:
direction = 1.0
else:
direction = -1.0
else:
direction = 1.0
linear_drive_amount = self._speed * direction
if (distance_left < self._ramp_threshold):
linear_drive_amount = linear_drive_amount * (distance_left) / self._ramp_threshold
Expand Down
4 changes: 2 additions & 2 deletions src/configs/auto.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Drivetrain]
DISTANCE_TO_OBSTACLE: 100
DISTANCE_TO_OBSTACLE: 2000
AUTO_SPEED: 0.5
THRESHOLD: 10
RAMP_THRESHOLD: 20
Expand All @@ -14,7 +14,7 @@ FEED_TIME: 2.0

[Arm]
LOWER_BOUND: 150
LOWER_SPEED: 0.25
LOWER_SPEED: 0.5

[Hook]
EXTEND_SPEED: 1.0
Expand Down
2 changes: 1 addition & 1 deletion src/configs/commands.ini
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ TURN_ANGLE: 90
TURN_THRESHOLD: 5

[ShootCommand]
ARM_LIFT_TIME: 0.25
ARM_LIFT_TIME: 0.4
ARM_LIFT_SPEED: -1.0
FEED_OUT_TIME: 0.5
FEED_OUT_SPEED: -1.0

0 comments on commit 63e68f0

Please sign in to comment.