diff --git a/drive_api.py b/drive_api.py index 6280de14..3a0bc9b8 100644 --- a/drive_api.py +++ b/drive_api.py @@ -71,10 +71,8 @@ def get(self): self.write("Finished") class DistanceSenor(tornado.web.RequestHandler): - - def get(self): - self.write(calculate_distance) + self.write(str(calculate_distance(ECHO,TRIG))) class MultipleKeysHandler(tornado.web.RequestHandler): @@ -217,7 +215,7 @@ def make_app(): return tornado.web.Application([ (r"/drive",MultipleKeysHandler),(r"/post", PostHandler), (r"/StoreLogEntries",StoreLogEntriesHandler), - ("r/distance",DistanceSenor) + (r"/distance",DistanceSenor) ]) if __name__ == "__main__": @@ -226,8 +224,8 @@ def make_app(): motor = Motor(16, 18, 22, 19, 21, 23) # Range sensor details - TRIG = 2 - ECHO = 3 + TRIG = 3 + ECHO = 5 GPIO.setup(TRIG, GPIO.OUT) GPIO.setup(ECHO, GPIO.IN)