updated lots of things to bring them closer to be up to standards
diff --git a/frc971/queues/queues.gyp b/frc971/queues/queues.gyp
index 6accfd8..eac58b7 100644
--- a/frc971/queues/queues.gyp
+++ b/frc971/queues/queues.gyp
@@ -20,6 +20,9 @@
'<(AOS)/common/common.gyp:queues',
'<(AOS)/build/aos.gyp:libaos',
],
+ 'export_dependent_settings': [
+ '<(AOS)/common/common.gyp:queues',
+ ],
'includes': ['../../aos/build/queues.gypi'],
},
{
diff --git a/vision/BinaryServer.cpp b/vision/BinaryServer.cpp
index 094b719..c3c0b5e 100644
--- a/vision/BinaryServer.cpp
+++ b/vision/BinaryServer.cpp
@@ -1,4 +1,5 @@
#include "vision/BinaryServer.h"
+
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
@@ -9,20 +10,15 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
-#include "aos/externals/libjpeg/include/jpeglib.h"
+#include "aos/externals/libjpeg/include/jpeglib.h"
#include "aos/atom_code/camera/Buffers.h"
#include "aos/common/time.h"
#include "opencv2/opencv.hpp"
-
-
-
namespace frc971 {
namespace vision {
-
-
static void echo_read_cb(struct bufferevent *bev, void * /*ctx*/){
struct evbuffer *input = bufferevent_get_input(bev);
struct evbuffer *output = bufferevent_get_output(bev);
diff --git a/vision/BinaryServer.h b/vision/BinaryServer.h
index 76fbd9e..f33ee21 100644
--- a/vision/BinaryServer.h
+++ b/vision/BinaryServer.h
@@ -1,14 +1,17 @@
#ifndef FRC971_VISION_BINARY_SERVER_H_
#define FRC971_VISION_BINARY_SERVER_H_
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
#include "event2/buffer.h"
#include "event2/event.h"
#include "event2/listener.h"
#include "event2/bufferevent.h"
+
#include "aos/common/mutex.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include "PacketNotifier.h"
+#include "vision/PacketNotifier.h"
namespace frc971 {
namespace vision {
diff --git a/vision/CameraProcessor.cpp b/vision/CameraProcessor.cpp
index 41e6a2d..f870385 100644
--- a/vision/CameraProcessor.cpp
+++ b/vision/CameraProcessor.cpp
@@ -1,5 +1,4 @@
-
-#include "CameraProcessor.h"
+#include "vision/CameraProcessor.h"
// create a new target
Target::Target(std::vector<cv::Point> new_contour,
diff --git a/vision/CameraProcessor.h b/vision/CameraProcessor.h
index c485bda..a0ff7aa 100644
--- a/vision/CameraProcessor.h
+++ b/vision/CameraProcessor.h
@@ -1,10 +1,10 @@
-
-#ifndef _CAMERA_PROCESSOR_H_
-#define _CAMERA_PROCESSOR_H_
+#ifndef VISION_CAMERA_PROCESSOR_H_
+#define VISION_CAMERA_PROCESSOR_H_
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
+
#include <utility>
#include <vector>
@@ -63,12 +63,12 @@
cv::MemStorage g_storage; // opencv storage
static const int HIST_SIZE = 20; // dimension of histogram
// ie number of scan lines
- static constexpr double HIST_SIZE_F = 1.0/20.0; // step size
+ static const double HIST_SIZE_F = 1.0/20.0; // step size
// should be 1/HIST_SIZE
double vert_hist[HIST_SIZE]; // desired vertical histogram
double horz_hist[HIST_SIZE]; // desired horizontal histogram
// defines the minimum dist for a match
- static constexpr double HIST_MATCH = 1.76;
+ static const double HIST_MATCH = 1.76;
double calcHistComponent(
cv::Point2i start,
cv::Point2i end,
@@ -85,5 +85,4 @@
std::vector<Target> target_list; // list of found targets
};
-#endif //_CAMERA_PROCESSOR_H_
-
+#endif // VISION_CAMERA_PROCESSOR_H_
diff --git a/vision/GoalMaster.cpp b/vision/GoalMaster.cpp
index 9557072..f12814f 100644
--- a/vision/GoalMaster.cpp
+++ b/vision/GoalMaster.cpp
@@ -1,9 +1,11 @@
-#include "aos/aos_core.h"
#include "math.h"
+#include "aos/common/time.h"
+#include "aos/atom_code/init.h"
+
#include "frc971/queues/GyroAngle.q.h"
#include "frc971/queues/CameraTarget.q.h"
-#include "aos/common/time.h"
+
#include "vision/RingBuffer.h"
using frc971::vision::RingBuffer;
diff --git a/vision/JPEGRoutines.cpp b/vision/JPEGRoutines.cpp
index 749e6b0..54e4042 100644
--- a/vision/JPEGRoutines.cpp
+++ b/vision/JPEGRoutines.cpp
@@ -1,4 +1,5 @@
-#include "vision/OpenCVWorkTask.h"
+#include "vision/JPEGRoutines.h"
+
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
@@ -8,15 +9,12 @@
#include "aos/common/time.h"
#include "opencv2/opencv.hpp"
-#include "vision/JPEGRoutines.h"
-
-
+#include "vision/OpenCVWorkTask.h"
namespace frc971 {
namespace vision {
-
/* This is also adapted from libjpeg to be used on decompression tables rather than
* compression tables as it was origionally intended
*/
diff --git a/vision/JPEGRoutines.h b/vision/JPEGRoutines.h
index 5a1dc14..17f1a68 100644
--- a/vision/JPEGRoutines.h
+++ b/vision/JPEGRoutines.h
@@ -1,8 +1,8 @@
+// for jpeglib.h
+#include <stdio.h>
#include "aos/externals/libjpeg/include/jpeglib.h"
-
-
namespace frc971 {
namespace vision {
diff --git a/vision/OpenCVWorkTask.cpp b/vision/OpenCVWorkTask.cpp
index 89f168d..5c420d3 100644
--- a/vision/OpenCVWorkTask.cpp
+++ b/vision/OpenCVWorkTask.cpp
@@ -13,6 +13,7 @@
#include "aos/common/time.h"
#include "aos/atom_code/camera/Buffers.h"
#include "aos/externals/libjpeg/include/jpeglib.h"
+#include "aos/atom_code/init.h"
#include "vision/OpenCVWorkTask.h"
#include "vision/CameraProcessor.h"
diff --git a/vision/OpenCVWorkTask.h b/vision/OpenCVWorkTask.h
index 3531b68..78bda5d 100644
--- a/vision/OpenCVWorkTask.h
+++ b/vision/OpenCVWorkTask.h
@@ -1,13 +1,15 @@
-#ifndef FRC971_VISION_OPENCV_WORK_TASK_H_
-#define FRC971_VISION_OPENCV_WORK_TASK_H_
+#ifndef VISION_OPENCV_WORK_TASK_H_
+#define VISION_OPENCV_WORK_TASK_H_
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
#include "event2/buffer.h"
#include "event2/event.h"
#include "event2/listener.h"
#include "event2/bufferevent.h"
-#include "aos/common/mutex.h"
-#include <sys/types.h>
-#include <sys/socket.h>
+#include "aos/common/mutex.h"
namespace frc971 {
namespace vision {
@@ -15,4 +17,4 @@
} // namespace vision
} // namespace frc971
-#endif // FRC971_VISION_OPENCV_WORK_TASK_H_
+#endif // VISION_OPENCV_WORK_TASK_H_
diff --git a/vision/PacketNotifier.cpp b/vision/PacketNotifier.cpp
index ca62f5f..f74be7f 100644
--- a/vision/PacketNotifier.cpp
+++ b/vision/PacketNotifier.cpp
@@ -1,4 +1,5 @@
#include "vision/PacketNotifier.h"
+
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/vision/RingBuffer.h b/vision/RingBuffer.h
index 3041828..f333f29 100644
--- a/vision/RingBuffer.h
+++ b/vision/RingBuffer.h
@@ -1,9 +1,11 @@
-#ifndef _FRC971_VISION_RINGBUFFER_H_
-#define _FRC971_VISION_RINGBUFFER_H_
+#ifndef VISION_RINGBUFFER_H_
+#define VISION_RINGBUFFER_H_
+
#include <stdio.h>
#include <stdlib.h>
-namespace frc971{
-namespace vision{
+
+namespace frc971 {
+namespace vision {
template<class T,class V>
class RingBuffer{
@@ -57,9 +59,9 @@
}
}
return value_at(min) + (value_at(max) - value_at(min)) *
- ((time - time_at(min)).FloatingPointSec()/(time_at(max) - time_at(min)).FloatingPointSec());
+ ((time - time_at(min)).ToSeconds()/(time_at(max) - time_at(min)).ToSeconds());
}
};
}; // vision
}; // frc971
-#endif // _FRC971_VISION_RINGBUFFER_H_
+#endif // VISION_RINGBUFFER_H_
diff --git a/vision/vision.gyp b/vision/vision.gyp
index 87c0ce1..c9ecc36 100644
--- a/vision/vision.gyp
+++ b/vision/vision.gyp
@@ -12,9 +12,11 @@
],
'dependencies': [
'<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/common/common.gyp:time',
'<(EXTERNALS):libevent',
'<(EXTERNALS):libjpeg',
'<(EXTERNALS):opencv',
+ '<(AOS)/atom_code/camera/camera.gyp:buffers',
'<(DEPTH)/frc971/queues/queues.gyp:queues',
],
},
@@ -26,6 +28,7 @@
],
'dependencies': [
'<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/common/common.gyp:time',
'<(DEPTH)/frc971/queues/queues.gyp:queues',
],
},