remove all the crio, bbb, and 2014 code
This also meant upgrading to clang-3.5 from llvm.org to try to get it to
build code for the roboRIO.
Change-Id: I44df4af4e9e04296ee7934cc787da3101b1ac449
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 9a63e48..693f717 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -118,25 +118,12 @@
'sources': [
'queue.cc',
],
- 'conditions': [
- ['PLATFORM=="crio"', {
- 'dependencies': [
- '<(EXTERNALS):WPILib',
- ],
- },
- {
- 'dependencies': [
- '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
- ],
- 'export_dependent_settings': [
- '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
- ],
- }]
- ],
'dependencies': [
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
'time',
],
'export_dependent_settings': [
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
'time',
],
},
@@ -253,26 +240,16 @@
{
'target_name': 'mutex',
'type': 'static_library',
- 'conditions': [
- ['PLATFORM=="crio"', {
- 'sources': [
- '<(AOS)/crio/shared_libs/mutex.cpp',
- ],
- }, {
- 'sources': [
- '<(AOS)/linux_code/ipc_lib/mutex.cpp',
- ],
- 'dependencies': [
- '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
- ],
- 'export_dependent_settings': [
- '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
- ],
- }],
+ 'sources': [
+ '<(AOS)/linux_code/ipc_lib/mutex.cpp',
],
'dependencies': [
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
'<(AOS)/build/aos.gyp:logging_interface',
],
+ 'export_dependent_settings': [
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
+ ],
},
{
'target_name': 'mutex_test',
diff --git a/aos/common/controls/output_check.q b/aos/common/controls/output_check.q
index 76f5cd7..e7c8190 100644
--- a/aos/common/controls/output_check.q
+++ b/aos/common/controls/output_check.q
@@ -7,7 +7,7 @@
double pulse_length;
};
-// Each message here represents a value that was sent to the cRIO.
+// Each message here represents a value that was sent out.
// The sent timestamp of the message is when the value was sent.
queue OutputCheck output_check_sent;
diff --git a/aos/common/debugging-tips.txt b/aos/common/debugging-tips.txt
index 718f7d9..b9a50f3 100644
--- a/aos/common/debugging-tips.txt
+++ b/aos/common/debugging-tips.txt
@@ -12,8 +12,7 @@
[Startup]
Low level startup errors often end up in
/tmp/aos_fatal_error.* under linux. Also helpful are the /tmp/starter*_std*
- files (if the standard start scripts are being used) and
- aos/crio/bin/netconsole.sh for reading cRIO stdout and stderr.
+ files (if the standard start scripts are being used).
If lots of the /tmp/starter_*std* files (with different numbers) are being
created, that means that starter_exe is dying constantly.
diff --git a/aos/common/input/input.gyp b/aos/common/input/input.gyp
index 7d5af30..5674ce7 100644
--- a/aos/common/input/input.gyp
+++ b/aos/common/input/input.gyp
@@ -7,11 +7,9 @@
'driver_station_data.cc',
],
'dependencies': [
- '<(EXTERNALS):WPILib-NetworkRobotValues',
'<(AOS)/common/messages/messages.gyp:robot_state',
],
'export_dependent_settings': [
- '<(EXTERNALS):WPILib-NetworkRobotValues',
'<(AOS)/common/messages/messages.gyp:robot_state',
],
},