aboutsummaryrefslogtreecommitdiff
path: root/cc3200/mods/modnetwork.c
diff options
context:
space:
mode:
authorDaniel Campora2015-05-09 17:46:16 +0200
committerDaniel Campora2015-05-17 12:34:49 +0200
commit8e611e841476d98eb829978a7e73ce92ff822ca8 (patch)
tree7881c41feb3a5c5ecd98b1a65da5c0bc56d3382f /cc3200/mods/modnetwork.c
parent9466e154b4806ace535d4493d1dd6e63379c2f68 (diff)
cc3200: Add Timer module. Supports free running, PWM and capture modes.
Diffstat (limited to 'cc3200/mods/modnetwork.c')
-rw-r--r--cc3200/mods/modnetwork.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cc3200/mods/modnetwork.c b/cc3200/mods/modnetwork.c
index f9536ccb5..f7dfd139f 100644
--- a/cc3200/mods/modnetwork.c
+++ b/cc3200/mods/modnetwork.c
@@ -80,10 +80,10 @@ STATIC mp_obj_t network_server_stop(void) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(network_server_stop_obj, network_server_stop);
-STATIC mp_obj_t network_server_enabled(void) {
+STATIC mp_obj_t network_server_running(void) {
return MP_BOOL(servers_are_enabled());
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(network_server_enabled_obj, network_server_enabled);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(network_server_running_obj, network_server_running);
STATIC mp_obj_t network_server_login(mp_obj_t user, mp_obj_t pass) {
const char *_user = mp_obj_str_get_str(user);
@@ -102,7 +102,7 @@ STATIC const mp_map_elem_t mp_module_network_globals_table[] = {
#if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
{ MP_OBJ_NEW_QSTR(MP_QSTR_start_server), (mp_obj_t)&network_server_start_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_stop_server), (mp_obj_t)&network_server_stop_obj },
- { MP_OBJ_NEW_QSTR(MP_QSTR_server_enabled), (mp_obj_t)&network_server_enabled_obj },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_server_running), (mp_obj_t)&network_server_running_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_server_login), (mp_obj_t)&network_server_login_obj },
#endif
};