From 7249bc357cf48e01396eda3e6cc7384858d1246d Mon Sep 17 00:00:00 2001 From: Lucas Federico Torroba Hennigen Date: Thu, 22 Mar 2018 15:11:46 +0000 Subject: [PATCH 1/2] add configuration file --- .gitignore | 1 + planning/Config.example.py | 2 ++ planning/Controller.py | 21 +++++++++++---------- planning/Tracker.py | 8 +++++--- 4 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 planning/Config.example.py diff --git a/.gitignore b/.gitignore index 722d5e7..dfd4696 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .vscode +planning/Config.py diff --git a/planning/Config.example.py b/planning/Config.example.py new file mode 100644 index 0000000..50b7eaf --- /dev/null +++ b/planning/Config.example.py @@ -0,0 +1,2 @@ +class Config: + BASE_URL = diff --git a/planning/Controller.py b/planning/Controller.py index 975e71e..5ae54ca 100644 --- a/planning/Controller.py +++ b/planning/Controller.py @@ -5,10 +5,11 @@ import json import math from math import sqrt +from Config import Config -base = 'http://18.219.63.23/edge' - -post = 'http://18.219.63.23/post' +conf = Config +base = conf.BASE_URL + '/edge' +post = conf.BASE_URL + '/post' class Controller: @@ -34,18 +35,18 @@ def run(self): def deliver(self, delivery): id = delivery['id'] data = {'state': 'IN_PROGRESS'} - r = requests.patch("http://18.219.63.23/development/delivery/" + str(id), json=data) + r = requests.patch(conf.BASE_URL + "/development/delivery/" + str(id), json=data) self.toTarget(delivery['from']['name'].lower()) data = {'state': 'AWAITING_PICKUP'} - r = requests.patch("http://18.219.63.23/development/delivery/" + str(id), json=data) + r = requests.patch(conf.BASE_URL + "/development/delivery/" + str(id), json=data) data = {'state': 'IN_PROGRESS'} - r = requests.patch("http://18.219.63.23/development/delivery/" + str(id), json=data) + r = requests.patch(conf.BASE_URL + "/development/delivery/" + str(id), json=data) self.toTarget(delivery['to']['name'].lower()) data = {'state': 'COMPLETED'} - r = requests.patch("http://18.219.63.23/development/delivery/" + str(id), json=data) + r = requests.patch(conf.BASE_URL + "/development/delivery/" + str(id), json=data) - r = requests.delete('http://18.219.63.23/development/delivery/' + str(id)) + r = requests.delete(conf.BASE_URL + '/development/delivery/' + str(id)) def toTarget(self, name): @@ -125,7 +126,7 @@ def drawPath(self,frame): return frame def getDelivery(self): - url = "http://18.219.63.23/development/deliveries" + url = conf.BASE_URL + "/development/deliveries" r = requests.get(url) queue = json.loads(r.text) return queue[0] @@ -136,7 +137,7 @@ def sendInstructions(self): self.plan = self.toTarget(fro) #self.plan = self.planner.plan('YELLOW') instructions = self.pointConversion(self.plan) - url = "http://ec2-18-219-63-23.us-east-2.compute.amazonaws.com/edge/instructions" + url = conf.BASE_URL + "/edge/instructions" r = requests.post(url, json = instructions) print(r.text) diff --git a/planning/Tracker.py b/planning/Tracker.py index 017f6a2..5cef5fe 100644 --- a/planning/Tracker.py +++ b/planning/Tracker.py @@ -2,7 +2,9 @@ import numpy as np import requests import math +from Config import Config +conf = Config class Tracker: def __init__(self, rd): self.robotDetector = rd @@ -85,17 +87,17 @@ def checkOrientation(self,frame): def go(self,correction): print("correction",correction) - post = 'http://18.219.63.23/flaskapp/post?onOff=1&turnAngle=0.0&correction='+str(correction) + post = conf.BASE_URL + '/flaskapp/post?onOff=1&turnAngle=0.0&correction='+str(correction) r = requests.get(post) #print("go",r.text) def stop(self): - post = 'http://18.219.63.23/flaskapp/post?onOff=0&turnAngle=0.0&correction=0' + post = conf.BASE_URL + '/flaskapp/post?onOff=0&turnAngle=0.0&correction=0' r = requests.get(post) #print("stop",r.text) def turn(self, d): - post = 'http://18.219.63.23/flaskapp/post?onOff=1&turnAngle='+str(d)+'&correction=0' + post = conf.BASE_URL + '/flaskapp/post?onOff=1&turnAngle='+str(d)+'&correction=0' r = requests.get(post) #print("turn",r.text) From e33daa730f4868bf3a00e9d7f733ba0703c96ff5 Mon Sep 17 00:00:00 2001 From: Lucas Federico Torroba Hennigen Date: Thu, 22 Mar 2018 16:08:23 +0000 Subject: [PATCH 2/2] fix the default BASE_URL This now points to our server --- planning/Config.example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planning/Config.example.py b/planning/Config.example.py index 50b7eaf..6d02e75 100644 --- a/planning/Config.example.py +++ b/planning/Config.example.py @@ -1,2 +1,2 @@ class Config: - BASE_URL = + BASE_URL = "http://18.219.63.23"