From 25568f62c9fb160d06ac27040d82e2697603880a Mon Sep 17 00:00:00 2001 From: ninioe Date: Sun, 24 Jul 2016 10:14:29 +0300 Subject: alarm support in test generator --- tools/test-generator.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/test-generator.py b/tools/test-generator.py index cedbe9c69..b4edbfbaf 100755 --- a/tools/test-generator.py +++ b/tools/test-generator.py @@ -3,11 +3,11 @@ import sys import math import urllib -import urllib2 +import httplib import time id = '123456789012345' -server = 'http://localhost:5055' +server = 'localhost:5055' period = 1 step = 0.001 @@ -32,11 +32,12 @@ for i in range(0, len(waypoints)): lon = lon1 + (lon2 - lon1) * j / count points.append((lat, lon)) -def send(lat, lon, course, alarm): +def send(conn, lat, lon, course, alarm): params = (('id', id), ('timestamp', int(time.time())), ('lat', lat), ('lon', lon), ('bearing', course)) if alarm: params = params + (('alarm', 'sos'),) - urllib2.urlopen(server + '?' + urllib.urlencode(params)).read() + conn.request('GET', '?' + urllib.urlencode(params)) + conn.getresponse() def course(lat1, lon1, lat2, lon2): lat1 = lat1 * math.pi / 180 @@ -49,10 +50,12 @@ def course(lat1, lon1, lat2, lon2): index = 0 +conn = httplib.HTTPConnection(server) + while True: (lat1, lon1) = points[index % len(points)] (lat2, lon2) = points[(index + 1) % len(points)] alarm = ((index % 10) == 0) - send(lat1, lon1, course(lat1, lon1, lat2, lon2), alarm) + send(conn, lat1, lon1, course(lat1, lon1, lat2, lon2), alarm) time.sleep(period) - index += 1 + index += 1 \ No newline at end of file -- cgit v1.2.3