Remove Potentiometer from Intake Pivot
Changed the intake pivot from a pot and absolute
encoder subsystem to just an absolute encoder subsystem
Signed-off-by: Niko Sohmers <nikolai@sohmers.com>
Change-Id: I9440cc1716420ca22c776db22e7694f2c1448aeb
diff --git a/y2024/constants/7971.json b/y2024/constants/7971.json
index 9e6bafb..d2e766a 100644
--- a/y2024/constants/7971.json
+++ b/y2024/constants/7971.json
@@ -3,15 +3,12 @@
{
"robot": {
- "intake_constants": {
- {% set _ = intake_pivot_zero.update(
- {
- "measured_absolute_position" : 0.0
- }
- ) %}
- "zeroing_constants": {{ intake_pivot_zero | tojson(indent=2)}},
- "potentiometer_offset": 0.0
- },
+ {% set _ = intake_pivot_zero.update(
+ {
+ "measured_absolute_position" : 0.0
+ }
+ ) %}
+ "intake_constants": {{ intake_pivot_zero | tojson(indent=2)}},
"climber_constants": {
{% set _ = climber_zero.update(
{
diff --git a/y2024/constants/971.json b/y2024/constants/971.json
index 641783f..9ab6ad6 100644
--- a/y2024/constants/971.json
+++ b/y2024/constants/971.json
@@ -8,15 +8,12 @@
}
],
"robot": {
- "intake_constants": {
- {% set _ = intake_pivot_zero.update(
- {
- "measured_absolute_position" : 0.0
- }
- ) %}
- "zeroing_constants": {{ intake_pivot_zero | tojson(indent=2)}},
- "potentiometer_offset": 0.0
- },
+ {% set _ = intake_pivot_zero.update(
+ {
+ "measured_absolute_position" : 0.0
+ }
+ ) %}
+ "intake_constants": {{ intake_pivot_zero | tojson(indent=2)}},
"climber_constants": {
{% set _ = climber_zero.update(
{
diff --git a/y2024/constants/9971.json b/y2024/constants/9971.json
index 9e6bafb..d2e766a 100644
--- a/y2024/constants/9971.json
+++ b/y2024/constants/9971.json
@@ -3,15 +3,12 @@
{
"robot": {
- "intake_constants": {
- {% set _ = intake_pivot_zero.update(
- {
- "measured_absolute_position" : 0.0
- }
- ) %}
- "zeroing_constants": {{ intake_pivot_zero | tojson(indent=2)}},
- "potentiometer_offset": 0.0
- },
+ {% set _ = intake_pivot_zero.update(
+ {
+ "measured_absolute_position" : 0.0
+ }
+ ) %}
+ "intake_constants": {{ intake_pivot_zero | tojson(indent=2)}},
"climber_constants": {
{% set _ = climber_zero.update(
{
diff --git a/y2024/constants/constants.fbs b/y2024/constants/constants.fbs
index 40d609f..2aaac3e 100644
--- a/y2024/constants/constants.fbs
+++ b/y2024/constants/constants.fbs
@@ -71,9 +71,8 @@
}
table RobotConstants {
- intake_constants:PotAndAbsEncoderConstants (id: 0);
+ intake_constants:frc971.zeroing.AbsoluteEncoderZeroingConstants (id: 0);
climber_constants:PotAndAbsEncoderConstants (id: 1);
-
}
// Common table for constants unrelated to the robot
diff --git a/y2024/constants/test_data/test_team.json b/y2024/constants/test_data/test_team.json
index 9e6bafb..d2e766a 100644
--- a/y2024/constants/test_data/test_team.json
+++ b/y2024/constants/test_data/test_team.json
@@ -3,15 +3,12 @@
{
"robot": {
- "intake_constants": {
- {% set _ = intake_pivot_zero.update(
- {
- "measured_absolute_position" : 0.0
- }
- ) %}
- "zeroing_constants": {{ intake_pivot_zero | tojson(indent=2)}},
- "potentiometer_offset": 0.0
- },
+ {% set _ = intake_pivot_zero.update(
+ {
+ "measured_absolute_position" : 0.0
+ }
+ ) %}
+ "intake_constants": {{ intake_pivot_zero | tojson(indent=2)}},
"climber_constants": {
{% set _ = climber_zero.update(
{