From 5680aa99001cb50c707c4187cd8ada0c41a573dd Mon Sep 17 00:00:00 2001
From: Tobias Frust <tobiasfrust@gmail.com>
Date: Thu, 30 Jun 2016 10:13:01 +0200
Subject: implemented virtual DetectorModule with simple send via udp

---
 src/Detector/Detector.cpp | 12 ++++++++++++
 src/Detector/Detector.h   | 15 +++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 src/Detector/Detector.cpp
 create mode 100644 src/Detector/Detector.h

(limited to 'src/Detector')

diff --git a/src/Detector/Detector.cpp b/src/Detector/Detector.cpp
new file mode 100644
index 0000000..bc6c0da
--- /dev/null
+++ b/src/Detector/Detector.cpp
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2016 Tobias Frust
+ *
+ * Detector.cpp
+ *
+ *  Created on: 30.06.2016
+ *      Author: Tobias Frust
+ */
+
+
+
+
diff --git a/src/Detector/Detector.h b/src/Detector/Detector.h
new file mode 100644
index 0000000..17acb8d
--- /dev/null
+++ b/src/Detector/Detector.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2016 Tobias Frust
+ *
+ * Detector.h
+ *
+ *  Created on: 30.06.2016
+ *      Author: Tobias Frust
+ */
+
+#ifndef DETECTOR_H_
+#define DETECTOR_H_
+
+
+
+#endif /* DETECTOR_H_ */
-- 
cgit v1.2.3


From 0c33319451deec9b5461b57856423bc619817245 Mon Sep 17 00:00:00 2001
From: Tobias Frust <tobiasfrust@gmail.com>
Date: Thu, 30 Jun 2016 15:22:07 +0200
Subject: added classes for detector; Sending out in n different streams with n
 different ports

---
 src/Detector/Detector.cpp | 14 ++++++++++++++
 src/Detector/Detector.h   | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+)

(limited to 'src/Detector')

diff --git a/src/Detector/Detector.cpp b/src/Detector/Detector.cpp
index bc6c0da..658f485 100644
--- a/src/Detector/Detector.cpp
+++ b/src/Detector/Detector.cpp
@@ -8,5 +8,19 @@
  */
 
 
+#include "Detector.h"
 
+Detector::Detector(const std::string& address, const std::string& configPath, const unsigned int timeIntervall) :
+   timeIntervall_{timeIntervall},
+   numberOfDetectorModules_{27} {
+   modules_.reserve(numberOfDetectorModules_);
+   for(auto i = 1; i <= numberOfDetectorModules_; i++){
+      modules_.emplace_back(i, address, configPath);
+   }
+}
+
+auto Detector::run() -> void {
+   for(auto i = 0; i < numberOfDetectorModules_; i++)
+      modules_[i].sendPeriodically(timeIntervall_);
+}
 
diff --git a/src/Detector/Detector.h b/src/Detector/Detector.h
index 17acb8d..1969dbd 100644
--- a/src/Detector/Detector.h
+++ b/src/Detector/Detector.h
@@ -10,6 +10,26 @@
 #ifndef DETECTOR_H_
 #define DETECTOR_H_
 
+#include "../DetectorModule/DetectorModule.h"
 
+#include <vector>
+#include <thread>
+
+class Detector {
+public:
+   Detector(const std::string& address, const std::string& configPath, const unsigned int timeIntervall);
+
+   auto run() -> void;
+private:
+   std::vector<DetectorModule> modules_;
+
+   std::vector<std::thread> moduleThreads_;
+
+   unsigned int timeIntervall_;
+   int numberOfDetectorModules_;
+
+   auto readConfig(const std::string& configFile) -> bool;
+
+};
 
 #endif /* DETECTOR_H_ */
-- 
cgit v1.2.3


From d71e5fe7330fa51cdce466ec0df876eb9b8e721e Mon Sep 17 00:00:00 2001
From: Tobias Frust <tobiasfrust@gmail.com>
Date: Mon, 11 Jul 2016 14:58:00 +0200
Subject: UDP packets are sent out correctly

---
 src/Detector/Detector.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Detector')

diff --git a/src/Detector/Detector.cpp b/src/Detector/Detector.cpp
index 658f485..5dde6d1 100644
--- a/src/Detector/Detector.cpp
+++ b/src/Detector/Detector.cpp
@@ -14,7 +14,7 @@ Detector::Detector(const std::string& address, const std::string& configPath, co
    timeIntervall_{timeIntervall},
    numberOfDetectorModules_{27} {
    modules_.reserve(numberOfDetectorModules_);
-   for(auto i = 1; i <= numberOfDetectorModules_; i++){
+   for(auto i = 0; i < numberOfDetectorModules_; i++){
       modules_.emplace_back(i, address, configPath);
    }
 }
-- 
cgit v1.2.3