Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
add930c4
Commit
add930c4
authored
Feb 22, 2016
by
danicampora
Browse files
cc3200: Rename 'server' class to 'Server' for consistency.
parent
12547ce7
Changes
5
Hide whitespace changes
Inline
Side-by-side
cc3200/mods/modnetwork.c
View file @
add930c4
...
...
@@ -153,7 +153,7 @@ STATIC const mp_map_elem_t mp_module_network_globals_table[] = {
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_WLAN
),
(
mp_obj_t
)
&
mod_network_nic_type_wlan
},
#if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_
s
erver
),
(
mp_obj_t
)
&
network_server_type
},
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_
S
erver
),
(
mp_obj_t
)
&
network_server_type
},
#endif
};
...
...
@@ -177,7 +177,7 @@ STATIC MP_DEFINE_CONST_DICT(network_server_locals_dict, network_server_locals_di
STATIC
const
mp_obj_type_t
network_server_type
=
{
{
&
mp_type_type
},
.
name
=
MP_QSTR_
s
erver
,
.
name
=
MP_QSTR_
S
erver
,
.
make_new
=
network_server_make_new
,
.
locals_dict
=
(
mp_obj_t
)
&
network_server_locals_dict
,
};
...
...
cc3200/qstrdefsport.h
View file @
add930c4
...
...
@@ -279,7 +279,7 @@ Q(CERT_REQUIRED)
// for network class
Q
(
network
)
Q
(
s
erver
)
Q
(
S
erver
)
Q
(
init
)
Q
(
deinit
)
Q
(
login
)
...
...
docs/library/network.rst
View file @
add930c4
...
...
@@ -30,27 +30,27 @@ For example::
.. only:: port_wipy
.. _network.
s
erver:
.. _network.
S
erver:
class
s
erver
class
S
erver
============
The
s
erver class controls the behaviour and the configuration of the FTP and telnet
The
``S
erver
``
class controls the behaviour and the configuration of the FTP and telnet
services running on the WiPy. Any changes performed using this class' methods will
affect both.
Example::
import network
s = network.
s
erver()
s.deinit() # disable the server
s
erver
= network.
S
erver()
s
erver
.deinit() # disable the server
# enable the server again with new settings
s.init(login=('user', 'password'), timeout=600)
s
erver
.init(login=('user', 'password'), timeout=600)
Constructors
------------
.. class:: network.
s
erver(id, ...)
.. class:: network.
S
erver(id, ...)
Create a server instance, see ``init`` for parameters of initialization.
...
...
docs/wipy/quickref.rst
View file @
add930c4
...
...
@@ -201,12 +201,12 @@ See :ref:`network.WLAN <network.WLAN>` and :mod:`machine`. ::
Telnet and FTP server
---------------------
See :ref:`network.
s
erver <network.
s
erver>` ::
See :ref:`network.
S
erver <network.
S
erver>` ::
from network import
s
erver
from network import
S
erver
# init with new user, password and seconds timeout
server =
s
erver
.init
(login=('user', 'password'), timeout=60)
server =
S
erver(login=('user', 'password'), timeout=60)
server.timeout(300) # change the timeout
server.timeout() # get the timeout
server.isrunning() # check wether the server is running or not
...
...
tests/wipy/wlan/server.py
View file @
add930c4
...
...
@@ -9,7 +9,7 @@ mch = os.uname().machine
if
not
'LaunchPad'
in
mch
and
not
'WiPy'
in
mch
:
raise
Exception
(
'Board not supported!'
)
server
=
network
.
s
erver
()
server
=
network
.
S
erver
()
print
(
server
.
timeout
()
==
300
)
print
(
server
.
isrunning
()
==
True
)
...
...
Write
Preview
Supports
Markdown
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