From ef43aac13ff6a4adc13e17aff968d09e75dde392 Mon Sep 17 00:00:00 2001
From: Tommy Persson <tompe17@gmail.com>
Date: Wed, 30 Jul 2014 14:28:21 +0200
Subject: [PATCH] Changes for limits in lqsimple.py
---
src/limits_outdoors.py | 13 ++++++++++++
src/lqsimple.py | 46 +++++++++++++++++++++---------------------
2 files changed, 36 insertions(+), 23 deletions(-)
create mode 100644 src/limits_outdoors.py
diff --git a/src/limits_outdoors.py b/src/limits_outdoors.py
new file mode 100644
index 0000000..00bd320
--- /dev/null
+++ b/src/limits_outdoors.py
@@ -0,0 +1,13 @@
+max_altitude = 140.5
+min_altitude = 0.1
+
+max_speed = 0.1
+
+max_forward = 20.0
+min_forward = -20.0
+
+max_right = 20.0
+min_right = -20.0
+
+max_up = 5.0
+min_up = -5.0
diff --git a/src/lqsimple.py b/src/lqsimple.py
index 77bff48..6841d6e 100755
--- a/src/lqsimple.py
+++ b/src/lqsimple.py
@@ -36,29 +36,6 @@ min_right = -20.0
max_up = 5.0
min_up = -5.0
-#
-#
-#
-if os.path.isfile ("limits.py"):
- print "READ FILE: limits.py"
- import limits
- max_altitude = limits.max_altitude
- min_altitude = limits.min_altitude
- max_speed = limits.max_speed
- max_forward = limits.max_forward
- min_forward = limits.min_forward
- max_right = limits.max_right
- min_right = limits.min_right
- max_up = limits.max_up
- min_up = limits.min_up
-
-print "----- LIMITS ------"
-print "Altitude limits: <{0},{1}> ".format(min_altitude,max_altitude)
-print "Max speed: ", max_speed
-print "Forward limits: <{0},{1}> ".format(min_forward,max_forward)
-print "Right limits: <{0},{1}> ".format(min_right,max_right)
-print "Up limits: <{0},{1}> ".format(min_up,max_up)
-print "-------------------"
def fly_straight_line (east_m, north_m, relalt, speed, yaw_flag):
@@ -592,6 +569,29 @@ if __name__ == "__main__":
qc = QCon(ns, 10000)
sim = QSim(ns)
+ if options.limits:
+ print "IMPORTING: limits.py"
+ import limits
+ max_altitude = limits.max_altitude
+ min_altitude = limits.min_altitude
+ max_speed = limits.max_speed
+ max_forward = limits.max_forward
+ min_forward = limits.min_forward
+ max_right = limits.max_right
+ min_right = limits.min_right
+ max_up = limits.max_up
+ min_up = limits.min_up
+
+ print "----- LIMITS ------"
+ print "Altitude limits: <{0},{1}> ".format(min_altitude,max_altitude)
+ print "Max speed: ", max_speed
+ print "Forward limits: <{0},{1}> ".format(min_forward,max_forward)
+ print "Right limits: <{0},{1}> ".format(min_right,max_right)
+ print "Up limits: <{0},{1}> ".format(min_up,max_up)
+ print "-------------------"
+
+
+
if options.joystick:
qc.set_ext_config_joystick()
sys.exit(0)
--
GitLab