Made some changes to JoystickReader for third robot.
Changes are by no means finalized!
- Copied input stuff to bot3/input.
(Copying even unmodified files was necessary so git wouldn't build stuff
from frc971/input/input.gyp and see duplicate targets.)
- Modified build system to build this.
- Took the opportunity to fix some name-related stylguide compliance issues.
(I fixed these in frc971 as well.)
diff --git a/frc971/atom_code/atom_code.gyp b/frc971/atom_code/atom_code.gyp
index 9a111b0..99f7047 100644
--- a/frc971/atom_code/atom_code.gyp
+++ b/frc971/atom_code/atom_code.gyp
@@ -17,8 +17,8 @@
'../control_loops/shooter/shooter.gyp:shooter_lib_test',
'../control_loops/shooter/shooter.gyp:shooter',
'../autonomous/autonomous.gyp:auto',
- '../input/input.gyp:JoystickReader',
- '../input/input.gyp:GyroReader',
+ '../input/input.gyp:joystick_reader',
+ '../input/input.gyp:gyro_reader',
'../../vision/vision.gyp:OpenCVWorkTask',
'../../vision/vision.gyp:GoalMaster',
'../output/output.gyp:MotorWriter',
diff --git a/frc971/atom_code/scripts/start_list.txt b/frc971/atom_code/scripts/start_list.txt
index 015130f..13c9b99 100644
--- a/frc971/atom_code/scripts/start_list.txt
+++ b/frc971/atom_code/scripts/start_list.txt
@@ -1,6 +1,6 @@
BinaryLogReader
MotorWriter
-JoystickReader
+joystick_reader
drivetrain
CRIOLogReader
angle_adjust
diff --git a/frc971/input/GyroReader.cc b/frc971/input/gyro_reader.cc
similarity index 100%
rename from frc971/input/GyroReader.cc
rename to frc971/input/gyro_reader.cc
diff --git a/frc971/input/input.gyp b/frc971/input/input.gyp
index 5e08a20..b97c808 100644
--- a/frc971/input/input.gyp
+++ b/frc971/input/input.gyp
@@ -1,10 +1,10 @@
{
'targets': [
{
- 'target_name': 'JoystickReader',
+ 'target_name': 'joystick_reader',
'type': 'executable',
'sources': [
- 'JoystickReader.cc',
+ 'joystick_reader.cc',
],
'dependencies': [
'<(AOS)/atom_code/input/input.gyp:joystick_input',
@@ -64,10 +64,10 @@
],
},
{
- 'target_name': 'GyroReader',
+ 'target_name': 'gyro_reader',
'type': 'executable',
'sources': [
- 'GyroReader.cc',
+ 'gyro_reader.cc',
],
'dependencies': [
'<(DEPTH)/frc971/queues/queues.gyp:queues',
diff --git a/frc971/input/JoystickReader.cc b/frc971/input/joystick_reader.cc
similarity index 100%
rename from frc971/input/JoystickReader.cc
rename to frc971/input/joystick_reader.cc