license stuffHEADmaster

3 files changed, 44 insertions, 3 deletions

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..97b294a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,29 @@
+Oculus Rift viewer for AR Drone camera input
+Copyright (C) 2015 Florian Jung
+All rights reserved. Licensed under the 3-clause-BSD-license as follows:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/README b/README
index 6cb1aac..e05f38b 100644
--- a/README
+++ b/README
@@ -6,3 +6,15 @@ OR python server.py (have a ar drone connected)
 
 ./client2 [--no-oculus]
 
+
+
+
+Design is as follows:
+
+	server.py connects to your Parrot AR.Drone 2.0, and lets you control
+	it with your gamepad.
+	client2 connects to that server.py and does the graphic stuff.
+
+	This has the advantage that your client can crash and you don't lose
+	control of the copter
+
diff --git a/regulator_test.cpp b/regulator_test.cpp
index 5dfe78b..e878c78 100644
--- a/regulator_test.cpp
+++ b/regulator_test.cpp
@@ -42,8 +42,8 @@ float fixup_range(float a, float low, float upp)
 int main()
 {
 	Mat visu;
-	namedWindow("ficken");
-	setMouseCallback("ficken", onMouse);
+	namedWindow("dingens");
+	setMouseCallback("dingens", onMouse);
 	int time_msec=0;
 	float winkel_ist=0;
 	Regulator regulator(1.0,0.0,1,0.0);
@@ -67,7 +67,7 @@ int main()
 		
 		draw_angle(visu, winkel_ist, Scalar(0,0,255));
 		
-		imshow("ficken", visu);
+		imshow("dingens", visu);
 
 		time_msec+=10;
 	}