Clean up a few after-merge idiosyncrasies.
- Get the bot3 input code up to date. (Again.)
- Get rid of old gyro_reader.cc file, which somehow survived.
diff --git a/bot3/input/input.gyp b/bot3/input/input.gyp
index 5beb3d0..b428dc2 100644
--- a/bot3/input/input.gyp
+++ b/bot3/input/input.gyp
@@ -10,6 +10,7 @@
'<(AOS)/atom_code/input/input.gyp:joystick_input',
'<(AOS)/atom_code/atom_code.gyp:init',
'<(AOS)/build/aos.gyp:logging',
+
'<(DEPTH)/bot3/control_loops/drivetrain/drivetrain.gyp:drivetrain_loop',
'<(DEPTH)/frc971/queues/queues.gyp:queues',
'<(DEPTH)/bot3/autonomous/autonomous.gyp:auto_queue',
@@ -25,40 +26,28 @@
'<(DEPTH)/bot3/control_loops/drivetrain/drivetrain.gyp:drivetrain_loop',
'<(DEPTH)/frc971/queues/queues.gyp:queues',
'<(AOS)/atom_code/atom_code.gyp:init',
- '<(DEPTH)/gyro_board/src/libusb-driver/libusb-driver.gyp:libusb_wrap',
- '<(EXTERNALS):libusb',
'<(AOS)/build/aos.gyp:logging',
- '<(AOS)/common/common.gyp:time',
- '<(AOS)/common/sensors/sensors.gyp:sensor_receiver',
+ '<(AOS)/common/util/util.gyp:wrapping_counter',
+ 'usb_receiver',
],
},
{
- 'target_name': 'gyro_board_reader',
- 'type': 'executable',
+ 'target_name': 'usb_receiver',
+ 'type': 'static_library',
'sources': [
- 'gyro_board_reader.cc',
+ '<(DEPTH)/frc971/input/usb_receiver.cc',
],
'dependencies': [
- '<(DEPTH)/bot3/control_loops/drivetrain/drivetrain.gyp:drivetrain_loop',
- '<(DEPTH)/frc971/queues/queues.gyp:queues',
- '<(AOS)/atom_code/atom_code.gyp:init',
'<(DEPTH)/gyro_board/src/libusb-driver/libusb-driver.gyp:libusb_wrap',
- '<(EXTERNALS):libusb',
'<(AOS)/build/aos.gyp:logging',
+ '<(AOS)/common/util/util.gyp:wrapping_counter',
'<(AOS)/common/common.gyp:time',
- '<(AOS)/common/common.gyp:timing',
+ '<(AOS)/common/common.gyp:controls',
],
- },
- {
- 'target_name': 'gyro_reader',
- 'type': 'executable',
- 'sources': [
- 'gyro_reader.cc',
- ],
- 'dependencies': [
- '<(DEPTH)/frc971/queues/queues.gyp:queues',
- '<(AOS)/atom_code/atom_code.gyp:init',
- '<(AOS)/build/aos.gyp:logging',
+ 'export_dependent_settings': [
+ '<(DEPTH)/gyro_board/src/libusb-driver/libusb-driver.gyp:libusb_wrap',
+ '<(AOS)/common/util/util.gyp:wrapping_counter',
+ '<(AOS)/common/common.gyp:time',
],
},
],