compile fixes for the angle adjust
diff --git a/frc971/atom_code/atom_code.gyp b/frc971/atom_code/atom_code.gyp
index bcf573a..277c378 100644
--- a/frc971/atom_code/atom_code.gyp
+++ b/frc971/atom_code/atom_code.gyp
@@ -8,7 +8,6 @@
'../control_loops/control_loops.gyp:DriveTrain',
'../control_loops/wrist/wrist.gyp:wrist',
'../control_loops/wrist/wrist.gyp:wrist_lib_test',
- '../control_loops/control_loops.gyp:hall_effect_lib_test',
'../control_loops/angle_adjust/angle_adjust.gyp:angle_adjust',
'../control_loops/angle_adjust/angle_adjust.gyp:angle_adjust_lib_test',
'../control_loops/angle_adjust/angle_adjust.gyp:angle_adjust_csv',
diff --git a/frc971/control_loops/angle_adjust/angle_adjust.gyp b/frc971/control_loops/angle_adjust/angle_adjust.gyp
index 7a7a1ea..cb3ba1b 100644
--- a/frc971/control_loops/angle_adjust/angle_adjust.gyp
+++ b/frc971/control_loops/angle_adjust/angle_adjust.gyp
@@ -63,6 +63,7 @@
'<(AOS)/common/common.gyp:time',
'<(AOS)/common/common.gyp:timing',
'angle_adjust_loop',
+ '<(AOS)/atom_code/atom_code.gyp:init',
],
},
{
@@ -76,6 +77,7 @@
'angle_adjust_lib',
'angle_adjust_loop',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
+ '<(AOS)/atom_code/atom_code.gyp:init',
],
},
],
diff --git a/frc971/control_loops/angle_adjust/angle_adjust_csv.cc b/frc971/control_loops/angle_adjust/angle_adjust_csv.cc
index 091f494..6d484d5 100644
--- a/frc971/control_loops/angle_adjust/angle_adjust_csv.cc
+++ b/frc971/control_loops/angle_adjust/angle_adjust_csv.cc
@@ -39,7 +39,7 @@
fprintf(output_file, "\n%f, %f, %f",
(angle_adjust.position->sent_time - start_time).ToSeconds(),
angle_adjust.output->voltage,
- angle_adjust.position->bottom_angle);
+ angle_adjust.position->angle);
}
}
diff --git a/frc971/control_loops/control_loops.gyp b/frc971/control_loops/control_loops.gyp
index db77a2c..18df792 100644
--- a/frc971/control_loops/control_loops.gyp
+++ b/frc971/control_loops/control_loops.gyp
@@ -37,19 +37,6 @@
'includes': ['../../aos/build/queues.gypi'],
},
{
- 'target_name': 'hall_effect_lib_test',
- 'type': 'executable',
- 'sources': [
- 'hall_effect_lib_test.cc',
- ],
- 'dependencies': [
- '<(EXTERNALS):gtest',
- '<(AOS)/build/aos.gyp:libaos',
- '<(AOS)/common/common.gyp:queue_testutils',
- '<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
- ],
- },
- {
'target_name': 'DriveTrain',
'type': 'executable',
'sources': [