diff --git a/esp8266/Makefile b/esp8266/Makefile index 87f3d049e6..20bfdb4aa3 100644 --- a/esp8266/Makefile +++ b/esp8266/Makefile @@ -59,6 +59,7 @@ SRC_C = \ modpybrtc.c \ modpybadc.c \ modesp.c \ + modnetwork.c \ modutime.c \ moduos.c \ utils.c \ diff --git a/esp8266/modnetwork.c b/esp8266/modnetwork.c new file mode 100644 index 0000000000..e57b8900a4 --- /dev/null +++ b/esp8266/modnetwork.c @@ -0,0 +1,59 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paul Sokolovsky + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include +#include +#include +#include + +#include "py/nlr.h" +#include "py/objlist.h" +#include "py/runtime.h" +#include "modnetwork.h" + +extern const mp_obj_module_t network_module; + +STATIC mp_obj_t get_module() { + return (mp_obj_t)&network_module; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_module_obj, get_module); + +STATIC const mp_map_elem_t mp_module_network_globals_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_network) }, + // MicroPython "network" module interface requires it to contains classes + // to instantiate. But as we have just a static network interace, + // use module as a "class", and just make all methods module-global + // functions. + { MP_OBJ_NEW_QSTR(MP_QSTR_WLAN), (mp_obj_t)&get_module_obj }, +}; + +STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals_table); + +const mp_obj_module_t network_module = { + .base = { &mp_type_module }, + .name = MP_QSTR_network, + .globals = (mp_obj_dict_t*)&mp_module_network_globals, +}; diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h index 9460eae609..6635d260cb 100644 --- a/esp8266/mpconfigport.h +++ b/esp8266/mpconfigport.h @@ -65,12 +65,14 @@ extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj; // extra built in modules to add to the list of known ones extern const struct _mp_obj_module_t pyb_module; extern const struct _mp_obj_module_t esp_module; +extern const struct _mp_obj_module_t network_module; extern const struct _mp_obj_module_t utime_module; extern const struct _mp_obj_module_t uos_module; #define MICROPY_PORT_BUILTIN_MODULES \ { MP_OBJ_NEW_QSTR(MP_QSTR_pyb), (mp_obj_t)&pyb_module }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_esp), (mp_obj_t)&esp_module }, \ + { MP_OBJ_NEW_QSTR(MP_QSTR_network), (mp_obj_t)&network_module }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&utime_module }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&uos_module }, \ diff --git a/esp8266/qstrdefsport.h b/esp8266/qstrdefsport.h index de7cb3ad7f..0bc61246da 100644 --- a/esp8266/qstrdefsport.h +++ b/esp8266/qstrdefsport.h @@ -98,6 +98,10 @@ Q(SLEEP_NONE) Q(SLEEP_LIGHT) Q(SLEEP_MODEM) +// network module +Q(network) +Q(WLAN) + // Pin class Q(Pin) Q(init)