Minor changes to the configuration variables and imported modules.

parent 60fd3714
...@@ -2,6 +2,7 @@ EV3WebController project news ...@@ -2,6 +2,7 @@ EV3WebController project news
0.3 (2015-10-31) 0.3 (2015-10-31)
* detect if we are running on the EV3 as root; * detect if we are running on the EV3 as root;
* improved documentation for the installation.
0.2 (2015-10-29) 0.2 (2015-10-29)
* Beta release. It is possible to control the robot in four directions; * Beta release. It is possible to control the robot in four directions;
......
...@@ -20,10 +20,10 @@ import os, sys ...@@ -20,10 +20,10 @@ import os, sys
BASE_DIR = os.path.abspath(os.path.dirname(__file__)) BASE_DIR = os.path.abspath(os.path.dirname(__file__))
PATH = os.path.abspath(".") PATH = os.path.abspath(".")
DEFAULTS = {"platform_url": "http://0.0.0.0:5000", DEFAULTS = {"robot_external_address": "http://0.0.0.0:5000",
"host": "0.0.0.0", "host": "0.0.0.0",
"port": "5000", "port": "5000",
"https": "true", "https": "false",
"debug": "true" "debug": "true"
} }
...@@ -35,7 +35,7 @@ except: ...@@ -35,7 +35,7 @@ except:
config = confparser.SafeConfigParser(defaults=DEFAULTS) config = confparser.SafeConfigParser(defaults=DEFAULTS)
config.read(os.path.join(BASE_DIR, "conf/conf.cfg")) config.read(os.path.join(BASE_DIR, "conf/conf.cfg"))
PLATFORM_URL = config.get('misc', 'platform_url') ROBOT_EXTERNAL_ADDRESS = config.get('misc', 'robot_external_address')
WEBSERVER_DEBUG = config.getboolean('webserver', 'debug') WEBSERVER_DEBUG = config.getboolean('webserver', 'debug')
WEBSERVER_HOST = config.get('webserver', 'host') WEBSERVER_HOST = config.get('webserver', 'host')
......
[misc] [misc]
platform_url = http://0.0.0.0:5000 robot_external_address = http://0.0.0.0:5000
[webserver] [webserver]
debug = 1 debug = 1
host = 0.0.0.0 host = 0.0.0.0
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
import os import os
from flask import Flask from flask import Flask
from ev3.ev3dev import Key, Motor from ev3.ev3dev import Motor
from ev3.lego import LargeMotor #from ev3.lego import LargeMotor
from ev3.lego import TouchSensor from ev3.lego import TouchSensor
from ev3.lego import InfraredSensor from ev3.lego import InfraredSensor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment