jepler/MaixPy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[metwork] modify wiznet5k kconfig

Browse source
This commit is contained in:
vamoosebbf 2020-11-27 12:05:51 +08:00
parent 1f5d688be9
commit 8f123cd1fd
14 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/micropython/CMakeLists.txt
View file

@ -72,7 +72,7 @@ if(CONFIG_COMPONENT_MICROPYTHON_ENABLE)
append_srcs_dir(MPY_PORT_SRCS "port/src/standard_lib/network")
append_srcs_dir(MPY_PORT_SRCS "port/src/standard_lib/network/esp32")
append_srcs_dir(MPY_PORT_SRCS "port/src/standard_lib/network/esp8285")
if(CONFIG_MICROPY_PY_WIZNET5K)
if(CONFIG_MAIXPY_WIZNET5K_ENABLE)
append_srcs_dir(MPY_PORT_SRCS "port/src/standard_lib/network/wiznet5k")
append_srcs_dir(MPY_PORT_SRCS "port/src/standard_lib/network/wiznet5k/w5500")
append_srcs_dir(MPY_PORT_SRCS "port/src/standard_lib/network/wiznet5k/dns")

6
components/micropython/Kconfig
View file

@ -102,9 +102,9 @@ menu "Micropython configurations"
bool "Enable Https SSL"
default n
config MICROPY_PY_WIZNET5K
int "Enable WIZNET5K"
default 0
config MAIXPY_WIZNET5K_ENABLE
bool "Enable WIZNET5K"
default n
select WIZNET5K_ENABLE
endmenu

2
components/micropython/port/src/standard_lib/network/modnetwork.c
View file

@ -82,7 +82,7 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_ESP8285), MP_ROM_PTR(&mod_network_nic_type_esp8285) },
{ MP_ROM_QSTR(MP_QSTR_ESP32_SPI), MP_ROM_PTR(&mod_network_nic_type_esp32) },
#if CONFIG_MICROPY_PY_WIZNET5K
#if CONFIG_MAIXPY_WIZNET5K_ENABLE
{ MP_ROM_QSTR(MP_QSTR_WIZNET5K), MP_ROM_PTR(&mod_network_nic_type_wiznet5k) },
#endif
{ MP_ROM_QSTR(MP_QSTR_route), MP_ROM_PTR(&network_route_obj) },

8
components/micropython/port/src/standard_lib/network/wiznet5k/modnwwiznet5k.c
View file

@ -43,7 +43,7 @@
#include "timer.h"
#include "lib/netutils/netutils.h"
#if CONFIG_MICROPY_PY_WIZNET5K
#if CONFIG_MAIXPY_WIZNET5K_ENABLE
#include "dhcp/dhcp.h"
#include "dns/dns.h"
@ -532,7 +532,7 @@ STATIC mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
if (i % 16 == 0) {
printf("\n %04x:", i);
}
#if CONFIG_MICROPY_PY_WIZNET5K == 5200
#if _WIZCHIP_ == 5200
uint32_t reg = i;
#else
uint32_t reg = _W5500_IO_BASE_ | i << 8;
@ -545,7 +545,7 @@ STATIC mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
if (i % 16 == 0) {
printf("\n %04x:", i);
}
#if CONFIG_MICROPY_PY_WIZNET5K == 5200
#if _WIZCHIP_ == 5200
uint32_t reg = WIZCHIP_SREG_ADDR(sn, i);
#else
uint32_t reg = _W5500_IO_BASE_ | i << 8 | WIZCHIP_SREG_BLOCK(sn) << 3;
@ -627,4 +627,4 @@ const mod_network_nic_type_t mod_network_nic_type_wiznet5k = {
.ioctl = wiznet5k_socket_ioctl,
};
#endif // MICROPY_PY_WIZNET5K && !MICROPY_PY_LWIP
#endif // CONFIG_MAIXPY_WIZNET5K_ENABLE

2
projects/maixpy_amigo/config_defaults.mk
View file

@ -87,7 +87,7 @@ CONFIG_MICROPYTHON_ULAB_ENALBE=y
CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y
CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE=y
CONFIG_MICROPY_SSL_ENABLE=y
CONFIG_MICROPY_PY_WIZNET5K=5500
CONFIG_MAIXPY_WIZNET5K_ENABLE=y
# end of Modules configurations
#

2
projects/maixpy_amigo/config_minimum.mk
View file

