Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
EV3WebController
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Science Festival 2015
EV3WebController
Commits
72910284
Unverified
Commit
72910284
authored
Oct 31, 2015
by
Cédric Bonhomme
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor changes to the configuration variables and imported modules.
parent
60fd3714
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
CHANGELOG.md
CHANGELOG.md
+1
-0
conf.py
conf.py
+3
-3
conf/conf.cfg-sample
conf/conf.cfg-sample
+1
-1
web/__init__.py
web/__init__.py
+2
-2
No files found.
CHANGELOG.md
View file @
72910284
...
...
@@ -2,6 +2,7 @@ EV3WebController project news
0.
3 (2015-10-31)
*
detect if we are running on the EV3 as root;
*
improved documentation for the installation.
0.
2 (2015-10-29)
*
Beta release. It is possible to control the robot in four directions;
...
...
conf.py
View file @
72910284
...
...
@@ -20,10 +20,10 @@ import os, sys
BASE_DIR
=
os
.
path
.
abspath
(
os
.
path
.
dirname
(
__file__
))
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"
,
"port"
:
"5000"
,
"https"
:
"
tru
e"
,
"https"
:
"
fals
e"
,
"debug"
:
"true"
}
...
...
@@ -35,7 +35,7 @@ except:
config
=
confparser
.
SafeConfigParser
(
defaults
=
DEFAULTS
)
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_HOST
=
config
.
get
(
'webserver'
,
'host'
)
...
...
conf/conf.cfg-sample
View file @
72910284
[misc]
platform_url
= http://0.0.0.0:5000
robot_external_address
= http://0.0.0.0:5000
[webserver]
debug = 1
host = 0.0.0.0
...
...
web/__init__.py
View file @
72910284
...
...
@@ -13,8 +13,8 @@
import
os
from
flask
import
Flask
from
ev3.ev3dev
import
Key
,
Motor
from
ev3.lego
import
LargeMotor
from
ev3.ev3dev
import
Motor
#
from ev3.lego import LargeMotor
from
ev3.lego
import
TouchSensor
from
ev3.lego
import
InfraredSensor
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment