From 96ef360f2cf679f8a50998bbb780cd77ef5ab0ce Mon Sep 17 00:00:00 2001 From: lukasfriedrichsen <lukas.friedrichsen@hs-bochum.de> Date: Thu, 9 Feb 2017 12:21:28 +0100 Subject: [PATCH] tidiing up, license stuff --- Framework_OpenCV-Anwandungen_Android/LICENSE.txt | 7 +++++++ .../jni/openCVFramework.cpp | 9 +++++++++ .../jni/org_opencv_openCVFramework.h | 7 +++++++ .../src/org/opencv/openCVActivity.java | 8 +++++++- .../src/org/opencv/openCVFramework.java | 10 ++++++++++ Systemtechnik/LeonardoMixerIO/LICENSE.txt | 7 +++++++ Visual-Based-Landing-System/LICENSE.txt | 7 +++++++ .../jni/HoughCircleTransformation.cpp | 9 +++++++++ ...al_based_landing_system_HoughCircleTransformation.h | 6 ++++++ .../HoughCircleTransformation.java | 10 ++++++++++ .../visual_based_landing_system/PID_Controller.java | 9 +++++++++ .../visual_based_landing_system/USB_Service.java | 7 +++++++ .../visual_based_landing_system/VBLSActivity.java | 10 +++++++++- 13 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 Framework_OpenCV-Anwandungen_Android/LICENSE.txt create mode 100644 Systemtechnik/LeonardoMixerIO/LICENSE.txt create mode 100644 Visual-Based-Landing-System/LICENSE.txt diff --git a/Framework_OpenCV-Anwandungen_Android/LICENSE.txt b/Framework_OpenCV-Anwandungen_Android/LICENSE.txt new file mode 100644 index 0000000..8eafb34 --- /dev/null +++ b/Framework_OpenCV-Anwandungen_Android/LICENSE.txt @@ -0,0 +1,7 @@ +Framework OpenCV-Anwendungen Android +Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +License: Modified BSD-License + +Framework for OpenCV-based image-procession on Android-devices + +2017-02-10 \ No newline at end of file diff --git a/Framework_OpenCV-Anwandungen_Android/jni/openCVFramework.cpp b/Framework_OpenCV-Anwandungen_Android/jni/openCVFramework.cpp index 7190577..0945554 100755 --- a/Framework_OpenCV-Anwandungen_Android/jni/openCVFramework.cpp +++ b/Framework_OpenCV-Anwandungen_Android/jni/openCVFramework.cpp @@ -1,3 +1,12 @@ +// openCVFramework.cpp +// Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +// License: Modified BSD-License +// +// Implements the OpenCV-library and acts as the image-processing-class +// +// 2017-02-10 + + #include <jni.h> #include <math.h> diff --git a/Framework_OpenCV-Anwandungen_Android/jni/org_opencv_openCVFramework.h b/Framework_OpenCV-Anwandungen_Android/jni/org_opencv_openCVFramework.h index 2a5ccec..389893f 100755 --- a/Framework_OpenCV-Anwandungen_Android/jni/org_opencv_openCVFramework.h +++ b/Framework_OpenCV-Anwandungen_Android/jni/org_opencv_openCVFramework.h @@ -1,5 +1,12 @@ +// org_opencv_openCVFramework.h +// Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +// License: Modified BSD-License +// // This header is the interface between openCVFramework.java and openCVFramework.cpp which is used for the call through jni. // The file is generated from openCVFramework.java. +// +// 2017-02-10 + /* DO NOT EDIT THIS FILE - it is machine generated */ #include <jni.h> diff --git a/Framework_OpenCV-Anwandungen_Android/src/org/opencv/openCVActivity.java b/Framework_OpenCV-Anwandungen_Android/src/org/opencv/openCVActivity.java index 7cd7f74..b4482c8 100755 --- a/Framework_OpenCV-Anwandungen_Android/src/org/opencv/openCVActivity.java +++ b/Framework_OpenCV-Anwandungen_Android/src/org/opencv/openCVActivity.java @@ -1,4 +1,10 @@ -//Parts of the code for the USB-communication are based on the example implementation from the "UsbSerial"-project by Felipe Herranz (https://github.com/felHR85/UsbSerial) +// openCVActivity.java +// Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +// License: Modified BSD-License +// +// Main activity of the Android-application +// +// 2017-02-10 package org.opencv; diff --git a/Framework_OpenCV-Anwandungen_Android/src/org/opencv/openCVFramework.java b/Framework_OpenCV-Anwandungen_Android/src/org/opencv/openCVFramework.java index a040962..9ba3c23 100755 --- a/Framework_OpenCV-Anwandungen_Android/src/org/opencv/openCVFramework.java +++ b/Framework_OpenCV-Anwandungen_Android/src/org/opencv/openCVFramework.java @@ -1,3 +1,13 @@ +// openCVFramework.java +// Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +// License: Modified BSD-License +// +// Tool-providing class +// Acts as the inerface towards the OpenCV-classes through the JNI +// +// 2017-02-10 + + package org.opencv; import java.io.IOException; diff --git a/Systemtechnik/LeonardoMixerIO/LICENSE.txt b/Systemtechnik/LeonardoMixerIO/LICENSE.txt new file mode 100644 index 0000000..fab0530 --- /dev/null +++ b/Systemtechnik/LeonardoMixerIO/LICENSE.txt @@ -0,0 +1,7 @@ +LeonardoMixerIO +Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +License: Modified BSD-License + +Realtime RC mixer for Arduino-devices + +2017-02-10 diff --git a/Visual-Based-Landing-System/LICENSE.txt b/Visual-Based-Landing-System/LICENSE.txt new file mode 100644 index 0000000..e1abee9 --- /dev/null +++ b/Visual-Based-Landing-System/LICENSE.txt @@ -0,0 +1,7 @@ +Visual Based Landing System +Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +License: Modified BSD-License + +Optical-flow-based circle detection to combine with unmanned flight vehicles + +2017-02-10 \ No newline at end of file diff --git a/Visual-Based-Landing-System/jni/HoughCircleTransformation.cpp b/Visual-Based-Landing-System/jni/HoughCircleTransformation.cpp index a0620a2..8990566 100755 --- a/Visual-Based-Landing-System/jni/HoughCircleTransformation.cpp +++ b/Visual-Based-Landing-System/jni/HoughCircleTransformation.cpp @@ -1,3 +1,12 @@ +// HoughCircleTransformation.cpp +// Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +// License: Modified BSD-License +// +// Implements the OpenCV-library and acts as the image-processing-class +// +// 2017-02-10 + + #include <jni.h> #include <math.h> diff --git a/Visual-Based-Landing-System/jni/org_opencv_visual_based_landing_system_HoughCircleTransformation.h b/Visual-Based-Landing-System/jni/org_opencv_visual_based_landing_system_HoughCircleTransformation.h index c7f8e70..d1f6e1e 100755 --- a/Visual-Based-Landing-System/jni/org_opencv_visual_based_landing_system_HoughCircleTransformation.h +++ b/Visual-Based-Landing-System/jni/org_opencv_visual_based_landing_system_HoughCircleTransformation.h @@ -1,5 +1,11 @@ +// _Included_org_opencv_visual_based_landing_system_HoughCircleTransformation.h +// Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +// License: Modified BSD-License +// // This header is the interface between HoughCircleTransformation.java and HoughCircleTransformation.cpp which is used for the call through jni. // The file is generated from HoughCircleTransformation.java. +// +// 2017-02-10 /* DO NOT EDIT THIS FILE - it is machine generated */ #include <jni.h> diff --git a/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/HoughCircleTransformation.java b/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/HoughCircleTransformation.java index c92d6c5..04b1a39 100755 --- a/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/HoughCircleTransformation.java +++ b/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/HoughCircleTransformation.java @@ -1,3 +1,13 @@ +// HoughCircleTransformation.java +// Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +// License: Modified BSD-License +// +// Tool-providing-class +// Acts as the inerface towards the OpenCV-classes through the JNI +// +// 2017-02-10 + + package org.opencv.visual_based_landing_system; import java.io.IOException; diff --git a/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/PID_Controller.java b/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/PID_Controller.java index 66099b3..4d23d1d 100755 --- a/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/PID_Controller.java +++ b/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/PID_Controller.java @@ -1,3 +1,12 @@ +// PID_Controller.java +// Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +// License: Modified BSD-License +// +// Thread-based PID-controller +// +// 2017-02-10 + + package org.opencv.visual_based_landing_system; import java.util.concurrent.atomic.AtomicReference; diff --git a/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/USB_Service.java b/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/USB_Service.java index 4a261d2..b219e90 100755 --- a/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/USB_Service.java +++ b/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/USB_Service.java @@ -1,4 +1,11 @@ +// USB_Service.java +// Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +// License: Modified BSD-License +// +// Service to establish and keep alive the USB-connection // The following code is based on "UsbService" from the "UsbSerial"-project by Felipe Herranz (https://github.com/felHR85/UsbSerial) +// +// 2017-02-10 package org.opencv.visual_based_landing_system; diff --git a/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/VBLSActivity.java b/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/VBLSActivity.java index b51879f..a153e5b 100755 --- a/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/VBLSActivity.java +++ b/Visual-Based-Landing-System/src/org/opencv/visual_based_landing_system/VBLSActivity.java @@ -1,4 +1,12 @@ -//Parts of the code for the USB-communication are based on the example implementation from the "UsbSerial"-project by Felipe Herranz (https://github.com/felHR85/UsbSerial) +// VBLSActivity.java +// Copyright 2016, 2017 Lukas Friedrichsen, Philipp Stenkamp +// License: Modified BSD-License +// +// Main activity of the Android-application +// Parts of the code for the USB-communication are based on the example implementation from the "UsbSerial"-project by Felipe Herranz (https://github.com/felHR85/UsbSerial) +// +// 2017-02-10 + package org.opencv.visual_based_landing_system; -- GitLab