Skip to content

Commit

Permalink
Adjust robot constants
Browse files Browse the repository at this point in the history
  • Loading branch information
calebchalmers committed Mar 31, 2024
1 parent 91ab1d6 commit 8a90613
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ut-robomaster/src/robots/hero/hero_constants.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ constexpr float CAMERA_X_OFFSET = 0.0f; // horizontal offset of main camera l

static constexpr modm::Pair<uint16_t, float> FLYWHEEL_RPS_MAPPING[] = {{10, 105.0f}, {16, 190.0f}};

const float BALLS_PER_SEC = 2.0f;
const float BALLS_PER_SEC = 4.0f;
const float BALLS_PER_REV = 6.0f;
const float FEEDER_RATIO = 1.0f; // feeder speed / agitator speed

Expand All @@ -73,7 +73,7 @@ const float UNJAM_DURATION = 0.1f; // s
const float UNJAM_SPEED = 12.0f; // rev/s

static constexpr int FLYWHEELS = 2;
static constexpr float DEFAULT_SPEED = 10.0f;
static constexpr float DEFAULT_SPEED = 60.0f;

static constexpr tap::algorithms::SmoothPidConfig YAW_PID_CONFIG = {
.kp = 100'183.1f,
Expand Down
5 changes: 4 additions & 1 deletion ut-robomaster/src/robots/sentry/sentry_constants.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ const float BALLS_PER_REV = 8.0f;

const uint16_t BARREL_HEAT_BUFFER = 20.0f;

const float UNJAM_SPEED = 0.4f; // rev/s
const float JAM_TRIGGER_RATIO = 0.5; // measured speed to driven speed ratio
const float JAM_TRIGGER_DURATION = 0.1f; // s
const float UNJAM_DURATION = 0.1f; // s
const float UNJAM_SPEED = 15.0f; // rev/s

// Turret constants ------------------------------------------------
constexpr MotorId ID_YAW = MOTOR6;
Expand Down
6 changes: 3 additions & 3 deletions ut-robomaster/src/robots/standard/standard_constants.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ const float BALLS_PER_REV = 8.0f;
const uint16_t BARREL_HEAT_BUFFER = 20.0f;

const float JAM_TRIGGER_RATIO = 0.5; // measured speed to driven speed ratio
const float JAM_TRIGGER_DURATION = 1.0f; // s
const float UNJAM_DURATION = 1.0f; // s
const float UNJAM_SPEED = 0.4f; // rev/s
const float JAM_TRIGGER_DURATION = 0.1f; // s
const float UNJAM_DURATION = 0.1f; // s
const float UNJAM_SPEED = 15.0f; // rev/s

// Turret constants ------------------------------------------------
constexpr MotorId ID_YAW = MOTOR6;
Expand Down

0 comments on commit 8a90613

Please sign in to comment.