Skip to content
This repository was archived by the owner on Aug 23, 2024. It is now read-only.

Commit d775bb1

Browse files
loborisloboris
committed
Updated 'ftp server'
 Some improvements and bug fixes Should now support many more FTP clients Updated 'curl' module mail functions can now be excluded from build (via menuconfig)
1 parent 57c2dd6 commit d775bb1

27 files changed

Lines changed: 187 additions & 488 deletions

‎MicroPython_BUILD/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ sdkconfig.fw_all
3434
sdkconfig.fw_psram_all
3535

3636
make_firmwares.sh
37+
mncfg_exit.txt

‎MicroPython_BUILD/components/micropython/Kconfig.projbuild‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ menu "MicroPython"
1616
default "GMT0BST"
1717
help
1818
Set the default time zone string used when updating the time from NTP server
19-
You can use 'components/micropython/docs/zones.csvzones.csv'
19+
You can use 'components/micropython/docs/zones.csv'
2020
file to find the time zone string.
21-
Use the second entry for your Region/city as the value set here
21+
Use the second entry for your Region/city as the value set here. Example:
22+
For Zagreb, the zones.csv file contains :"Europe/Zagreb","CET-1CEST,M3.5.0,M10.5.0/3".
23+
You should put "CET-1CEST,M3.5.0,M10.5.0/3" or "CET-1CEST" as Time zone.
2224

2325
config MICROPY_USE_OTA
2426
bool "Use OTA partition layout"
@@ -270,6 +272,15 @@ menu "MicroPython"
270272
Include Ftp support in Curl module
271273
Not including it may save ~24 KB of flash code space
272274

275+
config MICROPY_USE_MAIL
276+
bool "MAIL support in Curl module"
277+
depends on MICROPY_USE_CURL
278+
default y
279+
help
280+
Include Mail support in Curl module
281+
Mail support is based on 'quickmail' library which is licensed under GPL,
282+
so you may want to exclude it from the build
283+
273284
config MICROPY_USE_SSH
274285
bool "Use SSH module"
275286
default n

‎MicroPython_BUILD/components/micropython/component.mk‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
COMPONENT_ADD_INCLUDEDIRS := . genhdr py esp32 lib lib/utils lib/mp-readline extmod extmod/crypto-algorithms lib/netutils drivers/dht \
88
lib/timeutils lib/berkeley-db-1.xx/include lib/berkeley-db-1.xx/btree \
99
lib/berkeley-db-1.xx/db lib/berkeley-db-1.xx/hash lib/berkeley-db-1.xx/man lib/berkeley-db-1.xx/mpool lib/berkeley-db-1.xx/recno \
10-
../curl/include ../curl/lib ../zlib ../libssh2/include ../quickmail ../espmqtt/include
10+
../curl/include ../curl/lib ../zlib ../libssh2/include ../espmqtt/include
11+
ifdef CONFIG_MICROPY_USE_MAIL
12+
COMPONENT_ADD_INCLUDEDIRS += ../quickmail
13+
endif
14+
1115
COMPONENT_PRIV_INCLUDEDIRS := . genhdr py esp32 lib
1216

1317
BUILD = $(BUILD_DIR_BASE)
@@ -44,7 +48,6 @@ FROZEN_MPY_DIR = $(COMPONENT_PATH)/esp32/modules
4448
ESPCOMP = $(IDF_PATH)/components
4549
MP_EXTRA_INC += -I.
4650
MP_EXTRA_INC += -I$(COMPONENT_PATH)
47-
MP_EXTRA_INC += -I$(PROJECT_PATH)/components/quickmail
4851
MP_EXTRA_INC += -I$(PROJECT_PATH)/components/curl/include
4952
MP_EXTRA_INC += -I$(PROJECT_PATH)/components/libssh2/include
5053
MP_EXTRA_INC += -I$(PROJECT_PATH)/components/zlib
@@ -100,6 +103,10 @@ MP_EXTRA_INC += -I$(ESPCOMP)/openssl/include
100103
MP_EXTRA_INC += -I$(ESPCOMP)/app_update/include
101104
MP_EXTRA_INC += -I$(ESPCOMP)/mdns/include
102105

106+
ifdef CONFIG_MICROPY_USE_MAIL
107+
MP_EXTRA_INC += -I$(PROJECT_PATH)/components/quickmail
108+
endif
109+
103110
# CPP macro
104111
# ------------
105112
CPP = $(CC) -E

0 commit comments

Comments
 (0)