From 16a547ed793fbbf10ba79c59fa8eb6acef83a0f8 Mon Sep 17 00:00:00 2001 From: Drew Williams Date: Tue, 8 Oct 2024 08:23:05 -0400 Subject: [PATCH] adjusted feeder and intake to work irl --- src/main/deploy/commit.txt | 2 +- src/main/include/constants/FeederConstants.h | 6 +++--- src/main/include/constants/IntakeConstants.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/deploy/commit.txt b/src/main/deploy/commit.txt index d09fdbe..93e316d 100644 --- a/src/main/deploy/commit.txt +++ b/src/main/deploy/commit.txt @@ -1 +1 @@ -691c6c1 \ No newline at end of file +5644691 \ No newline at end of file diff --git a/src/main/include/constants/FeederConstants.h b/src/main/include/constants/FeederConstants.h index e926ffd..04727ad 100644 --- a/src/main/include/constants/FeederConstants.h +++ b/src/main/include/constants/FeederConstants.h @@ -20,7 +20,7 @@ inline constexpr int FEEDER = 18; } // namespace can_ids namespace ports { -inline constexpr int NOTE_SENSOR_PORT = 2; +inline constexpr int NOTE_SENSOR_PORT = 9; } // namespace ports namespace current_limits { @@ -30,7 +30,7 @@ inline constexpr units::ampere_t STATOR_CURRENT_LIMIT = 180_A; namespace physical { -inline constexpr bool INVERT_MOTOR = false; +inline constexpr bool INVERT_MOTOR = true; inline constexpr units::scalar_t FEEDER_RATIO = (60.0 / 16.0); @@ -46,7 +46,7 @@ inline constexpr units::kilogram_square_meter_t FEEDER_MOI = namespace gains { inline constexpr units::volt_t NOTE_FEED_VOLTAGE = 10_V; inline constexpr units::volt_t NOTE_EJECT_VOLTAGE = -10_V; -inline constexpr units::second_t NOTE_SENSOR_DEBOUNCE_TIME = 0.1_s; +inline constexpr units::second_t NOTE_SENSOR_DEBOUNCE_TIME = 0_s; } // namespace gains } // namespace feeder } // namespace consts diff --git a/src/main/include/constants/IntakeConstants.h b/src/main/include/constants/IntakeConstants.h index 3019881..c976e6c 100644 --- a/src/main/include/constants/IntakeConstants.h +++ b/src/main/include/constants/IntakeConstants.h @@ -26,7 +26,7 @@ inline constexpr units::ampere_t STATOR_CURRENT_LIMIT = 180_A; namespace physical { -inline constexpr bool INVERT_MOTOR = false; +inline constexpr bool INVERT_MOTOR = true; inline constexpr units::scalar_t INTAKE_RATIO = (24.0 / 16.0); @@ -41,8 +41,8 @@ inline constexpr units::kilogram_square_meter_t INTAKE_MOI = namespace gains { inline constexpr units::ampere_t NOTE_SPIKE_THRESHOLD = 100_A; -inline constexpr units::volt_t NOTE_INTAKE_VOLTAGE = 10_V; -inline constexpr units::volt_t NOTE_EJECT_VOLTAGE = -10_V; +inline constexpr units::volt_t NOTE_INTAKE_VOLTAGE = 5.2053_V; +inline constexpr units::volt_t NOTE_EJECT_VOLTAGE = -5.2053_V; } // namespace gains } // namespace intake } // namespace consts