@ -88,7 +88,7 @@ CONFIG_MICROPYTHON_ULAB_ENALBE=y
CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y
# CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE is not set
# CONFIG_MICROPY_SSL_ENABLE is not set
# CONFIG_MICROPY_PY_WIZNET5K is 0(not set),5200(W5200),5500(W5500)
# CONFIG_MAIXPY_WIZNET5K_ENABLE is not set
# end of Modules configurations
#

2
projects/maixpy_k210/config_defaults.mk
View file

@ -92,7 +92,7 @@ CONFIG_MAIXPY_WS2812_ENABLE=y
# CONFIG_MAIXPY_HTPA_ENABLE is not set
CONFIG_MICROPYTHON_ULAB_ENALBE=y
CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y
CONFIG_MICROPY_PY_WIZNET5K=5500
CONFIG_MAIXPY_WIZNET5K_ENABLE=y
# end of Modules configurations
#

2
projects/maixpy_k210/config_with_lvgl.mk
View file

@ -90,7 +90,7 @@ CONFIG_MAIXPY_LODEPNG_ENABLE=y
CONFIG_MAIXPY_WS2812_ENABLE=y
CONFIG_MAIXPY_HTPA_ENABLE=y
CONFIG_MICROPYTHON_ULAB_ENALBE=y
CONFIG_MICROPY_PY_WIZNET5K=5500
CONFIG_MAIXPY_WIZNET5K_ENABLE=y
# end of Modules configurations
#

2
projects/maixpy_k210_minimum/config_defaults.mk
View file

@ -86,7 +86,7 @@ CONFIG_MAIXPY_OMV_DOUBLE_BUFF=y
# CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT is not set
# CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE is not set
# CONFIG_MICROPY_SSL_ENABLE is not set
# CONFIG_MICROPY_PY_WIZNET5K is 0(not set),5200(W5200),5500(W5500)
# CONFIG_MAIXPY_WIZNET5K_ENABLE is not set
# end of Modules configurations
#

2
projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk
View file

@ -86,7 +86,7 @@ CONFIG_MAIXPY_OMV_DOUBLE_BUFF=y
CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y
# CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE is not set
# CONFIG_MICROPY_SSL_ENABLE is not set
# CONFIG_MICROPY_PY_WIZNET5K is 0(not set),5200(W5200),5500(W5500)
# CONFIG_MAIXPY_WIZNET5K_ENABLE is not set
# end of Modules configurations
#

2
projects/maixpy_k210_minimum/config_defaults_openmv_kmodel_v4_with_ide_support.mk
View file

@ -87,7 +87,7 @@ CONFIG_MAIXPY_OMV_DOUBLE_BUFF=y
CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y
# CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE is not set
# CONFIG_MICROPY_SSL_ENABLE is not set
# CONFIG_MICROPY_PY_WIZNET5K is 0(not set),5200(W5200),5500(W5500)
# CONFIG_MAIXPY_WIZNET5K_ENABLE is not set
# end of Modules configurations
#

2
projects/maixpy_k210_minimum/config_defaults_speech_with_ide_support.mk
View file

@ -86,7 +86,7 @@ CONFIG_MAIXPY_OMV_DOUBLE_BUFF=y
CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y
CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE=y
# CONFIG_MICROPY_SSL_ENABLE is not set
# CONFIG_MICROPY_PY_WIZNET5K is 0(not set),5200(W5200),5500(W5500)
# CONFIG_MAIXPY_WIZNET5K_ENABLE is not set
# end of Modules configurations
#

2
projects/maixpy_k210_minimum/config_with_ide_support.mk
View file

@ -86,7 +86,7 @@ CONFIG_MAIXPY_OMV_DOUBLE_BUFF=y
# CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT is not set
# CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE is not set
# CONFIG_MICROPY_SSL_ENABLE is not set
# CONFIG_MICROPY_PY_WIZNET5K is 0(not set),5200(W5200),5500(W5500)
# CONFIG_MAIXPY_WIZNET5K_ENABLE is not set
# end of Modules configurations
#

2
projects/maixpy_m5stickv/config_defaults.mk
View file

@ -61,7 +61,7 @@ CONFIG_MAIXPY_OMV_CONV_YUV_FAST=y
# CONFIG_MAIXPY_LVGL_ENABLE is not set
CONFIG_MICROPYTHON_ULAB_ENALBE=y
CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y
# CONFIG_MICROPY_PY_WIZNET5K is 0(not set),5200(W5200),5500(W5500)
# CONFIG_MAIXPY_WIZNET5K_ENABLE is not set
# end of Modules configurations
#